oox/inc/drawingml/misccontexts.hxx | 3 +-- oox/source/drawingml/misccontexts.cxx | 5 +---- oox/source/drawingml/textcharacterpropertiescontext.cxx | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-)
New commits: commit b4a5e55585d90ef5495505b49b1f2b48c5818200 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jan 23 20:15:31 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jan 26 08:35:20 2026 +0100 loplugin:constantparam in SimpleFillPropertiesContext Change-Id: I4034d87f42f194669dc438333b53397034185ee6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198024 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx index 8fc1bb7e12fc..4373ab08dc36 100644 --- a/oox/inc/drawingml/misccontexts.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -233,12 +233,11 @@ class SimpleFillPropertiesContext final : private FillProperties, public FillPro public: explicit SimpleFillPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, - ::model::ComplexColor& rColor, Color *pOOXColor); + ::model::ComplexColor& rColor); virtual ~SimpleFillPropertiesContext() override; private: ::model::ComplexColor& mrColor; - Color* mpOOXColor; }; } // namespace oox::drawingml diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx index 228ad2022b84..57a4e9705f59 100644 --- a/oox/source/drawingml/misccontexts.cxx +++ b/oox/source/drawingml/misccontexts.cxx @@ -588,18 +588,15 @@ ContextHandlerRef FillPropertiesContext::createFillContext( return nullptr; } -SimpleFillPropertiesContext::SimpleFillPropertiesContext(ContextHandler2Helper const & rParent, model::ComplexColor& rColor, Color *pOOXColor) +SimpleFillPropertiesContext::SimpleFillPropertiesContext(ContextHandler2Helper const & rParent, model::ComplexColor& rColor) : FillPropertiesContext(rParent, *this) , mrColor(rColor) - , mpOOXColor(pOOXColor) { } SimpleFillPropertiesContext::~SimpleFillPropertiesContext() { mrColor = getBestSolidColor().createComplexColor(getFilter().getGraphicHelper(), -1); - if (mpOOXColor) - *mpOOXColor = getBestSolidColor(); } BlipExtensionContext::BlipExtensionContext(ContextHandler2Helper const & rParent, BlipFillProperties& rBlipProps, model::BlipFill* pBlipFill) diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index e1a4beb9f041..2bd305423d23 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -154,7 +154,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl mrTextCharacterProperties.moUnderlineFillFollowText = true; break; case A_TOKEN( uFill ): // CT_TextUnderlineFillGroupWrapper->EG_FillProperties (not supported) - return new SimpleFillPropertiesContext( *this, mrTextCharacterProperties.maUnderlineColor, nullptr); + return new SimpleFillPropertiesContext( *this, mrTextCharacterProperties.maUnderlineColor); // CT_FontCollection case A_TOKEN( latin ): // CT_TextFont
