From 10692be9472584c2dc49d298afd0192fb9ebfe86 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Jan 2022 07:26:46 +0100 Subject: tdf#146876 PPTX: various graphical elements misplaced Revert "use cache value in ViewContact" This reverts commit 2e162bb1e8521ad8cd8148e0a18adc3eebadd710. Apparently invalidation is not reliable anywhere for ViewContact Change-Id: I1ec40f27de77859a55bf00b80d029fa7181b4492 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128949 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/sdr/contact/viewcontact.cxx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'svx') diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 55af6ab6cd4f..bd79bc5ed4ac 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -26,8 +26,6 @@ #include #include #include -#include -#include namespace sdr::contact { @@ -186,8 +184,6 @@ void ViewContact::ActionChildInserted(ViewContact& rChild) // React on changes of the object of this ViewContact void ViewContact::ActionChanged() { - mxViewIndependentPrimitive2DSequence.clear(); // clear cache - // propagate change to all existing VOCs. This will invalidate // all drawn visualisations in all known views const sal_uInt32 nCount(maViewObjectContactVector.size()); @@ -233,17 +229,6 @@ void ViewContact::createViewIndependentPrimitive2DSequence( void ViewContact::getViewIndependentPrimitive2DContainer( drawinglayer::primitive2d::Primitive2DDecompositionVisitor& rVisitor) const { - // only some of the top-level apps are any good at reliably invalidating us (e.g. writer is not) - if (SdrObject* pSdrObj = TryToGetSdrObject()) - if (pSdrObj->getSdrModelFromSdrObject().IsVOCInvalidationIsReliable()) - { - if (!mxViewIndependentPrimitive2DSequence.empty()) - { - rVisitor.visit(mxViewIndependentPrimitive2DSequence); - return; - } - } - /* Local up-to-date checks. Create new list and compare. We cannot just always use the new data because the old data has cached bitmaps in it e.g. see the document in tdf#146108. */ -- cgit