From 8a34fa79fc49308acf3cd019088ffe34b3f5435f Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 11 Jul 2007 10:04:11 +0000 Subject: INTEGRATION: CWS aquafilepicker01 (1.126.16); FILE MERGED 2007/06/16 20:19:32 fheckl 1.126.16.7: RESYNC: (1.129-1.130); FILE MERGED 2007/05/11 07:56:43 fheckl 1.126.16.6: adding comment to describe changes 2007/05/11 07:39:54 fheckl 1.126.16.5: guarding sfx2 changes only for aqua version 2007/05/09 20:59:24 fheckl 1.126.16.4: RESYNC: (1.128-1.129); FILE MERGED 2007/02/23 10:10:00 ericb 1.126.16.3: #i74798# remove precompiled headers changes 2006/12/02 17:58:33 fheckl 1.126.16.2: RESYNC: (1.126-1.128); FILE MERGED 2006/10/06 21:18:34 fheckl 1.126.16.1: Initial version of MacOSX native file picker --- sfx2/source/dialog/filedlghelper.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a7b10e8b04f8..e95e24423a1a 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.132 $ + * $Revision: 1.133 $ * - * last change: $Author: rt $ $Date: 2007-07-06 10:16:51 $ + * last change: $Author: ihi $ $Date: 2007-07-11 11:04:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1401,6 +1401,8 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute() sal_Int16 nRet = ExecutableDialogResults::CANCEL; +#if !(defined(MACOSX) && defined(QUARTZ)) +//On MacOSX the native file picker has to run in the primordial thread because of drawing issues if ( mbSystemPicker ) { PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg ); @@ -1412,6 +1414,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute() delete pThread; } else +#endif { try { -- cgit