diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-05-30 10:34:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-05-30 10:34:06 +0000 |
| commit | 9ebe7641b7f5f5ceebbe0b2dad73e8bb73997967 (patch) | |
| tree | 45f9af855f9b7dfa8e02585cefd2f63fd090649f /sfx2 | |
| parent | 408727b21c337b261a495c39813007eb6989816c (diff) | |
INTEGRATION: CWS hro35_DEV300 (1.142.32); FILE MERGED
2008/05/26 09:16:01 hro 1.142.32.1: #87244# Dialog initialization sequence has to be done synchronous for modal Vista dialog
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index d3880389948d..aa4b91dc52fb 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filedlghelper.cxx,v $ - * $Revision: 1.142 $ + * $Revision: 1.143 $ * * This file is part of OpenOffice.org. * @@ -1255,9 +1255,12 @@ void FileDialogHelper_Impl::preExecute() implInitializeFileName( ); // #106079# / 2002-12-09 / fs@openoffice.org -#if !(defined(MACOSX) && defined(QUARTZ)) +#if !(defined(MACOSX) && defined(QUARTZ)) && !defined(WNT) // allow for dialog implementations which need to be executed before they return valid values for // current filter and such + + // On Vista (at least SP1) it's the same as on MacOSX, the modal dialog won't let message pass + // through before it returns from execution mnPostUserEventId = Application::PostUserEvent( LINK( this, FileDialogHelper_Impl, InitControls ) ); #else // However, the Mac OS X implementation's pickers run modally in execute and so the event doesn't |