chart2/source/view/main/DrawModelWrapper.cxx | 1 -
svx/source/sdr/contact/viewcontact.cxx | 15 ---------------
2 files changed, 16 deletions(-)
New commits:
commit 10692be9472584c2dc49d298afd0192fb9ebfe86
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jan 26 07:26:46 2022 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 26 09:34:49 2022 +0100
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 <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx
b/chart2/source/view/main/DrawModelWrapper.cxx
index ff2171f596a1..aa7a002c967a 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -45,7 +45,6 @@ namespace chart
DrawModelWrapper::DrawModelWrapper()
: SdrModel(&ChartItemPool::GetGlobalChartItemPool())
{
- SetVOCInvalidationIsReliable(true);
SetScaleUnit(MapUnit::Map100thMM);
SetScaleFraction(Fraction(1, 1));
SetDefaultFontHeight(423); // 12pt
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 <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx>
#include <osl/diagnose.h>
#include <tools/debug.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
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.
*/
