include/svx/sdr/contact/viewcontactofsdrobj.hxx | 7 ------
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 25 ------------------------
2 files changed, 1 insertion(+), 31 deletions(-)
New commits:
commit c1916d3ab8f764e465f889334050ce7c863576b3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Dec 8 12:25:58 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 9 12:02:43 2021 +0100
meRememberedAnimationKind is dead
and removing it actually makes chart loading faster, because we now
avoid always instantiaing the ObjectItemSet
Change-Id: I48420bcc38c61e4f6b211724271bc61db0e1f0d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126572
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index a20dde7bb4b6..65b353f41be4 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -38,10 +38,6 @@ protected:
// to be changed in any way.
SdrObject& mrObject;
- // Remember AnimationKind of object. Used to find out if that kind
- // has changed in ActionChanged()
- SdrTextAniKind meRememberedAnimationKind;
-
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
virtual ViewObjectContact&
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
@@ -62,9 +58,6 @@ public:
virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override;
virtual ViewContact* GetParentContact() const override;
- // React on changes of the object of this ViewContact
- virtual void ActionChanged() override;
-
/// override for accessing the SdrObject
virtual SdrObject* TryToGetSdrObject() const override;
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 16c54ec069e7..3973f5349038 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -41,14 +41,8 @@ ViewObjectContact&
ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact(Ob
}
ViewContactOfSdrObj::ViewContactOfSdrObj(SdrObject& rObj)
-: mrObject(rObj),
- meRememberedAnimationKind(SdrTextAniKind::NONE)
+: mrObject(rObj)
{
- // init AnimationKind
- if(auto pTextObj = dynamic_cast<const SdrTextObj*>( &GetSdrObject() ))
- {
- meRememberedAnimationKind = pTextObj->GetTextAniKind();
- }
}
ViewContactOfSdrObj::~ViewContactOfSdrObj()
@@ -100,23 +94,6 @@ ViewContact* ViewContactOfSdrObj::GetParentContact() const
return pRetval;
}
-// React on changes of the object of this ViewContact
-void ViewContactOfSdrObj::ActionChanged()
-{
- // look for own changes
- if (SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(&GetSdrObject()))
- {
- if (pTextObj->GetTextAniKind() != meRememberedAnimationKind)
- {
- // #i38135# now remember new type
- meRememberedAnimationKind = pTextObj->GetTextAniKind();
- }
- }
-
- // call parent
- ViewContact::ActionChanged();
-}
-
// override for accessing the SdrObject
SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const
{
