[ooo-build-commit] Branch 'ooo/master' - fpicker/source

[Jan Holesovsky]

 fpicker/source/aqua/SalAquaFilePicker.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ab3afd02197db2420aa1736249e67f504037ba5c
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri May 29 13:09:31 2009 +0000

    CWS-TOOLING: integrate CWS macrofpicker01
    2009-03-21 22:07:29 +0100 fheckl  r269842 : Issue 100214 fix for dummy mode without initialization

diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index 92183a2..106b301 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -191,9 +191,11 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
 
     implInitialize();
     
-    // if m_pDialog is nil after initialization, something must have gone wrong before
+    // if m_pDialog is nil after initialization, something must have gone wrong before 
+    // or there was no initialization (see issue http://www.openoffice.org/issues/show_bug.cgi?id=100214)
     if (m_pDialog == nil) {
-        throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog was not properly initialized!"), static_cast< XFilePicker* >( this ));
+        //throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog was not properly initialized!"), static_cast< XFilePicker* >( this ));
+        m_nDialogType = NAVIGATIONSERVICES_OPEN;
     }
 
     if (m_pFilterHelper) {