Kaydet (Commit) 9ebe7641 authored tarafından Oliver Bolte's avatar Oliver Bolte

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
üst 408727b2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: filedlghelper.cxx,v $ * $RCSfile: filedlghelper.cxx,v $
* $Revision: 1.142 $ * $Revision: 1.143 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -1255,9 +1255,12 @@ void FileDialogHelper_Impl::preExecute() ...@@ -1255,9 +1255,12 @@ void FileDialogHelper_Impl::preExecute()
implInitializeFileName( ); implInitializeFileName( );
// #106079# / 2002-12-09 / fs@openoffice.org // #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 // allow for dialog implementations which need to be executed before they return valid values for
// current filter and such // 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 ) ); mnPostUserEventId = Application::PostUserEvent( LINK( this, FileDialogHelper_Impl, InitControls ) );
#else #else
// However, the Mac OS X implementation's pickers run modally in execute and so the event doesn't // However, the Mac OS X implementation's pickers run modally in execute and so the event doesn't
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment