Bug 1665901 - Remove (Windows-specific) paperData field, as it now ju…

…st duplicates the paper id. r=bobowen

Differential Revision: https://phabricator.services.mozilla.com/D90686

toolkit/components/printing/content/print.js

@@ -1056,9 +1056,6 @@ var PrintSettingsViewProxy = {
         let paperSize = this.availablePaperSizes[paperId];
         target.paperWidth = paperSize.width;
         target.paperHeight = paperSize.height;
-        if (+paperSize.id > 0) {
-          target.paperData = paperSize.id;
-        }
         target.unwriteableMarginTop = paperSize.unwriteableMarginTop;
         target.unwriteableMarginRight = paperSize.unwriteableMarginRight;
         target.unwriteableMarginBottom = paperSize.unwriteableMarginBottom;

toolkit/components/printingui/ipc/PPrintingTypes.ipdlh

@@ -48,7 +48,6 @@ struct PrintData {
   bool showPrintProgress;
 
   nsString paperName;
-  short paperData;
   double paperWidth;
   double paperHeight;
   short paperSizeUnit;

widget/nsIPrintSettings.idl

@@ -42,7 +42,7 @@ interface nsIPrintSettings : nsISupports
   const unsigned long kInitSaveResolution     = 0x00000400;
   const unsigned long kInitSaveDuplex         = 0x00000800;
   /* Flag 0x00001000 is unused */
-  const unsigned long kInitSavePaperData      = 0x00002000;
+  /* Flag 0x00002000 is unused */
   const unsigned long kInitSaveUnwriteableMargins = 0x00004000;
   const unsigned long kInitSaveEdges          = 0x00008000;
 
@@ -202,7 +202,6 @@ interface nsIPrintSettings : nsISupports
 
   /* Additional XP Related */
   attribute AString paperName;     /* name of paper */
-  attribute short   paperData;     /* native data value */
   attribute double  paperWidth;    /* width of the paper in inches or mm */
   attribute double  paperHeight;   /* height of the paper in inches or mm */
   attribute short   paperSizeUnit; /* paper is in inches or mm */

widget/nsPrintSettingsImpl.cpp

@@ -30,7 +30,6 @@ nsPrintSettings::nsPrintSettings()
       mShowPrintProgress(true),
       mShowMarginGuides(false),
       mPrintPageDelay(50),
-      mPaperData(0),
       mPaperWidth(8.5),
       mPaperHeight(11.0),
       mPaperSizeUnit(kPaperSizeInches),
@@ -660,16 +659,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperSizeUnit(int16_t aPaperSizeUnit) {
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPrintSettings::GetPaperData(int16_t* aPaperData) {
-  NS_ENSURE_ARG_POINTER(aPaperData);
-  *aPaperData = mPaperData;
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintSettings::SetPaperData(int16_t aPaperData) {
-  mPaperData = aPaperData;
-  return NS_OK;
-}
-
 /** ---------------------------------------------------
  *  See documentation in nsPrintSettingsService.h
  *	@update 6/21/00 dwc
@@ -796,7 +785,6 @@ nsPrintSettings& nsPrintSettings::operator=(const nsPrintSettings& rhs) {
   mShowPrintProgress = rhs.mShowPrintProgress;
   mShowMarginGuides = rhs.mShowMarginGuides;
   mPaperName = rhs.mPaperName;
-  mPaperData = rhs.mPaperData;
   mPaperWidth = rhs.mPaperWidth;
   mPaperHeight = rhs.mPaperHeight;
   mPaperSizeUnit = rhs.mPaperSizeUnit;

widget/nsPrintSettingsImpl.h

@@ -102,7 +102,6 @@ class nsPrintSettings : public nsIPrintSettings {
   nsString mFooterStrs[NUM_HEAD_FOOT];
 
   nsString mPaperName;
-  int16_t mPaperData;
   double mPaperWidth;
   double mPaperHeight;
   int16_t mPaperSizeUnit;

widget/nsPrintSettingsService.cpp

@@ -59,7 +59,6 @@ static const char kPrintFooterStrRight[] = "print_footerright";
 static const char kPrintReversed[] = "print_reversed";
 static const char kPrintInColor[] = "print_in_color";
 static const char kPrintPaperName[] = "print_paper_name";
-static const char kPrintPaperData[] = "print_paper_data";
 static const char kPrintPaperSizeUnit[] = "print_paper_size_unit";
 static const char kPrintPaperWidth[] = "print_paper_width";
 static const char kPrintPaperHeight[] = "print_paper_height";
@@ -133,7 +132,6 @@ nsPrintSettingsService::SerializeToPrintData(nsIPrintSettings* aSettings,
   aSettings->GetShowPrintProgress(&data->showPrintProgress());
 
   aSettings->GetPaperName(data->paperName());
-  aSettings->GetPaperData(&data->paperData());
   aSettings->GetPaperWidth(&data->paperWidth());
   aSettings->GetPaperHeight(&data->paperHeight());
   aSettings->GetPaperSizeUnit(&data->paperSizeUnit());
@@ -233,7 +231,6 @@ nsPrintSettingsService::DeserializeToPrintSettings(const PrintData& data,
 
   settings->SetPaperName(data.paperName());
 
-  settings->SetPaperData(data.paperData());
   settings->SetPaperWidth(data.paperWidth());
   settings->SetPaperHeight(data.paperHeight());
   settings->SetPaperSizeUnit(data.paperSizeUnit());
@@ -512,13 +509,6 @@ nsresult nsPrintSettingsService::ReadPrefs(nsIPrintSettings* aPS,
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSavePaperData) {
-    if (GETINTPREF(kPrintPaperData, &iVal)) {
-      aPS->SetPaperData(iVal);
-      DUMP_INT(kReadStr, kPrintPaperData, iVal);
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
     if (GETINTPREF(kPrintOrientation, &iVal)) {
       aPS->SetOrientation(iVal);
@@ -669,7 +659,6 @@ nsresult nsPrintSettingsService::WritePrefs(nsIPrintSettings* aPS,
   bool b;
   nsString uStr;
   int32_t iVal;
-  int16_t iVal16;
   double dbl;
 
   if (aFlags & nsIPrintSettings::kInitSaveOddEvenPages) {
@@ -759,14 +748,6 @@ nsresult nsPrintSettingsService::WritePrefs(nsIPrintSettings* aPS,
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSavePaperData) {
-    if (NS_SUCCEEDED(aPS->GetPaperData(&iVal16))) {
-      DUMP_INT(kWriteStr, kPrintPaperData, iVal16);
-      Preferences::SetInt(GetPrefName(kPrintPaperData, aPrinterName),
-                          int32_t(iVal16));
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
     if (NS_SUCCEEDED(aPS->GetOrientation(&iVal))) {
       DUMP_INT(kWriteStr, kPrintOrientation, iVal);

widget/windows/nsPrintSettingsWin.cpp

@@ -195,13 +195,13 @@ void nsPrintSettingsWin::InitWithInitializer(
   }
 
   if (mDevMode->dmFields & DM_PAPERSIZE) {
-    SetPaperData(mDevMode->dmPaperSize);
+    nsString paperIdString;
+    paperIdString.AppendInt(mDevMode->dmPaperSize);
+    SetPaperName(paperIdString);
     if (mDevMode->dmPaperSize > 0 &&
         mDevMode->dmPaperSize < int32_t(ArrayLength(kPaperSizeUnits))) {
-      SetPaperSizeUnit(kPaperSizeUnits[mPaperData]);
+      SetPaperSizeUnit(kPaperSizeUnits[mDevMode->dmPaperSize]);
     }
-  } else {
-    SetPaperData(-1);
   }
 
   if (mDevMode->dmFields & DM_COLOR) {
@@ -351,14 +351,13 @@ void nsPrintSettingsWin::CopyFromNative(HDC aHdc, DEVMODEW* aDevMode) {
   }
 
   if (aDevMode->dmFields & DM_PAPERSIZE) {
-    mPaperData = aDevMode->dmPaperSize;
+    mPaperName.Truncate(0);
+    mPaperName.AppendInt(aDevMode->dmPaperSize);
     // If not a paper size we know about, the unit will be the last one saved.
-    if (mPaperData > 0 &&
-        mPaperData < int32_t(mozilla::ArrayLength(kPaperSizeUnits))) {
-      mPaperSizeUnit = kPaperSizeUnits[mPaperData];
+    if (aDevMode->dmPaperSize > 0 &&
+        aDevMode->dmPaperSize < int32_t(ArrayLength(kPaperSizeUnits))) {
+      mPaperSizeUnit = kPaperSizeUnits[aDevMode->dmPaperSize];
     }
-  } else {
-    mPaperData = -1;
   }
 
   if (aDevMode->dmFields & DM_COLOR) {
@@ -404,8 +403,8 @@ void nsPrintSettingsWin::CopyFromNative(HDC aHdc, DEVMODEW* aDevMode) {
 void nsPrintSettingsWin::CopyToNative(DEVMODEW* aDevMode) {
   MOZ_ASSERT(aDevMode);
 
-  if (mPaperData >= 0) {
-    aDevMode->dmPaperSize = mPaperData;
+  if (!mPaperName.IsEmpty()) {
+    aDevMode->dmPaperSize = _wtoi((const wchar_t*)mPaperName.BeginReading());
     aDevMode->dmFields |= DM_PAPERSIZE;
   } else {
     aDevMode->dmPaperSize = 0;
@@ -545,7 +544,6 @@ Tester::Tester() {
     ps->SetFooterStrCenter(NS_ConvertUTF8toUTF16("Center").get());
     ps->SetFooterStrRight(NS_ConvertUTF8toUTF16("Right").get());
     ps->SetPaperName(NS_ConvertUTF8toUTF16("Paper Name").get());
-    ps->SetPaperData(1);
     ps->SetPaperWidth(100.0);
     ps->SetPaperHeight(50.0);
     ps->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);