diff options
| author | npower Developer <npower@openoffice.org> | 2010-03-22 16:47:58 +0000 |
|---|---|---|
| committer | npower Developer <npower@openoffice.org> | 2010-03-22 16:47:58 +0000 |
| commit | 962673149c34d547b505c78823b4ab9dd3528703 (patch) | |
| tree | af3b2604413bdd8453fc74b6b3da191f1dcc7849 | |
| parent | ce38eff222baa68d1eb31c4e72da381453d9fd0f (diff) | |
| parent | caca8795c922c99729d2547c38277f46a7241453 (diff) | |
npower14_objectmodules: merge heads
| -rw-r--r-- | basic/inc/basic/sbmod.hxx | 8 | ||||
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 6 | ||||
| -rw-r--r-- | vbahelper/prj/build.lst | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index 81548198726b..ba468b252d2a 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -64,7 +64,7 @@ protected: SbiImage* pImage; // the Image SbiBreakpoints* pBreaks; // Breakpoints SbClassData* pClassData; - bool mbVBACompat; + BOOL mbVBACompat; INT32 mnType; SbxObjectRef pDocObject; // an impl object ( used by Document Modules ) bool bIsProxyModule; @@ -92,7 +92,7 @@ protected: public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2); TYPEINFO(); - SbModule( const String&, bool bCompat = false ); + SbModule( const String&, BOOL bCompat = FALSE ); virtual void SetParent( SbxObject* ); virtual void Clear(); @@ -128,8 +128,8 @@ public: BOOL LoadBinaryData( SvStream& ); BOOL ExceedsLegacyModuleSize(); void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const; - bool IsVBACompat(); - void SetVBACompat( bool bCompat ); + BOOL IsVBACompat(); + void SetVBACompat( BOOL bCompat ); INT32 GetModuleType() { return mnType; } void SetModuleType( INT32 nType ) { mnType = nType; } bool GetIsProxyModule() { return bIsProxyModule; } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 622083bd58cc..87855035eb2e 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -159,7 +159,7 @@ bool UnlockControllerHack( StarBASIC* pBasic ) // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen // Elemente von anderen Modulen aus gefunden werden koennen. -SbModule::SbModule( const String& rName, bool bVBACompat ) +SbModule::SbModule( const String& rName, BOOL bVBACompat ) : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ), pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ), pDocObject( NULL ), bIsProxyModule( false ) { @@ -609,12 +609,12 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic ) if( ((StarBASIC*)p) != pBasic ) ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p ); } -bool SbModule::IsVBACompat() +BOOL SbModule::IsVBACompat() { return mbVBACompat; } -void SbModule::SetVBACompat( bool bCompat ) +void SbModule::SetVBACompat( BOOL bCompat ) { mbVBACompat = bCompat; } diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst index 0db5274b7ad3..20001db859c8 100644 --- a/vbahelper/prj/build.lst +++ b/vbahelper/prj/build.lst @@ -1,4 +1,4 @@ -vba vbahelper : oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL +vba vbahelper : oovbaapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL vba vbahelper usr1 - all vba_mkout NULL #vba vbahelper\inc nmake - all vba_inc NULL vba vbahelper\source\vbahelper nmake - all vba_vbahelper NULL |