diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 15:27:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 15:27:13 +0000 |
| commit | 46fd8006f6134c759623a0a7e5b127a79435999d (patch) | |
| tree | c0a26ecb7b8ca8972d9b0231ae6a86f899264279 /vcl | |
| parent | d759cf0214427c321b4f8cc1e265c9deab602c66 (diff) | |
INTEGRATION: CWS vcl23101_SRC680 (1.40.48); FILE MERGED
2007/09/11 15:18:33 pl 1.40.48.1: #i80446# avoid side effects of SetModalInputMode if dialog is already not modal
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 98fbf21a7651..738318b44b2c 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dialog.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:18:51 $ + * last change: $Author: ihi $ $Date: 2007-10-15 16:27:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -508,7 +508,7 @@ long Dialog::Notify( NotifyEvent& rNEvt ) // make sure the dialog is still modal // changing focus between application frames may // have re-enabled input for our parent - if( mbInExecute ) + if( mbInExecute && mbModalMode ) { // do not change modal counter (pSVData->maAppData.mnModalDialog) SetModalInputMode( FALSE ); |