Kaydet (Commit) d349a67a authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Fix visibility in basic to make automation link again.

There are still some link warnings left, though.
üst fbe20a22
......@@ -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 \
......
......@@ -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 \
......
......@@ -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:
......
......@@ -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;
......
......@@ -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;
};
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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;
......
......@@ -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 ...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment