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>

7 files changed, 14 insertions, 61 deletions

diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 5067a33f2f75..5b276cf52a59 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -221,51 +221,25 @@ public:
     ImpViewInformation2D(const basegfx::B2DHomMatrix& rObjectTransformation,
                          const basegfx::B2DHomMatrix& rViewTransformation,
                          const basegfx::B2DRange& rViewport,
-                         const uno::Reference<drawing::XDrawPage>& rxDrawPage, double fViewTime,
-                         const uno::Sequence<beans::PropertyValue>& rExtendedParameters)
+                         const uno::Reference<drawing::XDrawPage>& rxDrawPage, double fViewTime)
         : maObjectTransformation(rObjectTransformation)
         , maViewTransformation(rViewTransformation)
-        , maObjectToViewTransformation()
-        , maInverseObjectToViewTransformation()
         , maViewport(rViewport)
-        , maDiscreteViewport()
         , mxVisualizedPage(rxDrawPage)
         , mfViewTime(fViewTime)
         , mbReducedDisplayQuality(false)
-        , mxViewInformation()
-        , mxExtendedInformation()
     {
-        impInterpretPropertyValues(rExtendedParameters);
     }
 
     explicit ImpViewInformation2D(const uno::Sequence<beans::PropertyValue>& rViewParameters)
-        : maObjectTransformation()
-        , maViewTransformation()
-        , maObjectToViewTransformation()
-        , maInverseObjectToViewTransformation()
-        , maViewport()
-        , maDiscreteViewport()
-        , mxVisualizedPage()
-        , mfViewTime()
-        , mbReducedDisplayQuality(false)
+        : mbReducedDisplayQuality(false)
         , mxViewInformation(rViewParameters)
-        , mxExtendedInformation()
     {
         impInterpretPropertyValues(rViewParameters);
     }
 
     ImpViewInformation2D()
-        : maObjectTransformation()
-        , maViewTransformation()
-        , maObjectToViewTransformation()
-        , maInverseObjectToViewTransformation()
-        , maViewport()
-        , maDiscreteViewport()
-        , mxVisualizedPage()
-        , mfViewTime()
-        , mbReducedDisplayQuality(false)
-        , mxViewInformation()
-        , mxExtendedInformation()
+        : mbReducedDisplayQuality(false)
     {
     }
 
@@ -330,19 +304,13 @@ public:
         return mxViewInformation;
     }
 
-    const uno::Sequence<beans::PropertyValue>& getExtendedInformationSequence() const
-    {
-        return mxExtendedInformation;
-    }
-
     bool operator==(const ImpViewInformation2D& rCandidate) const
     {
         return (maObjectTransformation == rCandidate.maObjectTransformation
                 && maViewTransformation == rCandidate.maViewTransformation
                 && maViewport == rCandidate.maViewport
                 && mxVisualizedPage == rCandidate.mxVisualizedPage
-                && mfViewTime == rCandidate.mfViewTime
-                && mxExtendedInformation == rCandidate.mxExtendedInformation);
+                && mfViewTime == rCandidate.mfViewTime);
     }
 };
 
@@ -357,11 +325,9 @@ ViewInformation2D::ViewInformation2D(const basegfx::B2DHomMatrix& rObjectTransfo
                                      const basegfx::B2DHomMatrix& rViewTransformation,
                                      const basegfx::B2DRange& rViewport,
                                      const uno::Reference<drawing::XDrawPage>& rxDrawPage,
-                                     double fViewTime,
-                                     const uno::Sequence<beans::PropertyValue>& rExtendedParameters)
+                                     double fViewTime)
     : mpViewInformation2D(ImpViewInformation2D(rObjectTransformation, rViewTransformation,
-                                               rViewport, rxDrawPage, fViewTime,
-                                               rExtendedParameters))
+                                               rViewport, rxDrawPage, fViewTime))
 {
 }
 
@@ -437,11 +403,6 @@ const uno::Sequence<beans::PropertyValue>& ViewInformation2D::getViewInformation
     return mpViewInformation2D->getViewInformationSequence();
 }
 
-const uno::Sequence<beans::PropertyValue>& ViewInformation2D::getExtendedInformationSequence() const
-{
-    return mpViewInformation2D->getExtendedInformationSequence();
-}
-
 } // end of namespace drawinglayer::geometry
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index 8abec2f50f9d..96250f59fa17 100644
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
@@ -129,8 +129,7 @@ namespace drawinglayer::processor2d
                         getViewInformation2D().getViewTransformation(),
                         getViewInformation2D().getViewport(),
                         getViewInformation2D().getVisualizedPage(),
-                        getViewInformation2D().getViewTime(),
-                        getViewInformation2D().getExtendedInformationSequence());
+                        getViewInformation2D().getViewTime());
                     updateViewInformation(aViewInformation2D);
 
                     // process content
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 04505489c6f2..8e5dc31242e4 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -238,8 +238,7 @@ namespace drawinglayer::processor2d
                         getViewInformation2D().getViewTransformation(),
                         getViewInformation2D().getViewport(),
                         getViewInformation2D().getVisualizedPage(),
-                        getViewInformation2D().getViewTime(),
-                        getViewInformation2D().getExtendedInformationSequence());
+                        getViewInformation2D().getViewTime());
                     updateViewInformation(aViewInformation2D);
 
                     // process child content recursively
diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
index 9262e23e4509..9b7c9b62e90a 100644
--- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
+++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
@@ -91,8 +91,7 @@ namespace drawinglayer::processor2d
                         getViewInformation2D().getViewTransformation(),
                         getViewInformation2D().getViewport(),
                         getViewInformation2D().getVisualizedPage(),
-                        getViewInformation2D().getViewTime(),
-                        getViewInformation2D().getExtendedInformationSequence());
+                        getViewInformation2D().getViewTime());
                     updateViewInformation(aViewInformation2D);
 
                     // process content
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index e3a584f86172..82bc044e36f9 100644
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
@@ -182,8 +182,7 @@ namespace drawinglayer::processor2d
                         getViewInformation2D().getViewTransformation(),
                         getViewInformation2D().getViewport(),
                         getViewInformation2D().getVisualizedPage(),
-                        getViewInformation2D().getViewTime(),
-                        getViewInformation2D().getExtendedInformationSequence());
+                        getViewInformation2D().getViewTime());
                     updateViewInformation(aViewInformation2D);
 
                     // process content
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index f08d17f2f002..d60616d5be2c 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2308,8 +2308,7 @@ void VclMetafileProcessor2D::processTransparencePrimitive2D(
             // except new transformation and range
             const geometry::ViewInformation2D aViewInfo(
                 getViewInformation2D().getObjectTransformation(), aViewTransform, aViewRange,
-                getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(),
-                getViewInformation2D().getExtendedInformationSequence());
+                getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime());
 
             VclPixelProcessor2D aBufferProcessor(aViewInfo, *aBufferDevice);
 
@@ -2426,8 +2425,7 @@ VclMetafileProcessor2D::CreateBufferDevice(const basegfx::B2DRange& rCandidateRa
         // except new transformation and range
         rViewInfo = geometry::ViewInformation2D(
             getViewInformation2D().getObjectTransformation(), aViewTransform, aViewRange,
-            getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(),
-            getViewInformation2D().getExtendedInformationSequence());
+            getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime());
     }
     else
         pBufferDevice.disposeAndClear();
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index bd6af1b27221..ed40fdb4ee23 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -905,8 +905,7 @@ void VclProcessor2D::RenderTransformPrimitive2D(
     const geometry::ViewInformation2D aViewInformation2D(
         getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(),
         getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(),
-        getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(),
-        getViewInformation2D().getExtendedInformationSequence());
+        getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime());
     updateViewInformation(aViewInformation2D);
 
     // process content
@@ -928,8 +927,7 @@ void VclProcessor2D::RenderPagePreviewPrimitive2D(
     const geometry::ViewInformation2D aViewInformation2D(
         getViewInformation2D().getObjectTransformation(),
         getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(),
-        rPagePreviewCandidate.getXDrawPage(), getViewInformation2D().getViewTime(),
-        getViewInformation2D().getExtendedInformationSequence());
+        rPagePreviewCandidate.getXDrawPage(), getViewInformation2D().getViewTime());
     updateViewInformation(aViewInformation2D);
 
     // process decomposed content