diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-07-22 18:06:30 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-07-31 06:23:54 +0200 |
commit | 13efd364c046b8064f03cb23bb232f42a892d601 (patch) | |
tree | 74b45cc2b68d2afe3763de89625b024f599ba7c4 /svx/source/sdr | |
parent | ea269c0a04ede8206ba15fd77d26bbd99ec44c75 (diff) |
drawinglayer: remove extendedInformation from ViewInformation2D
We actually never use extended information when normally using
the ViewInformation2D. The exception here is when we construct it
from property values, where the unknown property values are then
stored into the extended information sequence and then later
reconstructed when we convert it back to a sequence of property
values. Just for that case we don't neeed to expose the extended
information to the outside and create it, as that is then a
implementation detail for the UNO use case.
I am also not convinced we need it when creating ViewInformation2D
with the sequence of property values - it certantly not expected
that we need to preserve the property values at all, but that is
something that needs to be checked.
Change-Id: I3b8d533cd412aac8b89ca2921738d6487be5cf45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119720
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx/source/sdr')
4 files changed, 4 insertions, 8 deletions
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 608a97ebd698..d59d320acb34 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -102,8 +102,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) pTargetDevice->GetViewTransformation(), aViewRange, GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)), - 0.0, - css::uno::Sequence<css::beans::PropertyValue>()); + 0.0); updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 3a3c28b972f8..150735030ea5 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -213,8 +213,7 @@ namespace sdr::contact rTargetOutDev.GetViewTransformation(), aViewRange, GetXDrawPageForSdrPage(GetSdrPage()), - fCurrentTime, - uno::Sequence<beans::PropertyValue>()); + fCurrentTime); updateViewInformation2D(aNewViewInformation2D); drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence; diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index ad1d0bf87a9e..9e19982b7824 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -137,8 +137,7 @@ drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPr basegfx::B2DRange(), GetXDrawPageForSdrPage(pStartPage), - 0.0, // no time; page previews are not animated - rOriginalViewInformation.getExtendedInformationSequence()); + 0.0); // no time; page previews are not animated updateViewInformation2D(aNewViewInformation2D); // create copy of DisplayInfo to set PagePainting diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 6965b6a775a0..5d145687b3e0 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -162,8 +162,7 @@ namespace sdr::overlay maViewTransformation, aViewRange, maViewInformation2D.getVisualizedPage(), - maViewInformation2D.getViewTime(), - maViewInformation2D.getExtendedInformationSequence()); + maViewInformation2D.getViewTime()); pThis->mfDiscreteOne = 0.0; } |