diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 12:34:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 12:34:22 +0000 |
| commit | ab271f6d7078097091f0c2c0852721e1d7050b1e (patch) | |
| tree | b8aae21340d47ac82b774bdc3e955729d855e217 | |
| parent | f1c58221eac5058b1d235c3a284251049a7f8f31 (diff) | |
INTEGRATION: CWS fwkbugfix03 (1.80.102); FILE MERGED
2004/10/11 17:09:30 as 1.80.102.2: RESYNC: (1.80-1.82); FILE MERGED
2004/09/08 13:19:00 mba 1.80.102.1: #117141#: NULL ptr access if no TopWindow after TemplateDialog
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 89e2b649d474..0975ad85db95 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: kz $ $Date: 2004-10-04 20:43:40 $ + * last change: $Author: obo $ $Date: 2004-11-17 13:34:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -942,7 +942,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) } delete pDocTemplDlg; - if ( bNewWin ) + if ( bNewWin && pTopWin ) // after the destruction of the dialogue its parent comes to top, // but we want that the new document is on top pTopWin->ToTop(); |