[Libreoffice-commits] core.git: compilerplugins/clang include/svx svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 4 16:20:18 UTC 2021
compilerplugins/clang/constmethod.cxx | 26 +++++++++++++++++++++-
include/svx/charmap.hxx | 2 -
include/svx/float3d.hxx | 2 -
include/svx/fmgridcl.hxx | 2 -
include/svx/numfmtsh.hxx | 2 -
include/svx/pszctrl.hxx | 2 -
include/svx/xgrad.hxx | 2 -
svx/source/accessibility/AccessibleTextHelper.cxx | 2 -
svx/source/dialog/charmap.cxx | 2 -
svx/source/engine3d/float3d.cxx | 2 -
svx/source/fmcomp/fmgridcl.cxx | 2 -
svx/source/form/fmcontrolbordermanager.cxx | 2 -
svx/source/form/fmshimp.cxx | 2 -
svx/source/inc/fmcontrolbordermanager.hxx | 2 -
svx/source/inc/fmshimp.hxx | 2 -
svx/source/items/numfmtsh.cxx | 2 -
svx/source/sidebar/text/TextUnderlineControl.cxx | 2 -
svx/source/sidebar/text/TextUnderlineControl.hxx | 2 -
svx/source/stbctrls/pszctrl.cxx | 2 -
svx/source/stbctrls/zoomctrl.cxx | 4 +--
svx/source/xoutdev/xattr.cxx | 2 -
21 files changed, 46 insertions(+), 22 deletions(-)
New commits:
commit 3b7a86abf28dcc2400a691200b0ea11ee5a9e537
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 4 15:37:08 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 4 18:19:41 2021 +0200
loplugin:constmethod
Change-Id: I56af10be5f1155db4c7f2190495fe036a9b4236a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123054
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/constmethod.cxx b/compilerplugins/clang/constmethod.cxx
index fc3e92bf709c..da5a64aea9b4 100644
--- a/compilerplugins/clang/constmethod.cxx
+++ b/compilerplugins/clang/constmethod.cxx
@@ -51,7 +51,31 @@ public:
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/numbers/zforscan.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/numbers/zforlist.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/gdi/impgraph.cxx")
- || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/image/ImplImage.cxx"))
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/image/ImplImage.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/filter/wmf/wmfwr.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/generic/app/i18n_im.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/generic/app/randrwrapper.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/gtkinst.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/gtkframe.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/skia/gdiimpl.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qt5/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/package/source/xstor/owriteablestream.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/package/source/zippackage/ZipPackage.cxx")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/toolkit/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/canvas/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/accessibility/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/framework/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/basic/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/sfx2/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/xmloff/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/connectivity/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/editeng/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/scripting/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/ucb/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/basctl/")
+ || loplugin::hasPathnamePrefix(fn, SRCDIR "/chart2/")
+ )
return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 5ea7b1f2e0be..10f8850544bd 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -155,7 +155,7 @@ protected:
void ContextMenuSelect(std::string_view rIdent);
void init();
- tools::Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize);
+ tools::Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize) const;
};
#endif
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index fd8ae56509cf..32baca985c66 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -228,7 +228,7 @@ private:
SVX_DLLPRIVATE void Reset();
SVX_DLLPRIVATE static void LBSelectColor( ColorListBox* pLb, const Color& rColor );
- SVX_DLLPRIVATE sal_uInt16 GetLightSource( const LightButton* pBtn );
+ SVX_DLLPRIVATE sal_uInt16 GetLightSource( const LightButton* pBtn ) const;
SVX_DLLPRIVATE ColorListBox* GetCLbByButton( const LightButton* pBtn = nullptr );
SVX_DLLPRIVATE LightButton* GetLbByButton( const weld::Button* pBtn );
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 88f334bacb25..6be83c19459f 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -194,7 +194,7 @@ protected:
@return
<TRUE/> if the column is selected, otherwise <FALSE/>
*/
- bool isColumnSelected(DbGridColumn const * _pColumn);
+ bool isColumnSelected(DbGridColumn const * _pColumn) const;
};
#endif // INCLUDED_SVX_FMGRIDCL_HXX
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index ce74d8e5b457..360a067e06c9 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -171,7 +171,7 @@ public:
sal_uInt16 FindCurrencyTableEntry( const OUString& rFmtString, bool &bTestBanking );
bool IsInTable(sal_uInt16 nPos, bool bTmpBanking,
- std::u16string_view rFmtString);
+ std::u16string_view rFmtString) const;
void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; }
private:
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index c4b077a2a064..e22b18096e27 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SvxPosSizeStatusBarControl final : public SfxStatusBarContro
{
private:
std::unique_ptr<SvxPosSizeStatusBarControl_Impl> pImpl;
- SVX_DLLPRIVATE OUString GetMetricStr_Impl( tools::Long nVal );
+ SVX_DLLPRIVATE OUString GetMetricStr_Impl( tools::Long nVal ) const;
public:
SFX_DECL_STATUSBAR_CONTROL();
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 620b5abb4ff2..93a2f00655f4 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -78,7 +78,7 @@ public:
boost::property_tree::ptree dumpAsJSON() const;
static XGradient fromJSON(const OUString& rJSON);
- css::awt::Gradient toGradientUNO();
+ css::awt::Gradient toGradientUNO() const;
};
#endif
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index d28666be8b80..5a6a5397ca00 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -131,7 +131,7 @@ namespace accessibility
void FireEvent( const AccessibleEventObject& rEvent ) const;
void SetFocus( bool bHaveFocus );
- bool HaveFocus()
+ bool HaveFocus() const
{
// No locking of solar mutex here, since we rely on the fact
// that sal_Bool access is atomic
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 50fdca8133db..02d087c98c25 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -463,7 +463,7 @@ void SvxShowCharSet::DeSelect()
}
// stretch a grid rectangle if its at the edge to fill unused space
-tools::Rectangle SvxShowCharSet::getGridRectangle(const Point &rPointUL, const Size &rOutputSize)
+tools::Rectangle SvxShowCharSet::getGridRectangle(const Point &rPointUL, const Size &rOutputSize) const
{
tools::Long x = rPointUL.X() - 1;
tools::Long y = rPointUL.Y() - 1;
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 0ad3c1cd74af..9cd402fc5c95 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2780,7 +2780,7 @@ void Svx3DWin::InitColorLB()
m_xLbMatSpecular->SelectEntry( aColWhite );
}
-sal_uInt16 Svx3DWin::GetLightSource( const LightButton* pBtn )
+sal_uInt16 Svx3DWin::GetLightSource( const LightButton* pBtn ) const
{
sal_uInt16 nLight = 8;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a64ae20db07d..43fa3c399725 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1760,7 +1760,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId)
m_nMarkedColumnId = sal_uInt16(-1);
}
-bool FmGridControl::isColumnSelected(DbGridColumn const * _pColumn)
+bool FmGridControl::isColumnSelected(DbGridColumn const * _pColumn) const
{
OSL_ENSURE(_pColumn,"Column can not be null!");
bool bSelected = false;
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 92da9708bd11..5679f3354d96 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -151,7 +151,7 @@ namespace svxform
}
- Color ControlBorderManager::getControlColorByStatus( ControlStatus _nStatus )
+ Color ControlBorderManager::getControlColorByStatus( ControlStatus _nStatus ) const
{
// "invalid" is ranked highest
if ( _nStatus & ControlStatus::Invalid )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e5c35ff39cc7..248a2651e23a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1728,7 +1728,7 @@ namespace
}
-bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState )
+bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState ) const
{
const svx::ControllerFeatures& rController =
lcl_isNavigationRelevant( _nSlot )
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 8c281112da8d..620d8b98db98 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -190,7 +190,7 @@ namespace svxform
@param _eStatus
the status of the control. Must not be <member>ControlStatus::none</member>
*/
- Color getControlColorByStatus( ControlStatus _eStatus );
+ Color getControlColorByStatus( ControlStatus _eStatus ) const;
/** sets the border color for a given control, depending on its status
@param _rxControl
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 295a73c43ecb..a60e03d2e4ed 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -516,7 +516,7 @@ public:
/** determines whether the current form slot is currently enabled
*/
- SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState );
+ SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState ) const;
SAL_DLLPRIVATE static OString SlotToIdent(sal_uInt16 nSlot);
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index e3c4b0fe7e4e..40811d846de5 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1563,7 +1563,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC
}
bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, bool const bTmpBanking,
- std::u16string_view rFmtString)
+ std::u16string_view rFmtString) const
{
bool bFlag = false;
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 4ce94e0cfb29..380389509865 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -69,7 +69,7 @@ TextUnderlineControl::~TextUnderlineControl()
{
}
-FontLineStyle TextUnderlineControl::getLineStyle(const weld::Button& rButton)
+FontLineStyle TextUnderlineControl::getLineStyle(const weld::Button& rButton) const
{
if (&rButton == mxSingle.get())
return LINESTYLE_SINGLE;
diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx
index 631b5c874d3c..cc1a19c67915 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.hxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.hxx
@@ -49,7 +49,7 @@ private:
rtl::Reference<TextUnderlinePopup> mxControl;
- FontLineStyle getLineStyle(const weld::Button& rButton);
+ FontLineStyle getLineStyle(const weld::Button& rButton) const;
DECL_LINK(PBClickHdl, weld::Button&, void);
};
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index c492baff6d44..75f94f8c83c7 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -57,7 +57,7 @@
<SvxPosSizeStatusBarControl::Paint(const UserDrawEvent&)>
*/
-OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( tools::Long nVal )
+OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( tools::Long nVal ) const
{
// deliver and set the Metric of the application
FieldUnit eOutUnit = SfxModule::GetModuleFieldUnit( getFrameInterface() );
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 01b1fab1ee96..3e3a91b6957d 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -46,7 +46,7 @@ class ZoomPopup_Impl
public:
ZoomPopup_Impl(weld::Window* pPopupParent, sal_uInt16 nZ, SvxZoomEnableFlags nValueSet);
- sal_uInt16 GetZoom(std::string_view ident);
+ sal_uInt16 GetZoom(std::string_view ident) const;
OString popup_at_rect(const tools::Rectangle& rRect)
{
@@ -84,7 +84,7 @@ ZoomPopup_Impl::ZoomPopup_Impl(weld::Window* pPopupParent, sal_uInt16 nZ, SvxZoo
m_xMenu->set_sensitive("width", false);
}
-sal_uInt16 ZoomPopup_Impl::GetZoom(std::string_view ident)
+sal_uInt16 ZoomPopup_Impl::GetZoom(std::string_view ident) const
{
sal_uInt16 nRet = nZoom;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 0707a485c5de..149dd14a1e9e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2036,7 +2036,7 @@ XGradient XGradient::fromJSON(const OUString& rJSON)
return lcl_buildGradientFromStringMap(aMap);
}
-css::awt::Gradient XGradient::toGradientUNO()
+css::awt::Gradient XGradient::toGradientUNO() const
{
css::awt::Gradient aGradient;
More information about the Libreoffice-commits
mailing list