mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam

Browse Source 
Change-Id: I81c9647ec7166ba429f6f58e3bd86b3a5ee4848f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174302
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-09-30 14:03:21 +02:00
parent 0210aac7f9
commit 6fdad72372
6 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/vcl/decoview.hxx
View File

@ -42,13 +42,6 @@ namespace o3tl
template<> struct typed_flags<DrawSymbolFlags> : is_typed_flags<DrawSymbolFlags, 0x03> {}; template<> struct typed_flags<DrawSymbolFlags> : is_typed_flags<DrawSymbolFlags, 0x03> {};
} }
// Flags for DrawHighlightFrame()
enum class DrawHighlightFrameStyle
{
In = 1,
Out = 2,
};
// Flags for DrawButton() // Flags for DrawButton()
enum class DrawButtonFlags enum class DrawButtonFlags
{ {
@ -82,8 +75,7 @@ public:
void DrawFrame( const tools::Rectangle& rRect, void DrawFrame( const tools::Rectangle& rRect,
const Color& rLeftTopColor, const Color& rLeftTopColor,
const Color& rRightBottomColor ); const Color& rRightBottomColor );
void DrawHighlightFrame( const tools::Rectangle& rRect, void DrawHighlightFrame( const tools::Rectangle& rRect );
DrawHighlightFrameStyle nStyle );
tools::Rectangle DrawFrame( const tools::Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE ); tools::Rectangle DrawFrame( const tools::Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE );
tools::Rectangle DrawButton( const tools::Rectangle& rRect, DrawButtonFlags nStyle ); tools::Rectangle DrawButton( const tools::Rectangle& rRect, DrawButtonFlags nStyle );
void DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true ); void DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true );

4
svx/inc/sxmsitm.hxx
View File

@ -28,8 +28,8 @@
class SdrMeasureScaleItem final : public SdrScaleItem class SdrMeasureScaleItem final : public SdrScaleItem
{ {
public: public:
SdrMeasureScaleItem(SfxItemType eItemType = SfxItemType::SdrMeasureScaleItemType) SdrMeasureScaleItem()
: SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), eItemType) : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), SfxItemType::SdrMeasureScaleItemType)
{ {
} }
virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override

2
vcl/source/control/imivctl1.cxx
View File

@ -1848,7 +1848,7 @@ void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderConte
const tools::Rectangle& rRect) const tools::Rectangle& rRect)
{ {
DecorationView aDecoView(&rRenderContext); DecorationView aDecoView(&rRenderContext);
aDecoView.DrawHighlightFrame(rRect, DrawHighlightFrameStyle::Out); aDecoView.DrawHighlightFrame(rRect);
} }
void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame(SvxIconChoiceCtrlEntry* pEntry) void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame(SvxIconChoiceCtrlEntry* pEntry)

6
vcl/source/window/decoview.cxx
View File

@ -821,8 +821,7 @@ void DecorationView::DrawFrame( const tools::Rectangle& rRect,
mpOutDev->EnableMapMode( bOldMapMode ); mpOutDev->EnableMapMode( bOldMapMode );
} }
void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect, void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect )
DrawHighlightFrameStyle nStyle )
{ {
const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
Color aLightColor = rStyleSettings.GetLightColor(); Color aLightColor = rStyleSettings.GetLightColor();
@ -859,9 +858,6 @@ void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect,
} }
} }
if ( nStyle == DrawHighlightFrameStyle::In )
std::swap( aLightColor, aShadowColor );
DrawFrame( rRect, aLightColor, aShadowColor ); DrawFrame( rRect, aLightColor, aShadowColor );
} }

5
xmloff/source/chart/SchXMLParagraphContext.cxx
View File

@ -102,11 +102,10 @@ void SchXMLParagraphContext::characters( const OUString& rChars )
} }
SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport, SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport,
std::vector<std::pair<OUString, OUString>>& rParaText, std::vector<std::pair<OUString, OUString>>& rParaText) :
OUString * pOutId /* = 0 */ ) :
SvXMLImportContext( rImport ), SvXMLImportContext( rImport ),
mrParaText( rParaText ), mrParaText( rParaText ),
mpId( pOutId ) mpId( nullptr )
{ {
} }

3
xmloff/source/chart/SchXMLParagraphContext.hxx
View File

@ -60,8 +60,7 @@ private:
public: public:
SchXMLTitleParaContext( SvXMLImport& rImport, SchXMLTitleParaContext( SvXMLImport& rImport,
std::vector<std::pair<OUString, OUString>>& rParaText, std::vector<std::pair<OUString, OUString>>& rParaText);
OUString * pOutId = nullptr );
virtual ~SchXMLTitleParaContext() override; virtual ~SchXMLTitleParaContext() override;
virtual void SAL_CALL startFastElement( virtual void SAL_CALL startFastElement(