Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReadPrefs and WritePrefs are no longer in nsIPrintOptions

Browse Source 
Bug 128142 r=dcone sr=attinasi a=shaver


git-svn-id: svn://10.0.0.236/trunk@116710 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
2002-03-16 11:26:47 +00:00
parent a467fad89d
commit 97ec5d7240
4 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/gfx/src/mac/nsPrintOptionsMac.cpp
View File

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

3
mozilla/gfx/src/mac/nsPrintOptionsMac.h
View File

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

30
mozilla/gfx/src/mac/nsPrintOptionsX.cpp
View File

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

3
mozilla/gfx/src/mac/nsPrintOptionsX.h
View File

@@ -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: