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

#=34706

Browse Source 
r=dcone@netscape.com
a=buster@netscape.com
d=Fixes a crash on linux when printing to a file in a directory where I dont
have permission to or printing to a directory or to a non existing printer.


git-svn-id: svn://10.0.0.236/trunk@82003 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waqar%netscape.com
2000-10-30 15:22:46 +00:00
parent 033e35780c
commit c1d6bbe433
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/content/base/src/nsDocumentViewer.cpp
View File

@@ -952,7 +952,7 @@ DocumentViewerImpl::PrintContent(nsIWebShell * aParent,
// now complete printing the rest of the document
// if it doesn't contain any framesets
if (!doesContainFrameSet) {
aDContext->BeginDocument();
NS_ENSURE_SUCCESS( aDContext->BeginDocument(), NS_ERROR_FAILURE );
aDContext->GetDeviceSurfaceDimensions(width, height);
nsCOMPtr<nsIPresContext> cx;

6
mozilla/gfx/src/ps/nsDeviceContextPS.cpp
View File

@@ -307,16 +307,16 @@ NS_IMETHODIMP nsDeviceContextPS::GetDeviceContextFor(nsIDeviceContextSpec *aDevi
NS_IMETHODIMP nsDeviceContextPS::BeginDocument(void)
{
nsIDeviceContextSpecPS *psSpec;
nsresult res;
nsresult res = NS_OK;
if ( nsnull != mSpec ) {
mPSObj = new nsPostScriptObj();
res = mSpec->QueryInterface(kIDeviceContextSpecPSIID, (void **) &psSpec);
if ( res == NS_OK ) {
mPSObj->Init(psSpec);
res = mPSObj->Init(psSpec);
}
}
return NS_OK;
return res;
}
/** ---------------------------------------------------

3
mozilla/gfx/src/ps/nsPostScriptObj.cpp
View File

@@ -223,6 +223,7 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
#ifndef VMS
aSpec->GetCommand( &buf );
#ifdef XP_OS2_VACPP
mPrintSetup->out = NULL;
// popen not defined OS2TODO
#else
mPrintSetup->out = popen( buf, "w" );
@@ -245,7 +246,7 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
/* make sure the open worked */
if ( mPrintSetup->out < 0 )
if ( mPrintSetup->out == NULL )
return NS_ERROR_FAILURE;
mPrintContext = new PSContext();
memset(mPrintContext, 0, sizeof(struct PSContext_));

2
mozilla/layout/base/nsDocumentViewer.cpp
View File

@@ -952,7 +952,7 @@ DocumentViewerImpl::PrintContent(nsIWebShell * aParent,
// now complete printing the rest of the document
// if it doesn't contain any framesets
if (!doesContainFrameSet) {
aDContext->BeginDocument();
NS_ENSURE_SUCCESS( aDContext->BeginDocument(), NS_ERROR_FAILURE );
aDContext->GetDeviceSurfaceDimensions(width, height);
nsCOMPtr<nsIPresContext> cx;

2
mozilla/layout/base/src/nsDocumentViewer.cpp
View File

@@ -952,7 +952,7 @@ DocumentViewerImpl::PrintContent(nsIWebShell * aParent,
// now complete printing the rest of the document
// if it doesn't contain any framesets
if (!doesContainFrameSet) {
aDContext->BeginDocument();
NS_ENSURE_SUCCESS( aDContext->BeginDocument(), NS_ERROR_FAILURE );
aDContext->GetDeviceSurfaceDimensions(width, height);
nsCOMPtr<nsIPresContext> cx;