mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: MSVC2008 C2220 unsafe mix of types in operation

Browse Source
This commit is contained in:
Caolán McNamara
2012-04-20 20:01:54 +01:00
parent 6f9971f3b9
commit b2fdaed465
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basic/inc/basic/sbmod.hxx
View File

@@ -73,7 +73,7 @@ protected:
SbiImage* pImage; // the Image SbiImage* pImage; // the Image
SbiBreakpoints* pBreaks; // Breakpoints SbiBreakpoints* pBreaks; // Breakpoints
SbClassData* pClassData; SbClassData* pClassData;
sal_Bool mbVBACompat; bool mbVBACompat;
sal_Int32 mnType; sal_Int32 mnType;
SbxObjectRef pDocObject; // an impl object ( used by Document Modules ) SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
bool bIsProxyModule; bool bIsProxyModule;
@@ -139,8 +139,8 @@ public:
sal_Bool ExceedsLegacyModuleSize(); sal_Bool ExceedsLegacyModuleSize();
void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const; void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
bool HasExeCode(); bool HasExeCode();
sal_Bool IsVBACompat() const; bool IsVBACompat() const;
void SetVBACompat( sal_Bool bCompat ); void SetVBACompat( bool bCompat );
sal_Int32 GetModuleType() { return mnType; } sal_Int32 GetModuleType() { return mnType; }
void SetModuleType( sal_Int32 nType ) { mnType = nType; } void SetModuleType( sal_Int32 nType ) { mnType = nType; }
bool isProxyModule() { return bIsProxyModule; } bool isProxyModule() { return bIsProxyModule; }

6
basic/source/classes/sbxmod.cxx
View File

@@ -1077,15 +1077,17 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
if( ((StarBASIC*)p) != pBasic ) if( ((StarBASIC*)p) != pBasic )
ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p ); ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
} }
sal_Bool SbModule::IsVBACompat() const
bool SbModule::IsVBACompat() const
{ {
return mbVBACompat; return mbVBACompat;
} }
void SbModule::SetVBACompat( sal_Bool bCompat ) void SbModule::SetVBACompat( bool bCompat )
{ {
mbVBACompat = bCompat; mbVBACompat = bCompat;
} }
// Run a Basic-subprogram // Run a Basic-subprogram
sal_uInt16 SbModule::Run( SbMethod* pMeth ) sal_uInt16 SbModule::Run( SbMethod* pMeth )
{ {