Bug 1272349 - Use already set value of kEnableSelectionRB bit instead of NSPrintSelectionOnly. r?haik draft
authorMantaroh Yoshinaga <mantaroh@gmail.com>
Wed, 06 Sep 2017 10:03:39 +0900
changeset 659402 ac77172f1a640d9229c59d1f747cf3bb15fab49a
parent 658813 1401e3eec44df87963d3af329ef8a4183ab0483f
child 729986 4a6212ae0657ec5dc0c311c44082da4c54e1f68c
push id78125
push usermantaroh@gmail.com
push dateWed, 06 Sep 2017 01:04:37 +0000
reviewershaik
bugs1272349
milestone57.0a1
Bug 1272349 - Use already set value of kEnableSelectionRB bit instead of NSPrintSelectionOnly. r?haik The kEnableSelectionRB flag is already set in nsPrintEngine code and the generic nsPrintOptions::SerializeToPrintData() serializes this flags, so we don't need to check NSPrintSelectionOnly and we don't need to override the kEnableSelectionRB setting in nsPrintOptionsX::SerializeToPrintData(). MozReview-Commit-ID: I3iYdx5OQCp
widget/cocoa/nsPrintOptionsX.mm
--- a/widget/cocoa/nsPrintOptionsX.mm
+++ b/widget/cocoa/nsPrintOptionsX.mm
@@ -139,21 +139,16 @@ nsPrintOptionsX::SerializeToPrintData(ns
   data->printReversed() = [[dict objectForKey: NSPrintReversePageOrder] boolValue];
   data->pagesAcross() = [[dict objectForKey: NSPrintPagesAcross] unsignedShortValue];
   data->pagesDown() = [[dict objectForKey: NSPrintPagesDown] unsignedShortValue];
   data->detailedErrorReporting() = [[dict objectForKey: NSPrintDetailedErrorReporting] boolValue];
   data->addHeaderAndFooter() = [[dict objectForKey: NSPrintHeaderAndFooter] boolValue];
   data->fileNameExtensionHidden() =
     [[dict objectForKey: NSPrintJobSavingFileNameExtensionHidden] boolValue];
 
-  bool printSelectionOnly = [[dict objectForKey: NSPrintSelectionOnly] boolValue];
-  aSettings->SetPrintOptions(nsIPrintSettings::kEnableSelectionRB,
-                             printSelectionOnly);
-  aSettings->GetPrintOptionsBits(&data->optionFlags());
-
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsPrintOptionsX::DeserializeToPrintSettings(const PrintData& data,
                                             nsIPrintSettings* settings)
 {
   nsresult rv = nsPrintOptions::DeserializeToPrintSettings(data, settings);