drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 5 ++--- drawinglayer/source/processor2d/vclpixelprocessor2d.hxx | 4 +--- drawinglayer/source/processor2d/vclprocessor2d.cxx | 4 ++-- drawinglayer/source/processor2d/vclprocessor2d.hxx | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-)
New commits: commit 0acab5124c0682dee75674fa55c9250908c93655 Author: Armin Le Grand (allotropia) <armin.le.grand.ext...@allotropia.de> AuthorDate: Tue Oct 1 12:25:02 2024 +0200 Commit: Armin Le Grand <armin.le.gr...@me.com> CommitDate: Tue Oct 1 15:23:33 2024 +0200 Remove unused BColorModifierStack from VclProcessor constructor Was not used and - if needed - should be done by embedding the sequence of Primitives sent to it to a ModifiedColorPrimitive2D containing the intended BColorModifier. Keep clases as simple as possible. Change-Id: I99de18cc971d6b396ad291ef88b59bd7599f9196 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174314 Reviewed-by: Armin Le Grand <armin.le.gr...@me.com> Tested-by: Jenkins diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 0ed950e5ffdb..1581be4a7c42 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -69,9 +69,8 @@ using namespace com::sun::star; namespace drawinglayer::processor2d { VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, - OutputDevice& rOutDev, - const basegfx::BColorModifierStack& rInitStack) - : VclProcessor2D(rViewInformation, rOutDev, rInitStack) + OutputDevice& rOutDev) + : VclProcessor2D(rViewInformation, rOutDev) , m_nOrigAntiAliasing(rOutDev.GetAntialiasing()) , m_bRenderSimpleTextDirect( officecfg::Office::Common::Drawinglayer::RenderSimpleTextDirect::get()) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx index 3cecf6622228..1a6d424f9598 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx @@ -100,9 +100,7 @@ class VclPixelProcessor2D final : public VclProcessor2D public: /// constructor/destructor - VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev, - const basegfx::BColorModifierStack& rInitStack - = basegfx::BColorModifierStack()); + VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~VclPixelProcessor2D() override; }; } // end of namespace drawinglayer::processor2d diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 889a46f1c019..2e3a7c08f7cf 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -1602,10 +1602,10 @@ void VclProcessor2D::adaptTextToFillDrawMode() const // process support VclProcessor2D::VclProcessor2D(const geometry::ViewInformation2D& rViewInformation, - OutputDevice& rOutDev, basegfx::BColorModifierStack aInitStack) + OutputDevice& rOutDev) : BaseProcessor2D(rViewInformation) , mpOutputDevice(&rOutDev) - , maBColorModifierStack(std::move(aInitStack)) + , maBColorModifierStack() , mnPolygonStrokePrimitive2D(0) { // set digit language, derived from SvtCTLOptions to have the correct diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/drawinglayer/source/processor2d/vclprocessor2d.hxx index d2f0a69157fb..7fd25225b15d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx @@ -110,8 +110,7 @@ protected: public: // constructor/destructor - VclProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev, - basegfx::BColorModifierStack aInitStack = basegfx::BColorModifierStack()); + VclProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~VclProcessor2D() override; private: