merged in DEV300_m58

7 files changed, 17 insertions, 8 deletions

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index ff673c2345a8..b8987b0b7a5f 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -191,7 +191,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog)
     // at least an empty version list will be better then the wrong one .-)
     iCustomize->RemoveAllControlItems(CONTROL_VERSIONLIST);
 
-    HRESULT                   hResult;
+    HRESULT                   hResult = E_FAIL;
     ComPtr< IShellItemArray > iItems;
     ComPtr< IShellItem >      iItem;
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 60e0b1fad04c..e2fdde44ce07 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -35,6 +35,10 @@
 // includes
 //-----------------------------------------------------------------------------
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning( disable : 4917 )
+#endif
+
 #include "comptr.hxx"
 #include "vistatypes.h"
 #include "IVistaFilePickerInternalNotify.hxx"
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 8b465513ca6a..58041b3fe628 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -781,7 +781,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
     // Note further: we must react different if dialog is in execute or not .-(
     ComPtr< IShellItem >      iItem;
     ComPtr< IShellItemArray > iItems;
-    HRESULT                   hResult;
+    HRESULT                   hResult = E_FAIL;
 
     if (iOpen.is())
     {
@@ -917,7 +917,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
     }
 
 
-    HRESULT hResult;
+    HRESULT hResult = E_FAIL;
     try
     {
         // show dialog and wait for user decision
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index b15b5c24c52d..59e684d94fc6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -35,6 +35,10 @@
 // includes
 //-----------------------------------------------------------------------------
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning( disable : 4917 )
+#endif
+
 #include "platform_vista.h"
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index d260288ca2cc..825ec45d5661 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -45,7 +45,7 @@
 #include <cppuhelper/servicefactory.hxx>
 
 #ifndef _RTL_USTRING_
-#include <rtl/ustring>
+#include <rtl/ustring.hxx>
 #endif
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -120,7 +120,7 @@ void CreateDeepDirectory( )
 //--------------------------------------------------------------
 
 
-int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
+int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
 {
     CoInitializeEx( NULL, COINIT_MULTITHREADED );
 
@@ -175,7 +175,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         rootDir = xFolderPicker->getDisplayDirectory( );
         selectedDir = xFolderPicker->getDirectory( );
     }
-    catch(...)
+    catch( ::com::sun::star::uno::Exception& )
     {
         MessageBox( NULL, "Exception caught!", "Error", MB_OK );
     }
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index ed5afe6e7b0a..dda6c98e2143 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk
@@ -42,7 +42,7 @@ TARGETTYPE=		CUI
 
 .INCLUDE :  settings.mk
 
-CFLAGS+=-GR -GX
+CFLAGS+=-GR -EHa
 
 # --- Files --------------------------------------------------------
 
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
index 6b41215c9909..29ba591478e4 100644
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/source/win32/misc/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..$/..
 PRJNAME=fpicker
 TARGET=utils
 LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings ----------------------------------
 
@@ -41,7 +42,7 @@ LIBTARGET=NO
 .IF "$(COM)"=="GCC"
 CFLAGSAPPEND+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
 .ELSE
-CFLAGS+=-GX -DUNICODE -D_UNICODE
+CFLAGS+=-EHa -DUNICODE -D_UNICODE
 .ENDIF
 
 # --- Files -------------------------------------