diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-22 10:47:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-24 10:48:03 +0100 |
commit | 7dca83c77cf20c943a338882b626e2b68d85ea77 (patch) | |
tree | 0a121bea7d416ca84e65a037a3e394a7291e5655 /svx | |
parent | d330483ad0106a750dec560b987c21aaa5394ab6 (diff) |
callcatcher: remove some unused methods
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 45 |
2 files changed, 1 insertions, 56 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 72964cf30e30..4cdf86cff43d 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -308,7 +308,6 @@ public: SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc. SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern - AutoTimer* pAutoTimer; // #i68101# // object name, title and description @@ -316,9 +315,6 @@ public: String aObjTitle; String aObjDescription; - // Name to be used by applications - XubString aHTMLName; - public: TYPEINFO(); SdrObjPlusData(); @@ -613,10 +609,6 @@ public: void SetDescription(const String& rStr); String GetDescription() const; - // support for HTMLName - void SetHTMLName(const String& rStr); - String GetHTMLName() const; - // Fuer Gruppenobjekte sal_Bool IsGroupObject() const { return GetSubList()!=NULL; } virtual SdrObjList* GetSubList() const; @@ -657,10 +649,6 @@ public: */ void SetNavigationPosition (const sal_uInt32 nPosition); - const AutoTimer* GetAutoTimer() const { return pPlusData!=NULL ? pPlusData->pAutoTimer : NULL; } - AutoTimer* GetAutoTimer() { return pPlusData!=NULL ? pPlusData->pAutoTimer : NULL; } - AutoTimer* ForceAutoTimer(); - // #111111# // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and somtimes problematic (inside a bigger object change You will get diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 77e458f21ad4..99a877a24af4 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -239,8 +239,7 @@ TYPEINIT0(SdrObjPlusData); SdrObjPlusData::SdrObjPlusData(): pBroadcast(NULL), pUserDataList(NULL), - pGluePoints(NULL), - pAutoTimer(NULL) + pGluePoints(NULL) { } @@ -249,7 +248,6 @@ SdrObjPlusData::~SdrObjPlusData() if (pBroadcast !=NULL) delete pBroadcast; if (pUserDataList!=NULL) delete pUserDataList; if (pGluePoints !=NULL) delete pGluePoints; - if (pAutoTimer !=NULL) delete pAutoTimer; } SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const @@ -278,13 +276,6 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const pNeuPlusData->aObjTitle = aObjTitle; pNeuPlusData->aObjDescription = aObjDescription; - if (pAutoTimer!=NULL) { - pNeuPlusData->pAutoTimer=new AutoTimer; - // Handler, etc. nicht mitkopieren! - } - - // For HTMLName: Do not clone, leave uninitialized (empty string) - return pNeuPlusData; } @@ -640,13 +631,6 @@ void SdrObject::DelReference(SdrVirtObj& rVrtObj) RemoveListener(rVrtObj); } -AutoTimer* SdrObject::ForceAutoTimer() -{ - ImpForcePlusData(); - if (pPlusData->pAutoTimer==NULL) pPlusData->pAutoTimer=new AutoTimer; - return pPlusData->pAutoTimer; -} - bool SdrObject::HasRefPoint() const { return sal_False; @@ -803,30 +787,6 @@ String SdrObject::GetDescription() const return String(); } -void SdrObject::SetHTMLName(const String& rStr) -{ - if(rStr.Len() && !pPlusData) - { - ImpForcePlusData(); - } - - if(pPlusData && pPlusData->aObjName != rStr) - { - pPlusData->aHTMLName = rStr; - SetChanged(); - } -} - -String SdrObject::GetHTMLName() const -{ - if(pPlusData) - { - return pPlusData->aHTMLName; - } - - return String(); -} - sal_uInt32 SdrObject::GetOrdNum() const { if (pObjList!=NULL) { @@ -837,9 +797,6 @@ sal_uInt32 SdrObject::GetOrdNum() const return nOrdNum; } - - - sal_uInt32 SdrObject::GetNavigationPosition (void) { if (pObjList!=NULL && pObjList->RecalcNavigationPositions()) |