wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 546270 followup: sync code paths for File|Print & window.print(), to handle no-default-printer case. r=roc

Browse Source
This commit is contained in:
Martin Stransky 2010-05-19 10:44:51 -07:00
parent a4d803138a
commit d8bf1bcb53
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/base/nsGlobalWindow.cpp
View File

@ -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);