summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drawinglayer/source/geometry/viewinformation2d.cxx51
-rw-r--r--drawinglayer/source/processor2d/contourextractor2d.cxx3
-rw-r--r--drawinglayer/source/processor2d/hittestprocessor2d.cxx3
-rw-r--r--drawinglayer/source/processor2d/linegeometryextractor2d.cxx3
-rw-r--r--drawinglayer/source/processor2d/textaspolygonextractor2d.cxx3
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx6
-rw-r--r--include/drawinglayer/geometry/viewinformation2d.hxx13
-rw-r--r--sc/source/ui/view/output.cxx3
-rw-r--r--svx/source/dialog/pagectrl.cxx3
-rw-r--r--svx/source/dialog/weldeditview.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontactofobjlistpainter.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx3
-rw-r--r--sw/source/core/doc/notxtfrm.cxx3
-rw-r--r--sw/source/core/layout/paintfrm.cxx6
17 files changed, 25 insertions, 93 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
diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx
index 95be29a72bda..20ef7c4de453 100644
--- a/include/drawinglayer/geometry/viewinformation2d.hxx
+++ b/include/drawinglayer/geometry/viewinformation2d.hxx
@@ -105,8 +105,7 @@ public:
const basegfx::B2DHomMatrix& rViewTransformation,
const basegfx::B2DRange& rViewport,
const css::uno::Reference<css::drawing::XDrawPage>& rxDrawPage,
- double fViewTime,
- const css::uno::Sequence<css::beans::PropertyValue>& rExtendedParameters);
+ double fViewTime);
/** Constructor: Create a ViewInformation2D
@@ -166,16 +165,6 @@ public:
can be used for complete information transport over UNO API.
*/
const css::uno::Sequence<css::beans::PropertyValue>& getViewInformationSequence() const;
-
- /** Get the uno::Sequence< beans::PropertyValue > which contains only ViewInformation
- not offered directly
-
- Use this call if You only need ViewInformation which is not offered conveniently,
- but only exists as PropertyValue. This is e.g. used to create partially updated
- incarnations of ViewInformation2D without losing the only with PropertyValues
- defined data. It does not contain a complete description.
- */
- const css::uno::Sequence<css::beans::PropertyValue>& getExtendedInformationSequence() const;
};
} // end of namespace drawinglayer::geometry
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 93b542b2c851..e02fde75aede 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1721,8 +1721,7 @@ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> ScOutputData::Create
mpDev->GetViewTransformation(),
aViewRange,
GetXDrawPageForSdrPage( pDrawPage ),
- 0.0,
- uno::Sequence< beans::PropertyValue >() );
+ 0.0);
return drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*mpDev, aNewViewInfos );
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 1fb9d0ae1464..028491bbbf78 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -358,8 +358,7 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext,
return;
const drawinglayer::geometry::ViewInformation2D aViewInformation2D(
- basegfx::B2DHomMatrix(), rRenderContext.GetViewTransformation(), aPaintRange, nullptr,
- 0.0, css::uno::Sequence<css::beans::PropertyValue >());
+ basegfx::B2DHomMatrix(), rRenderContext.GetViewTransformation(), aPaintRange, nullptr, 0.0);
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createProcessor2DFromOutputDevice(rRenderContext, aViewInformation2D));
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 7059ada36320..0e31a3780e3e 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -236,8 +236,7 @@ void WeldEditView::DoPaint(vcl::RenderContext& rRenderContext, const tools::Rect
const drawinglayer::geometry::ViewInformation2D aViewInformation2D(
basegfx::B2DHomMatrix(), rRenderContext.GetViewTransformation(),
- vcl::unotools::b2DRectangleFromRectangle(rRect), nullptr, 0.0,
- css::uno::Sequence<css::beans::PropertyValue>());
+ vcl::unotools::b2DRectangleFromRectangle(rRect), nullptr, 0.0);
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(
drawinglayer::processor2d::createProcessor2DFromOutputDevice(rRenderContext,
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;
}
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 2d19c61972f9..d95314b19961 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -900,8 +900,7 @@ static bool paintUsingPrimitivesHelper(
rOutputDevice.GetViewTransformation(),
rTargetRange,
nullptr,
- 0.0,
- uno::Sequence< beans::PropertyValue >());
+ 0.0);
// get a primitive processor for rendering
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 0cf9c7fc7b26..0eead63a35f0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1794,8 +1794,7 @@ bool DrawFillAttributes(
rOut.GetViewTransformation(),
aPaintRange,
nullptr,
- 0.0,
- uno::Sequence< beans::PropertyValue >());
+ 0.0);
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rOut,
aViewInformation2D) );
@@ -5129,8 +5128,7 @@ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> SwFrame::CreateProce
getRootFrame()->GetCurrShell()->GetOut()->GetViewTransformation(),
aViewRange,
GetXDrawPageForSdrPage( pDrawPage ),
- 0.0,
- uno::Sequence< beans::PropertyValue >() );
+ 0.0);
return drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*getRootFrame()->GetCurrShell()->GetOut(),
generated by cgit (git 2.34.1) at 2025-03-01 07:44:02 +0000