diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:08:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:08:47 +0000 |
| commit | fcfd47abdddfa619ea30bbe12525afb3fec68251 (patch) | |
| tree | cfcb8a412c3f60e1d4cc4176b0b7de55bb4a2977 /vcl/source | |
| parent | 8cfef094f5cc5b24deba3a9196877eef88e4d7d6 (diff) | |
INTEGRATION: CWS wot02 (1.54.80); FILE MERGED
2006/05/15 13:13:22 pl 1.54.80.1: #135437# prevent creation of default window while already closing shop
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/print.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index e1dadee4d56c..e0e9a92cca30 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -4,9 +4,9 @@ * * $RCSfile: print.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: obo $ $Date: 2006-03-22 15:18:25 $ + * last change: $Author: vg $ $Date: 2006-05-18 10:08:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -810,9 +810,11 @@ BOOL Printer::Setup( Window* pWindow ) JobSetup aJobSetup = maJobSetup; SalFrame* pFrame; if ( !pWindow ) - pFrame = ImplGetDefaultWindow()->ImplGetFrame(); - else - pFrame = pWindow->ImplGetFrame(); + pWindow = ImplGetDefaultWindow(); + if( !pWindow ) + return FALSE; + + pFrame = pWindow->ImplGetFrame(); ImplReleaseGraphics(); ImplSVData* pSVData = ImplGetSVData(); pSVData->maAppData.mnModalMode++; |