From b236b36475ed9a204ac931c34ccc23205296a0a6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 17 Apr 2021 14:46:59 +0200 Subject: remove some caching if we going to recreate it every time we call this method, there is no point in caching the result. Change-Id: Ie1f7bde86eca5cdd998fa8626303d3dead479ad3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114231 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/sdr/contact/viewcontact.cxx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'svx/source') diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 8e8d35db4406..0d1a9f0cb085 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -38,7 +38,6 @@ ViewObjectContact& ViewContact::CreateObjectSpecificViewObjectContact(ObjectCont ViewContact::ViewContact() : maViewObjectContactVector() - , mxViewIndependentPrimitive2DSequence() { } @@ -105,9 +104,7 @@ void ViewContact::RemoveViewObjectContact(ViewObjectContact& rVOContact) maViewObjectContactVector.begin(), maViewObjectContactVector.end(), &rVOContact); if (aFindResult != maViewObjectContactVector.end()) - { maViewObjectContactVector.erase(aFindResult); - } } // Test if this ViewContact has ViewObjectContacts at all. This can @@ -226,10 +223,9 @@ ViewContact::createViewIndependentPrimitive2DSequence() const return drawinglayer::primitive2d::Primitive2DContainer{ xReference }; } -drawinglayer::primitive2d::Primitive2DContainer const& +drawinglayer::primitive2d::Primitive2DContainer ViewContact::getViewIndependentPrimitive2DContainer() const { - // local up-to-date checks. Create new list and compare. drawinglayer::primitive2d::Primitive2DContainer xNew( createViewIndependentPrimitive2DSequence()); @@ -239,14 +235,7 @@ ViewContact::getViewIndependentPrimitive2DContainer() const xNew = embedToObjectSpecificInformation(std::move(xNew)); } - if (mxViewIndependentPrimitive2DSequence != xNew) - { - // has changed, copy content - const_cast(this)->mxViewIndependentPrimitive2DSequence = std::move(xNew); - } - - // return current Primitive2DContainer - return mxViewIndependentPrimitive2DSequence; + return xNew; } // add Gluepoints (if available) -- cgit