diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-20 20:01:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-20 20:02:25 +0100 |
| commit | b2fdaed46509127ec3ac2fb87404bc1b51d77778 (patch) | |
| tree | 8b48bea81c3443649b8c93c683dac43773e30a2f /basic | |
| parent | 6f9971f3b935f669b39d7a53266950ee92955027 (diff) | |
WaE: MSVC2008 C2220 unsafe mix of types in operation
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/inc/basic/sbmod.hxx | 6 | ||||
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index 24700e9ebed3..392082baa3d1 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 9d3a4b9e87de..87928cf8865a 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 ) { |