From d349a67ae0a408f0ab162e8eb3d2d125b2c1d398 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Sun, 14 Aug 2011 09:37:04 +0200 Subject: Fix visibility in basic to make automation link again. There are still some link warnings left, though. --- basic/StaticLibrary_app.mk | 4 ++++ basic/StaticLibrary_sample.mk | 4 ++++ basic/inc/basic/basicrt.hxx | 10 +++++----- basic/inc/basic/sbx.hxx | 2 +- basic/inc/basic/sbxmeth.hxx | 9 ++++----- basic/inc/basic/sbxprop.hxx | 4 ++-- basic/inc/basic/sbxvar.hxx | 4 ++-- basic/source/sbx/sbxarray.cxx | 5 +++++ basic/source/sbx/sbxobj.cxx | 25 +++++++++++++++++++++++++ basic/source/sbx/sbxvar.cxx | 10 ++++++++++ 10 files changed, 62 insertions(+), 15 deletions(-) (limited to 'basic') diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk index 15b7c17f1150..c48dfe54c7fa 100644 --- a/basic/StaticLibrary_app.mk +++ b/basic/StaticLibrary_app.mk @@ -44,6 +44,10 @@ $(eval $(call gb_StaticLibrary_add_api,app,\ offapi \ )) +$(eval $(call gb_StaticLibrary_add_defs,app,\ + -DBASIC_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_StaticLibrary_add_exception_objects,app,\ basic/source/app/appbased \ basic/source/app/app \ diff --git a/basic/StaticLibrary_sample.mk b/basic/StaticLibrary_sample.mk index b48ff08f721c..e5645ad7f869 100644 --- a/basic/StaticLibrary_sample.mk +++ b/basic/StaticLibrary_sample.mk @@ -43,6 +43,10 @@ $(eval $(call gb_StaticLibrary_add_api,sample,\ offapi \ )) +$(eval $(call gb_StaticLibrary_add_defs,sample,\ + -DBASIC_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_StaticLibrary_add_exception_objects,sample,\ basic/source/sample/collelem \ basic/source/sample/object \ diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx index 143a781c822d..981fe1820e54 100644 --- a/basic/inc/basic/basicrt.hxx +++ b/basic/inc/basic/basicrt.hxx @@ -35,14 +35,14 @@ class SbiRuntime; class SbErrorStackEntry; -class BASIC_DLLPUBLIC BasicRuntime +class BasicRuntime { SbiRuntime* pRun; public: BasicRuntime( SbiRuntime* p ) : pRun ( p ){;} - const String GetSourceRevision(); - const String GetModuleName( SbxNameType nType ); - const String GetMethodName( SbxNameType nType ); + BASIC_DLLPUBLIC const String GetSourceRevision(); + BASIC_DLLPUBLIC const String GetModuleName( SbxNameType nType ); + BASIC_DLLPUBLIC const String GetMethodName( SbxNameType nType ); xub_StrLen GetLine(); xub_StrLen GetCol1(); xub_StrLen GetCol2(); @@ -51,7 +51,7 @@ public: BasicRuntime GetNextRuntime(); }; -class BASIC_DLLPUBLIC BasicErrorStackEntry +class BasicErrorStackEntry { SbErrorStackEntry *pEntry; public: diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 219c8025d9bb..efe4297c3886 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -249,7 +249,7 @@ public: SbxVariable* Get( SbxArray* ); void Put( SbxVariable*, SbxArray* ); - short GetDims() const { return nDim; } + short GetDims() const; void AddDim( short, short ); void unoAddDim( short, short ); sal_Bool GetDim( short, short&, short& ) const; diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx index 4aa13414e531..80644f0da7a6 100644 --- a/basic/inc/basic/sbxmeth.hxx +++ b/basic/inc/basic/sbxmeth.hxx @@ -41,11 +41,10 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1); TYPEINFO(); - SbxMethod( const String& r, SbxDataType t ) - : SbxVariable( t ) { SetName( r ); } - SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {} - SbxMethod& operator=( const SbxMethod& r ) - { SbxVariable::operator=( r ); return *this; } + SbxMethod( const String& r, SbxDataType t ); + SbxMethod( const SbxMethod& r ); + ~SbxMethod(); + SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; } sal_Bool Run( SbxValues* pValues = NULL ); virtual SbxClassType GetClass() const; }; diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx index 223bb44b126c..dc0b22eae176 100644 --- a/basic/inc/basic/sbxprop.hxx +++ b/basic/inc/basic/sbxprop.hxx @@ -41,9 +41,9 @@ class BASIC_DLLPUBLIC SbxProperty : public SbxVariable public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1); TYPEINFO(); - SbxProperty( const String& r, SbxDataType t ) - : SbxVariable( t ) { SetName( r ); } + SbxProperty( const String& r, SbxDataType t ); SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {} + virtual ~SbxProperty(); SbxProperty& operator=( const SbxProperty& r ) { SbxVariable::operator=( r ); return *this; } virtual SbxClassType GetClass() const; diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx index 4c5949720b89..350dcf6d56bb 100644 --- a/basic/inc/basic/sbxvar.hxx +++ b/basic/inc/basic/sbxvar.hxx @@ -366,7 +366,7 @@ public: virtual SbxInfo* GetInfo(); void SetInfo( SbxInfo* p ); void SetParameters( SbxArray* p ); - SbxArray* GetParameters() const { return mpPar; } + SbxArray* GetParameters() const; // Sfx-Broadcasting-Support: // Due to data reduction and better DLL-hierarchie currently via casting @@ -375,7 +375,7 @@ public: virtual void Broadcast( sal_uIntPtr nHintId ); inline const SbxObject* GetParent() const { return pParent; } - inline SbxObject* GetParent() { return pParent; } + SbxObject* GetParent(); virtual void SetParent( SbxObject* ); const String& GetDeclareClassName( void ); diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index 0f9b81f8d479..d21f10639819 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -645,6 +645,11 @@ void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, sal_Bool bAllowSize0 SetError( eRes ); } +short SbxDimArray::GetDims() const +{ + return nDim; +} + void SbxDimArray::AddDim( short lb, short ub ) { AddDimImpl32( lb, ub, sal_False ); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index bf4bd83c7b28..cfac25578bc9 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -986,6 +986,21 @@ SvDispatch* SbxObject::GetSvDispatch() return NULL; } +SbxMethod::SbxMethod( const String& r, SbxDataType t ) + : SbxVariable( t ) +{ + SetName( r ); +} + +SbxMethod::SbxMethod( const SbxMethod& r ) + : SvRefBase( r ), SbxVariable( r ) +{ +} + +SbxMethod::~SbxMethod() +{ +} + sal_Bool SbxMethod::Run( SbxValues* pValues ) { SbxValues aRes; @@ -1000,6 +1015,16 @@ SbxClassType SbxMethod::GetClass() const return SbxCLASS_METHOD; } +SbxProperty::SbxProperty( const String& r, SbxDataType t ) + : SbxVariable( t ) +{ + SetName( r ); +} + +SbxProperty::~SbxProperty() +{ +} + SbxClassType SbxProperty::GetClass() const { return SbxCLASS_PROPERTY; diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 77c3b51d74a9..012c643e96e9 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -159,6 +159,16 @@ SfxBroadcaster& SbxVariable::GetBroadcaster() return *pCst; } +SbxArray* SbxVariable::GetParameters() const +{ + return mpPar; +} + +SbxObject* SbxVariable::GetParent() +{ + return pParent; +} + // Perhaps some day one could cut the parameter 0. // then the copying will be dropped ... -- cgit