include/vcl/outdev.hxx | 3 +-- include/vcl/toolkit/button.hxx | 1 - sd/inc/ModelTraverser.hxx | 1 - sd/source/core/ModelTraverser.cxx | 3 +-- sd/source/filter/eppt/pptx-epptooxml.cxx | 2 +- sd/source/ui/inc/SlideshowLayerRenderer.hxx | 1 - sd/source/ui/tools/GraphicSizeCheck.cxx | 2 +- sw/source/filter/ww8/docxattributeoutput.cxx | 3 +-- sw/source/filter/ww8/docxattributeoutput.hxx | 2 -- vcl/source/control/button.cxx | 21 ++++----------------- vcl/source/outdev/textline.cxx | 5 ++--- 11 files changed, 11 insertions(+), 33 deletions(-)
New commits: commit 989b9ed8b3666b944aa094bef4b41a33102c5a3f Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 29 13:29:47 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 29 16:31:41 2025 +0200 loplugin:constantparam Change-Id: I3dc739ad13457c3df64dd671567118cb7a77e779 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191622 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d1bdfff13411..3cc7d153a53f 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -883,8 +883,7 @@ public: void DrawTextLine( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, - FontLineStyle eOverline, - bool bUnderlineAbove = false ); + FontLineStyle eOverline ); SAL_DLLPRIVATE void ImplDrawTextLine( tools::Long nBaseX, tools::Long nX, tools::Long nY, double nWidth, double nLayoutWidth, FontStrikeout eStrikeout, diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index 460c3f0118dc..7ec5262ef0f4 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -956,8 +956,7 @@ void OutputDevice::SetOverlineColor( const Color& rColor ) void OutputDevice::DrawTextLine( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, - FontLineStyle eOverline, - bool bUnderlineAbove ) + FontLineStyle eOverline ) { assert(!is_double_buffered_window()); @@ -987,7 +986,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, tools::Long nWidth, Point aPos = ImplLogicToDevicePixel( rPos ); double fWidth = ImplLogicWidthToDeviceSubPixel(nWidth); aPos += Point( mnTextOffX, mnTextOffY ); - ImplDrawTextLine( aPos.X(), aPos.X(), 0, fWidth, fWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove ); + ImplDrawTextLine( aPos.X(), aPos.X(), 0, fWidth, fWidth, eStrikeout, eUnderline, eOverline, /*bUnderlineAbove*/false ); } void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, tools::Long nLineWidth, tools::Long nWaveHeight) commit cd888f43a6f5a2afbde4613e012df956a89ee6c9 Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 29 13:12:26 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 29 16:31:31 2025 +0200 loplugin:singlevalfields Change-Id: Idfc08ff0ca967f0400ce316925a92839fe2981af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191621 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 75bf940ef6dd..e6c1572d2290 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -184,7 +184,6 @@ public: protected: PushButtonDropdownStyle mnDDStyle; - bool mbIsActive; SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); diff --git a/sd/inc/ModelTraverser.hxx b/sd/inc/ModelTraverser.hxx index 9903470015f6..3fa03d638e22 100644 --- a/sd/inc/ModelTraverser.hxx +++ b/sd/inc/ModelTraverser.hxx @@ -32,7 +32,6 @@ public: /** Options to change how the traverser is traversing the tree, what is included and what not */ struct TraverserOptions { - bool mbPages = true; bool mbMasterPages = false; }; diff --git a/sd/source/core/ModelTraverser.cxx b/sd/source/core/ModelTraverser.cxx index e87f06ffb581..f6abbbc06656 100644 --- a/sd/source/core/ModelTraverser.cxx +++ b/sd/source/core/ModelTraverser.cxx @@ -20,8 +20,7 @@ void ModelTraverser::traverse() if (!m_pDocument) return; - if (m_aTraverserOptions.mbPages) - traversePages(); + traversePages(); if (m_aTraverserOptions.mbMasterPages) traverseMasterPages(); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index aa8183de5d90..bcf5fc198c54 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -683,7 +683,7 @@ std::unordered_set<OUString> PowerPointExport::getUsedFontList() return aReturnSet; auto pCollector = std::make_shared<FontNameCollector>(aReturnSet, mbEmbedLatinScript, mbEmbedAsianScript, mbEmbedComplexScript); - sd::ModelTraverser aModelTraverser(pDocument, { .mbPages = true, .mbMasterPages = true }); + sd::ModelTraverser aModelTraverser(pDocument, { .mbMasterPages = true }); aModelTraverser.addNodeHandler(pCollector); aModelTraverser.traverse(); diff --git a/sd/source/ui/inc/SlideshowLayerRenderer.hxx b/sd/source/ui/inc/SlideshowLayerRenderer.hxx index 15064456c9fb..970bae9eb3ba 100644 --- a/sd/source/ui/inc/SlideshowLayerRenderer.hxx +++ b/sd/source/ui/inc/SlideshowLayerRenderer.hxx @@ -112,7 +112,6 @@ struct RenderState std::vector<drawinglayer::primitive2d::Primitive2DReference> maPrimitivesToUnhide; SdrObject* mpCurrentTarget = nullptr; - sal_Int32 mnCurrentTargetParagraph = -1; bool mbShowMasterPageObjects = false; bool mbFooterEnabled = false; diff --git a/sd/source/ui/tools/GraphicSizeCheck.cxx b/sd/source/ui/tools/GraphicSizeCheck.cxx index 1743da4a2b83..3c87ca9fa0f6 100644 --- a/sd/source/ui/tools/GraphicSizeCheck.cxx +++ b/sd/source/ui/tools/GraphicSizeCheck.cxx @@ -95,7 +95,7 @@ void GraphicSizeCheck::check() auto pHandler = std::make_shared<GraphicSizeCheckHandler>(nDPI, m_aGraphicSizeViolationList); - ModelTraverser aModelTraverser(m_pDocument, { .mbPages = true, .mbMasterPages = false }); + ModelTraverser aModelTraverser(m_pDocument, { .mbMasterPages = false }); aModelTraverser.addNodeHandler(pHandler); aModelTraverser.traverse(); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5ffe409746a6..03f165a1cd2e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -10624,8 +10624,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, const FSHelperPtr m_bParaAfterAutoSpacing(false), m_nParaBeforeSpacing(0), m_nParaAfterSpacing(0), - m_bParaInlineHeading(false) - , m_nStateOfFlyFrame( FLY_NOT_PROCESSED ) + m_nStateOfFlyFrame( FLY_NOT_PROCESSED ) { m_nHyperLinkCount.push_back(0); } diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 5a00c9838b11..80be72b259de 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -1082,8 +1082,6 @@ private: bool m_bParaBeforeAutoSpacing,m_bParaAfterAutoSpacing; // store hardcoded value which was set during import. sal_Int32 m_nParaBeforeSpacing,m_nParaAfterSpacing; - // flag inline heading - bool m_bParaInlineHeading; SdtBlockHelper m_aParagraphSdt; SdtBlockHelper m_aRunSdt; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index d3fe331b543c..d34e36591011 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -654,7 +654,6 @@ void PushButton::ImplInitPushButtonData() meSymbol = SymbolType::DONTKNOW; meState = TRISTATE_FALSE; mnDDStyle = PushButtonDropdownStyle::NONE; - mbIsActive = false; mbPressed = false; mbIsAction = false; } @@ -980,7 +979,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) bool bNativeOK = false; // adjust style if button should be rendered 'pressed' - if (mbPressed || mbIsActive) + if (mbPressed) nButtonStyle |= DrawButtonFlags::Pressed; if (GetStyle() & WB_FLATBUTTON) @@ -1036,7 +1035,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) ImplControlValue aControlValue; ControlState nState = ControlState::NONE; - if (mbPressed || mbIsActive) + if (mbPressed) nState |= ControlState::PRESSED; if (GetButtonState() & DrawButtonFlags::Pressed) nState |= ControlState::PRESSED; @@ -1050,12 +1049,6 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (IsMouseOver() && aInRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; - if ( IsMouseOver() && aInRect.Contains(GetPointerPosPixel()) && mbIsActive) - { - nState |= ControlState::ROLLOVER; - nButtonStyle &= ~DrawButtonFlags::Pressed; - } - bNativeOK = rRenderContext.DrawNativeControl(aCtrlType, ControlPart::ButtonDown, aInRect, nState, aControlValue, OUString()); } @@ -1078,7 +1071,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) tools::Rectangle aCtrlRegion(aInRect); ControlState nState = ControlState::NONE; - if (mbPressed || IsChecked() || mbIsActive) + if (mbPressed || IsChecked()) { nState |= ControlState::PRESSED; nButtonStyle |= DrawButtonFlags::Pressed; @@ -1092,18 +1085,12 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (Window::IsEnabled()) nState |= ControlState::ENABLED; - if (bRollOver || mbIsActive) + if (bRollOver) { nButtonStyle |= DrawButtonFlags::Highlight; nState |= ControlState::ROLLOVER; } - if (mbIsActive && bRollOver) - { - nState &= ~ControlState::PRESSED; - nButtonStyle &= ~DrawButtonFlags::Pressed; - } - if (GetStyle() & WB_FLATBUTTON) aControlValue.m_bFlatButton = true;
