diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-24 11:49:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-24 11:49:09 +0000 |
| commit | e21083ae636b0fd48b7cf788f9655d59f843976e (patch) | |
| tree | 4ea167185f4097da63ee70ec1138906cd6f20fa2 | |
| parent | 07f97d76e46163ce74713b9bcbd7767791e9846d (diff) | |
INTEGRATION: CWS fwk33 (1.4.34); FILE MERGED
2006/03/10 10:42:08 mav 1.4.34.1: #i47369# check the dialog existance after yielding
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index ffa43906e9bb..36d06f1ee312 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -4,9 +4,9 @@ * * $RCSfile: OfficeFilePicker.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-11-11 11:39:08 $ + * last change: $Author: obo $ $Date: 2006-03-24 12:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -504,7 +504,9 @@ sal_Int16 SvtFilePicker::implExecutePicker( ) // now we are ready to execute the dialog sal_Int16 nRet = getDialog()->Execute(); - getDialog()->SetFileCallback( NULL ); + // the execution of the dialog yields, so it is possible the at this point the window or the dialog is closed + if ( getDialog() ) + getDialog()->SetFileCallback( NULL ); return nRet; } |