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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 6 |
2 files changed, 3 insertions, 6 deletions
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(), |