mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 546270 followup: sync code paths for File|Print & window.print(), to handle no-default-printer case. r=roc
This commit is contained in:
parent
99926823af
commit
5f1e23b8db
@ -4631,17 +4631,13 @@ nsGlobalWindow::Print()
|
||||
if (printSettingsAreGlobal) {
|
||||
printSettingsService->GetGlobalPrintSettings(getter_AddRefs(printSettings));
|
||||
|
||||
if (printSettings) {
|
||||
// Call any code that requires a run of the event loop.
|
||||
EnterModalState();
|
||||
printSettings->SetupSilentPrinting();
|
||||
LeaveModalState();
|
||||
}
|
||||
|
||||
nsXPIDLString printerName;
|
||||
printSettingsService->GetDefaultPrinterName(getter_Copies(printerName));
|
||||
if (printerName)
|
||||
printSettingsService->InitPrintSettingsFromPrinter(printerName, printSettings);
|
||||
printSettings->GetPrinterName(getter_Copies(printerName));
|
||||
if (printerName.IsEmpty()) {
|
||||
printSettingsService->GetDefaultPrinterName(getter_Copies(printerName));
|
||||
printSettings->SetPrinterName(printerName);
|
||||
}
|
||||
printSettingsService->InitPrintSettingsFromPrinter(printerName, printSettings);
|
||||
printSettingsService->InitPrintSettingsFromPrefs(printSettings,
|
||||
PR_TRUE,
|
||||
nsIPrintSettings::kInitSaveAll);
|
||||
|
Loading…
Reference in New Issue
Block a user