6 files changed, 19 insertions, 9 deletions
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index 2a93dc372555..8a56ebce5a0d 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -142,8 +142,10 @@ bool ViewObjectContactPrimitiveHit(
             {
                 // create a HitTest processor
                 const drawinglayer::geometry::ViewInformation2D& rViewInformation2D = rVOC.GetObjectContact().getViewInformation2D();
+                const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(rViewInformation2D);
+
                 drawinglayer::processor2d::HitTestProcessor2D aHitTestProcessor2D(
-                    rViewInformation2D,
+                    aVisitingParameters,
                     rHitPosition,
                     fLogicHitTolerance,
                     bTextOnly);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index e7a3f18076f1..763d2973a489 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -771,9 +771,10 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::
     {
         // completely reworked to use primitives; this ensures same look and functionality
         const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+        const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
         std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(
             drawinglayer::processor2d::createProcessor2DFromOutputDevice(rTargetDevice,
-                                                                         aViewInformation2D));
+                                                                         aVisitingParameters));
 
         const bool bMapModeEnabled(rTargetDevice.IsMapModeEnabled());
         const basegfx::B2DRange aRange = vcl::unotools::b2DRectangleFromRectangle(aPixRect);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 15b9cc6dcfcf..91b812c73136 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -995,7 +995,8 @@ void SdrObject::RecalcBoundRect()
 
     // use neutral ViewInformation and get the range of the primitives
     const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-    const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D));
+    const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
+    const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aVisitingParameters));
 
     if(!aRange.isEmpty())
     {
@@ -1195,9 +1196,10 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         {
             // use neutral ViewInformation
             const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+            const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
 
             // create extractor, process and get result (with hairlines as opened polygons)
-            drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D, false);
+            drawinglayer::processor2d::ContourExtractor2D aExtractor(aVisitingParameters, false);
             aExtractor.process(xSequence);
             const basegfx::B2DPolyPolygonVector& rResult(aExtractor.getExtractedContour());
             const sal_uInt32 nSize(rResult.size());
@@ -2372,8 +2374,10 @@ static void extractLineContourFromPrimitive2DSequence(
     // use neutral ViewInformation
     const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
+     drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
+
     // create extractor, process and get result
-    drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D);
+    drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aVisitingParameters);
     aExtractor.process(rxSequence);
 
     // copy line results
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 778ca244d63e..5821f2dbcdbf 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -150,8 +150,9 @@ void SdrGrafObj::onGraphicChanged()
     if (aSequence.empty())
         return;
 
-    drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-    drawinglayer::processor2d::ObjectInfoPrimitiveExtractor2D aProcessor(aViewInformation2D);
+    const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+    const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
+    drawinglayer::processor2d::ObjectInfoPrimitiveExtractor2D aProcessor(aVisitingParameters);
 
     aProcessor.process(aSequence);
 
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index f0abb2b9d5a2..11b077c42868 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -300,7 +300,8 @@ SdrObjectUniquePtr SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly
     {
         // create an extractor with neutral ViewInformation
         const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-        drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D);
+        const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
+        drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aVisitingParameters);
 
         // extract text as polygons
         aExtractor.process(xSequence);
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 8881336bdcf9..c3c08a981baa 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -486,7 +486,8 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked, const
 
                 // get logic range
                 const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-                const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D));
+                const drawinglayer::primitive2d::VisitingParameters aVisitingParameters(aViewInformation2D);
+                const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aVisitingParameters));
 
                 if(!aRange.isEmpty())
                 {