diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-04-17 14:46:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-23 15:56:14 +0200 |
| commit | 57c40329a2b469813a1f357de355a37c8e3077ae (patch) | |
| tree | c8b401d46c608d1160ddf87354c7317769ca6b86 /svx | |
| parent | 7d0e88ce674a7e809352842bcce3cd67f548a524 (diff) | |
tdf#136058: 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 <noel.grandin@collabora.co.uk>
(cherry picked from commit b236b36475ed9a204ac931c34ccc23205296a0a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114508
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontact.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
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<ViewContact*>(this)->mxViewIndependentPrimitive2DSequence = std::move(xNew); - } - - // return current Primitive2DContainer - return mxViewIndependentPrimitive2DSequence; + return xNew; } // add Gluepoints (if available) |