Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1756445 - Stop saving print settings in platform code after printing. r=bobowen

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D139291
This commit is contained in:
Jonathan Watt 2022-02-27 21:12:08 +00:00
parent 484d22abe5
commit 8d542d93ce
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
layout/printing/nsPrintJob.cpp
View File

@ -632,36 +632,7 @@ nsresult nsPrintJob::Print(Document* aSourceDoc,
? mPrtPreview->mPrintObject->mDocument.get()
: aSourceDoc;
nsresult rv = CommonPrint(false, aPrintSettings, aWebProgressListener, doc);
if (!aPrintSettings) {
// This is temporary until after bug 1602410 lands.
return rv;
}
// Save the print settings if the user picked them.
// We should probably do this immediately after the user confirms their
// selection (that is, move this to nsPrintingPromptService::ShowPrintDialog,
// just after the nsIPrintDialogService::Show call returns).
bool printSilently;
aPrintSettings->GetPrintSilent(&printSilently);
if (!printSilently) { // user picked settings
bool saveOnCancel;
aPrintSettings->GetSaveOnCancel(&saveOnCancel);
if ((rv != NS_ERROR_ABORT || saveOnCancel) &&
Preferences::GetBool("print.save_print_settings", false)) {
nsCOMPtr<nsIPrintSettingsService> printSettingsService =
do_GetService("@mozilla.org/gfx/printsettings-service;1");
printSettingsService->SavePrintSettingsToPrefs(
aPrintSettings, true,
nsIPrintSettings::kInitSaveAll &
~nsIPrintSettings::kInitSaveToFileName);
printSettingsService->SavePrintSettingsToPrefs(
aPrintSettings, false, nsIPrintSettings::kInitSavePrinterName);
}
}
return rv;
return CommonPrint(false, aPrintSettings, aWebProgressListener, doc);
}
nsresult nsPrintJob::PrintPreview(Document* aSourceDoc,