diff options
| author | sb <sb@openoffice.org> | 2009-07-02 15:29:21 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-07-02 15:29:21 +0200 |
| commit | bf6589e21a3f926c589e498d2d4d2d91b9856aa9 (patch) | |
| tree | 8ee2a574f8ec2c3ce584092682ec0864722fdd43 /fpicker | |
| parent | 2ee8e1e4160e3b89629eaaa80377084588d59999 (diff) | |
| parent | 25c459e8b631e6e1ca8357e806560bf7b7d3b2d4 (diff) | |
merged in DEV300_m51
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/prj/build.lst | 2 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/makefile.mk | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst index 7f4ee87af3ba..87084f1b6656 100644 --- a/fpicker/prj/build.lst +++ b/fpicker/prj/build.lst @@ -1,4 +1,4 @@ -fp fpicker : rdbmaker svtools NULL +fp fpicker : l10n rdbmaker svtools NULL fp fpicker\inc nmake - all fp_inc NULL fp fpicker\source\generic nmake - all fp_generic fp_inc NULL fp fpicker\source\office nmake - all fp_office fp_inc NULL diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx index ef0cde863f2b..5cd5247dac37 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.cxx +++ b/fpicker/source/aqua/SalAquaFilePicker.cxx @@ -192,8 +192,10 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) implInitialize(); // 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) { diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk index de9ee56ccc15..c23c08108e42 100644 --- a/fpicker/source/win32/filepicker/makefile.mk +++ b/fpicker/source/win32/filepicker/makefile.mk @@ -48,9 +48,6 @@ CDEFS+=-DUNICODE #CDEFS+=-DWIN32_LEAN_AND_MEAN #CDEFS+=-DWIN32 -.IF "$(COM)"=="GCC" -CDEFS+=-UWINVER -DWINVER=0x500 -.ENDIF # --- Resources ---------------------------------------------------- |