[Libreoffice-commits] .: 2 commits - basic/inc basic/source toolkit/inc

[Caolán McNamara]

 basic/inc/basic/sbmod.hxx             |    6 +++---
 basic/source/classes/sbxmod.cxx       |    6 ++++--
 toolkit/inc/toolkit/helper/macros.hxx |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b2fdaed46509127ec3ac2fb87404bc1b51d77778
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 20 20:01:54 2012 +0100

    WaE: MSVC2008 C2220 unsafe mix of types in operation

diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 24700e9..392082b 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -73,7 +73,7 @@ protected:
     SbiImage*           pImage;        // the Image
     SbiBreakpoints*     pBreaks;       // Breakpoints
     SbClassData*        pClassData;
-    sal_Bool mbVBACompat;
+    bool mbVBACompat;
     sal_Int32 mnType;
     SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
     bool    bIsProxyModule;
@@ -139,8 +139,8 @@ public:
     sal_Bool ExceedsLegacyModuleSize();
     void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
     bool HasExeCode();
-    sal_Bool IsVBACompat() const;
-    void SetVBACompat( sal_Bool bCompat );
+    bool IsVBACompat() const;
+    void SetVBACompat( bool bCompat );
     sal_Int32 GetModuleType() { return mnType; }
     void SetModuleType( sal_Int32 nType ) { mnType = nType; }
     bool isProxyModule() { return bIsProxyModule; }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 9d3a4b9..87928cf 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1077,15 +1077,17 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
     if( ((StarBASIC*)p) != pBasic )
         ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
 }
-sal_Bool SbModule::IsVBACompat() const
+
+bool SbModule::IsVBACompat() const
 {
     return mbVBACompat;
 }
 
-void SbModule::SetVBACompat( sal_Bool bCompat )
+void SbModule::SetVBACompat( bool bCompat )
 {
     mbVBACompat = bCompat;
 }
+
 // Run a Basic-subprogram
 sal_uInt16 SbModule::Run( SbMethod* pMeth )
 {
commit 6f9971f3b935f669b39d7a53266950ee92955027
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 20 15:16:43 2012 +0100

    WaE: MSVC20082 unreferenced argument

diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index b2acbf2..3d59e60 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -176,7 +176,7 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::
         sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); \
         OSL_FAIL( sMessage.getStr() );
 #else
-    #define DISPLAY_EXCEPTION( ClassName, MethodName, e )
+    #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e;
 #endif
 
 #define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( ClassName, InterfaceName, MethodName, ParamType1, ParamType2 ) \