diff --git a/mozilla/gfx/src/mac/nsPrintOptionsMac.cpp b/mozilla/gfx/src/mac/nsPrintOptionsMac.cpp index 008109c9759..617f9bbe2d3 100644 --- a/mozilla/gfx/src/mac/nsPrintOptionsMac.cpp +++ b/mozilla/gfx/src/mac/nsPrintOptionsMac.cpp @@ -96,7 +96,9 @@ nsPrintOptionsMac::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings) if (!mPrintRecord) return NS_ERROR_NOT_INITIALIZED; - ReadPrefs(); + // it doesn't really matter if this fails + nsresult rv = ReadPageSetupFromPrefs(); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to write page setup to prefs"); // open the printing manager ::PrOpen(); @@ -115,33 +117,16 @@ nsPrintOptionsMac::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings) ::PrClose(); - WritePrefs(); + // it doesn't really matter if this fails + rv = WritePageSetupToPrefs(); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to save page setup to prefs"); + if (err != noErr) return NS_ERROR_FAILURE; return NS_OK; } -NS_IMETHODIMP -nsPrintOptionsMac::ReadPrefs() -{ - // it doesn't really matter if this fails - nsresult rv = ReadPageSetupFromPrefs(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to write page setup to prefs"); - - return nsPrintOptions::ReadPrefs(); -} - -NS_IMETHODIMP -nsPrintOptionsMac::WritePrefs() -{ - // it doesn't really matter if this fails - nsresult rv = WritePageSetupToPrefs(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to save page setup to prefs"); - - return nsPrintOptions::WritePrefs(); -} - /* [noscript] voidPtr GetNativeData (in short aDataType); */ NS_IMETHODIMP nsPrintOptionsMac::GetNativeData(PRInt16 aDataType, void * *_retval) diff --git a/mozilla/gfx/src/mac/nsPrintOptionsMac.h b/mozilla/gfx/src/mac/nsPrintOptionsMac.h index ec257de4f7d..278db17c529 100644 --- a/mozilla/gfx/src/mac/nsPrintOptionsMac.h +++ b/mozilla/gfx/src/mac/nsPrintOptionsMac.h @@ -41,9 +41,6 @@ public: NS_IMETHOD ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings); NS_IMETHOD GetNativeData(PRInt16 aDataType, void * *_retval); - NS_IMETHOD ReadPrefs(); - NS_IMETHOD WritePrefs(); - protected: nsresult ReadPageSetupFromPrefs(); diff --git a/mozilla/gfx/src/mac/nsPrintOptionsX.cpp b/mozilla/gfx/src/mac/nsPrintOptionsX.cpp index bcdd8567929..098253c5ca9 100644 --- a/mozilla/gfx/src/mac/nsPrintOptionsX.cpp +++ b/mozilla/gfx/src/mac/nsPrintOptionsX.cpp @@ -89,7 +89,9 @@ NS_IMETHODIMP nsPrintOptionsX::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings) { - ReadPrefs(); + // it doesn't really matter if this fails + nsresult rv = ReadPageSetupFromPrefs(); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to write page setup to prefs"); NS_ASSERTION(mPageFormat != kPMNoPageFormat, "No page format"); if (mPageFormat == kPMNoPageFormat) @@ -108,7 +110,9 @@ nsPrintOptionsX::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings) ::PMEnd(); - WritePrefs(); + // it doesn't really matter if this fails + rv = WritePageSetupToPrefs(); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to save page setup to prefs"); if (status != noErr) return NS_ERROR_FAILURE; @@ -119,28 +123,6 @@ nsPrintOptionsX::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings) return NS_OK; } - -NS_IMETHODIMP -nsPrintOptionsX::ReadPrefs() -{ - // it doesn't really matter if this fails - nsresult rv = ReadPageSetupFromPrefs(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to write page setup to prefs"); - - return nsPrintOptions::ReadPrefs(); -} - -NS_IMETHODIMP -nsPrintOptionsX::WritePrefs() -{ - // it doesn't really matter if this fails - nsresult rv = WritePageSetupToPrefs(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to save page setup to prefs"); - - return nsPrintOptions::WritePrefs(); -} - - /* [noscript] voidPtr GetNativeData (in short aDataType); */ NS_IMETHODIMP nsPrintOptionsX::GetNativeData(PRInt16 aDataType, void * *_retval) diff --git a/mozilla/gfx/src/mac/nsPrintOptionsX.h b/mozilla/gfx/src/mac/nsPrintOptionsX.h index 5f0610acce3..c28cb548cb6 100644 --- a/mozilla/gfx/src/mac/nsPrintOptionsX.h +++ b/mozilla/gfx/src/mac/nsPrintOptionsX.h @@ -57,9 +57,6 @@ public: NS_IMETHOD ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings); - NS_IMETHOD ReadPrefs(void); - NS_IMETHOD WritePrefs(void); - NS_IMETHOD GetNativeData(PRInt16 aDataType, void * *_retval); protected: