drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 18 +++------------- drawinglayer/source/processor2d/vclpixelprocessor2d.hxx | 3 -- 2 files changed, 5 insertions(+), 16 deletions(-)
New commits: commit 0252b7bdec3693096bb52c67d335c0e9e662e185 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Wed Sep 7 21:56:31 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat Sep 10 08:39:34 2022 +0200 VclPixelProcessor2D doesnt need a pimpl it is module private Change-Id: Ic9e648202f23e4a48e5485237c9956501e9c96da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139736 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 976e5cb1dccb..12e044959b31 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -70,21 +70,11 @@ using namespace com::sun::star; namespace drawinglayer::processor2d { -struct VclPixelProcessor2D::Impl -{ - AntialiasingFlags m_nOrigAntiAliasing; - - explicit Impl(OutputDevice const& rOutDev) - : m_nOrigAntiAliasing(rOutDev.GetAntialiasing()) - { - } -}; - VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev, const basegfx::BColorModifierStack& rInitStack) : VclProcessor2D(rViewInformation, rOutDev, rInitStack) - , m_pImpl(new Impl(rOutDev)) + , m_nOrigAntiAliasing(rOutDev.GetAntialiasing()) { // prepare maCurrentTransformation matrix with viewTransformation to target directly to pixels maCurrentTransformation = rViewInformation.getObjectToViewTransformation(); @@ -96,11 +86,11 @@ VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& rVie // react on AntiAliasing settings if (SvtOptionsDrawinglayer::IsAntiAliasing()) { - mpOutputDevice->SetAntialiasing(m_pImpl->m_nOrigAntiAliasing | AntialiasingFlags::Enable); + mpOutputDevice->SetAntialiasing(m_nOrigAntiAliasing | AntialiasingFlags::Enable); } else { - mpOutputDevice->SetAntialiasing(m_pImpl->m_nOrigAntiAliasing & ~AntialiasingFlags::Enable); + mpOutputDevice->SetAntialiasing(m_nOrigAntiAliasing & ~AntialiasingFlags::Enable); } } @@ -110,7 +100,7 @@ VclPixelProcessor2D::~VclPixelProcessor2D() mpOutputDevice->Pop(); // restore AntiAliasing - mpOutputDevice->SetAntialiasing(m_pImpl->m_nOrigAntiAliasing); + mpOutputDevice->SetAntialiasing(m_nOrigAntiAliasing); } void VclPixelProcessor2D::tryDrawPolyPolygonColorPrimitive2DDirect( diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx index d7494ccbbfff..9f1e11cb9110 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx @@ -56,8 +56,7 @@ namespace drawinglayer::processor2d */ class VclPixelProcessor2D final : public VclProcessor2D { - struct Impl; - std::unique_ptr<Impl> m_pImpl; + AntialiasingFlags m_nOrigAntiAliasing; /* the local processor for BasePrimitive2D-Implementation based primitives, called from the common process()-implementation