diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-05 17:17:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-08 23:25:26 +0200 |
| commit | c66a0e9c86e77a2615e50152c9b26d73c722ef23 (patch) | |
| tree | 71d2a327429dff29b77c2132b3c621acf3884997 /include | |
| parent | 92a2862e5c0dd60fd6ed8ae21bd6f4852f0044a1 (diff) | |
remove obsolete SjJSbxObject cruft
Change-Id: Ieb10d3bd8fc23650156906292bf3d0757565e2af
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/macitem.hxx | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 10f635737b54..85e006e7270f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -47,23 +47,10 @@ enum ScriptType EXTENDED_STYPE }; -// Basisklasse fuer SjJSbxObject mit virtuellem Destruktor -class SjJSbxObjectBase -{ -public: - virtual ~SjJSbxObjectBase(); - virtual SjJSbxObjectBase* Clone( void ); - //virtual SjJSbxObjectBase& operator=( const SjJSbxObjectBase& rBase ); -}; - -class SjJSbxObject; - class SVL_DLLPUBLIC SvxMacro { OUString aMacName; OUString aLibName; - // Fuer JavaScript muss ein Function-Objekt gehalten werden - SjJSbxObjectBase* pFunctionObject; ScriptType eType; public: @@ -73,9 +60,6 @@ public: SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eType); // = STARBASIC entfernt - SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ); - ~SvxMacro(); // noetig fuer pFunctionObject - const OUString &GetLibName() const { return aLibName; } const OUString &GetMacName() const { return aMacName; } OUString GetLanguage()const; @@ -84,22 +68,12 @@ public: bool HasMacro() const { return !aMacName.isEmpty(); } -#ifdef SOLAR_JAVA - // JavaScript-Function-Objekt holen - // ACHTUNG: Implementation in SJ, Source/JScript/sjimpl.cxx - SjJSbxObjectBase* GetFunctionObject( SjJSbxObject* pParent ); -#endif - SvxMacro& operator=( const SvxMacro& rBase ); }; inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eTyp ) - : aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL), eType( eTyp ) -{} - -inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ) - : aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType( JAVASCRIPT ) + : aMacName( rMacName ), aLibName( rLibName ), eType( eTyp ) {} //Macro Table, zerstoert die Pointer im DTor! |