From 84cc001a4a9b1dbcebfffff72a4e36aa2df0c24a Mon Sep 17 00:00:00 2001
From: "rods%netscape.com"
 <rods%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 7 Feb 2006 01:14:16 +0000
Subject: [PATCH] Bug 166097 set the appropriate flags so they are read from
 prefs sr=kin r=dcone

git-svn-id: svn://10.0.0.236/trunk@189201 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/windows/nsPrintOptionsWin.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/mozilla/widget/src/windows/nsPrintOptionsWin.cpp b/mozilla/widget/src/windows/nsPrintOptionsWin.cpp
index b9263f8bd06..6fe42119314 100644
--- a/mozilla/widget/src/windows/nsPrintOptionsWin.cpp
+++ b/mozilla/widget/src/windows/nsPrintOptionsWin.cpp
@@ -68,7 +68,20 @@ NS_IMETHODIMP nsPrintOptionsWin::CreatePrintSettings(nsIPrintSettings **_retval)
   rv = printSettings->QueryInterface(NS_GET_IID(nsIPrintSettings), (void**)_retval); // ref counts
   NS_ENSURE_SUCCESS(rv, rv);
 
-  InitPrintSettingsFromPrefs(*_retval, PR_FALSE, 0); // ignore return value
+  // nsPrintOptionImpl actually initials with "kInitSaveAll", but that is a 
+  // little extreme for Windows, so here we will initialize with a sub-set of 
+  // the settings
+  PRUint32 flags = nsIPrintSettings.kInitSaveHeaderLeft | 
+                   nsIPrintSettings.kInitSaveHeaderCenter |
+                   nsIPrintSettings.kInitSaveHeaderRight |
+                   nsIPrintSettings.kInitSaveFooterLeft | 
+                   nsIPrintSettings.kInitSaveFooterCenter |
+                   nsIPrintSettings.kInitSaveFooterRight |
+                   nsIPrintSettings.kInitSaveBGColors |
+                   nsIPrintSettings.kInitSaveBGImages |
+                   nsIPrintSettings.kInitSaveMargins;
+
+  InitPrintSettingsFromPrefs(*_retval, PR_FALSE, flags); // ignore return value
 
   return rv;
 }