include/svx/nbdtmg.hxx | 2 +-
include/vcl/decoview.hxx | 10 +---------
sd/source/ui/inc/ToolBarManager.hxx | 5 +----
sd/source/ui/view/ToolBarManager.cxx | 5 ++---
svx/inc/sxmsitm.hxx | 4 ++--
svx/source/sidebar/nbdtmg.cxx | 4 +---
vcl/source/control/imivctl1.cxx | 2 +-
vcl/source/window/decoview.cxx | 6 +-----
xmloff/source/chart/SchXMLParagraphContext.cxx | 5 ++---
xmloff/source/chart/SchXMLParagraphContext.hxx | 3 +--
10 files changed, 13 insertions(+), 33 deletions(-)
New commits:
commit 1683847f0f6e4d964ac529e125e39e6b047fbe17
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 30 14:19:11 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 1 11:17:19 2024 +0200
loplugin:constantparam
Change-Id: Ibf1f8b8c01333f87f8e8cd73ccb0d62f30fbcd2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174303
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 8979b736e40c..bccb905a21a2 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -161,7 +161,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr final : public
NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override;
- void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
std::u16string_view sFont, sal_uInt16 mLevel,bool isResetSize=false);
+ void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
std::u16string_view sFont, sal_uInt16 mLevel);
virtual OUString GetDescription(sal_uInt16 nIndex, bool isDefault)
override;
virtual bool IsCustomized(sal_uInt16 nIndex) override;
static BulletsTypeMgr& GetInstance();
diff --git a/sd/source/ui/inc/ToolBarManager.hxx
b/sd/source/ui/inc/ToolBarManager.hxx
index a5cebb377f5c..da5325cf693c 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -178,13 +178,10 @@ public:
The group is used for the actual tool bars.
@param nToolBarId
Id of the tool bar shell.
- @param bAddBar
- Add the toolbar itself with the shell. When false only adds the
shell.
*/
void AddToolBarShell (
ToolBarGroup eGroup,
- ShellId nToolBarId,
- bool bAddBar = true);
+ ShellId nToolBarId);
/** Remove the tool bar with the given name from the specified group.
If the tool bar is not visible then nothing happens.
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index dac9aa1d8c96..d1152ec6ce23 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -389,13 +389,12 @@ void ToolBarManager::AddToolBar (
void ToolBarManager::AddToolBarShell (
ToolBarGroup eGroup,
- ShellId nToolBarId,
- bool bAddBar)
+ ShellId nToolBarId)
{
if (mpImpl != nullptr)
{
UpdateLock aLock (shared_from_this());
- mpImpl->AddToolBarShell(eGroup,nToolBarId,bAddBar);
+ mpImpl->AddToolBarShell(eGroup,nToolBarId,/*bAddBar*/true);
}
}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 9d5e1826c983..1600c043db0f 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -349,7 +349,7 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uInt1
}
void BulletsTypeMgr::ApplyCustomRule(SvxNumRule& aNum, std::u16string_view
sBullet,
- std::u16string_view sFont, sal_uInt16
mLevel, bool isResetSize)
+ std::u16string_view sFont, sal_uInt16
mLevel)
{
sal_uInt16 nMask = 1;
OUString sBulletCharFormatName = GetBulletCharFmtName();
@@ -364,8 +364,6 @@ void BulletsTypeMgr::ApplyCustomRule(SvxNumRule& aNum,
std::u16string_view sBull
aFmt.SetBulletChar(sBullet[0]);
aFmt.SetCharFormatName(sBulletCharFormatName);
aFmt.SetListFormat("");
- if (isResetSize)
- aFmt.SetBulletRelSize(45);
aNum.SetLevel(i, aFmt);
}
nMask <<= 1;
commit 6fdad723729a458eaff7ca509cb202ad355832be
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 30 14:03:21 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 1 11:17:11 2024 +0200
loplugin:constantparam
Change-Id: I81c9647ec7166ba429f6f58e3bd86b3a5ee4848f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174302
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 4ab2fe70d314..81436be45167 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -42,13 +42,6 @@ namespace o3tl
template<> struct typed_flags<DrawSymbolFlags> :
is_typed_flags<DrawSymbolFlags, 0x03> {};
}
-// Flags for DrawHighlightFrame()
-enum class DrawHighlightFrameStyle
-{
- In = 1,
- Out = 2,
-};
-
// Flags for DrawButton()
enum class DrawButtonFlags
{
@@ -82,8 +75,7 @@ public:
void DrawFrame( const tools::Rectangle& rRect,
const Color& rLeftTopColor,
const Color& rRightBottomColor );
- void DrawHighlightFrame( const tools::Rectangle& rRect,
- DrawHighlightFrameStyle nStyle );
+ void DrawHighlightFrame( const tools::Rectangle& rRect );
tools::Rectangle DrawFrame( const tools::Rectangle& rRect,
DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags =
DrawFrameFlags::NONE );
tools::Rectangle DrawButton( const tools::Rectangle& rRect,
DrawButtonFlags nStyle );
void DrawSeparator( const Point& rStart, const Point&
rStop, bool bVertical = true );
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index c8af17cf4ba5..bc44da43da98 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -28,8 +28,8 @@
class SdrMeasureScaleItem final : public SdrScaleItem
{
public:
- SdrMeasureScaleItem(SfxItemType eItemType =
SfxItemType::SdrMeasureScaleItemType)
- : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), eItemType)
+ SdrMeasureScaleItem()
+ : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1),
SfxItemType::SdrMeasureScaleItemType)
{
}
virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 2fb00f963a40..0f6f59385ddb 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -1848,7 +1848,7 @@ void
SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderConte
const tools::Rectangle& rRect)
{
DecorationView aDecoView(&rRenderContext);
- aDecoView.DrawHighlightFrame(rRect, DrawHighlightFrameStyle::Out);
+ aDecoView.DrawHighlightFrame(rRect);
}
void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame(SvxIconChoiceCtrlEntry*
pEntry)
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 2067a9e4ca4f..4b793b4610ef 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -821,8 +821,7 @@ void DecorationView::DrawFrame( const tools::Rectangle&
rRect,
mpOutDev->EnableMapMode( bOldMapMode );
}
-void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect,
- DrawHighlightFrameStyle nStyle )
+void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect )
{
const StyleSettings& rStyleSettings =
mpOutDev->GetSettings().GetStyleSettings();
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 );
}
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx
b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 6f9dc0ce72cb..c585946e217a 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -102,11 +102,10 @@ void SchXMLParagraphContext::characters( const OUString&
rChars )
}
SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport,
-
std::vector<std::pair<OUString, OUString>>& rParaText,
- OUString * pOutId /* = 0 */ ) :
+
std::vector<std::pair<OUString, OUString>>& rParaText) :
SvXMLImportContext( rImport ),
mrParaText( rParaText ),
- mpId( pOutId )
+ mpId( nullptr )
{
}
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx
b/xmloff/source/chart/SchXMLParagraphContext.hxx
index ba2231bd5d24..4f344e5793f8 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -60,8 +60,7 @@ private:
public:
SchXMLTitleParaContext( SvXMLImport& rImport,
- std::vector<std::pair<OUString, OUString>>&
rParaText,
- OUString * pOutId = nullptr );
+ std::vector<std::pair<OUString, OUString>>&
rParaText);
virtual ~SchXMLTitleParaContext() override;
virtual void SAL_CALL startFastElement(
