[Libreoffice-commits] core.git: include/svtools svtools/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 22 12:53:46 UTC 2019
include/svtools/PlaceEditDialog.hxx | 8 ++++----
include/svtools/breadcrumb.hxx | 2 +-
include/svtools/brwbox.hxx | 4 ++--
include/svtools/ctrlbox.hxx | 4 ++--
include/svtools/inettbc.hxx | 2 +-
include/svtools/place.hxx | 6 +++---
include/svtools/ruler.hxx | 2 +-
include/svtools/scrwin.hxx | 2 +-
include/svtools/simptabl.hxx | 2 +-
include/svtools/toolbarmenu.hxx | 2 +-
svtools/source/brwbox/brwbox1.cxx | 2 +-
svtools/source/config/colorcfg.cxx | 2 +-
svtools/source/config/miscopt.cxx | 8 ++++----
svtools/source/control/breadcrumb.cxx | 2 +-
svtools/source/control/ruler.cxx | 2 +-
svtools/source/control/tabbar.cxx | 4 ++--
svtools/source/control/toolbarmenu.cxx | 2 +-
svtools/source/filter/exportdialog.cxx | 2 +-
svtools/source/filter/exportdialog.hxx | 2 +-
svtools/source/inc/unoiface.hxx | 10 +++++-----
svtools/source/uno/unoiface.cxx | 10 +++++-----
21 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit c76e30707e08705a90bbfc089975b0cafd84dc8a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Aug 22 10:03:41 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 22 14:53:01 2019 +0200
loplugin:constmethod in svtools
Change-Id: I24e2a5844f24b9a3c973e064dad832573339dc7b
Reviewed-on: https://gerrit.libreoffice.org/77946
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index 6047e8680e46..fd53f1021181 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -76,11 +76,11 @@ public:
// Returns a place instance with given information
std::shared_ptr<Place> GetPlace();
- OUString GetServerName() { return m_xEDServerName->get_text(); }
+ OUString GetServerName() const { return m_xEDServerName->get_text(); }
OUString GetServerUrl();
- OUString GetPassword() { return m_xEDPassword->get_text(); };
- OUString GetUser() { return m_xEDUsername->get_text(); };
- bool IsRememberChecked() { return m_xCBPassword->get_active(); }
+ OUString GetPassword() const { return m_xEDPassword->get_text(); };
+ OUString GetUser() const { return m_xEDUsername->get_text(); };
+ bool IsRememberChecked() const { return m_xCBPassword->get_active(); }
void ShowPasswordControl() { m_bShowPassword = true; }
diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx
index 1889d923441c..7a8672775739 100644
--- a/include/svtools/breadcrumb.hxx
+++ b/include/svtools/breadcrumb.hxx
@@ -55,7 +55,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox
void EnableFields( bool bEnable );
void SetClickHdl( const Link<Breadcrumb*,void>& rLink );
- const OUString& GetHdlURL();
+ const OUString& GetHdlURL() const;
void SetRootName( const OUString& rURL );
void SetURL( const OUString& rURL );
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 6022cb1c8142..f12edefd6c2e 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -349,8 +349,8 @@ protected:
virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows);
// number of visible rows in the window (incl. "truncated" rows)
- sal_uInt16 GetVisibleRows();
- long GetTopRow() { return nTopRow; }
+ sal_uInt16 GetVisibleRows() const;
+ long GetTopRow() const { return nTopRow; }
sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; }
// Focus-Rect enable / disable
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 56b7f55026e8..e4b7a71c2d04 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -91,8 +91,8 @@ public:
}
/** Returns the minimum width in twips */
- long GetMinWidth( ) { return m_nMinWidth;}
- SvxBorderLineStyle GetStyle( ) { return m_nStyle;}
+ long GetMinWidth( ) const { return m_nMinWidth;}
+ SvxBorderLineStyle GetStyle( ) const { return m_nStyle;}
};
enum class SvxBorderLineStyle : sal_Int16;
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index bf99e4d838c4..13b9bed5cc67 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -85,7 +85,7 @@ public:
{ bIsAutoCompleteEnabled = _bEnable; }
void SetPlaceHolder( const OUString& sPlaceHolder )
{ aPlaceHolder = sPlaceHolder; }
- const OUString& GetPlaceHolder() { return aPlaceHolder; }
+ const OUString& GetPlaceHolder() const { return aPlaceHolder; }
bool MatchesPlaceHolder( const OUString& sToMatch ) const
{ return ( !aPlaceHolder.isEmpty() ) && ( aPlaceHolder == sToMatch ); }
};
diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx
index 7053c931b892..3d39c116d372 100644
--- a/include/svtools/place.hxx
+++ b/include/svtools/place.hxx
@@ -31,10 +31,10 @@ public:
void SetUrl(const OUString& aUrl ) { maUrl.SetURL( aUrl ); }
OUString& GetName( ) { return msName; }
- OUString GetUrl( ) { return maUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); }
+ OUString GetUrl( ) const { return maUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); }
INetURLObject& GetUrlObject( ) { return maUrl; }
- bool IsLocal( ) { return maUrl.GetProtocol() == INetProtocol::File; }
- bool IsEditable( ) { return mbEditable; }
+ bool IsLocal( ) const { return maUrl.GetProtocol() == INetProtocol::File; }
+ bool IsEditable( ) const { return mbEditable; }
};
#endif // INCLUDED_SVTOOLS_PLACE_HXX
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 3aedb16531de..7902f307a1a4 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -788,7 +788,7 @@ public:
void SetDoubleClickHdl( const Link<Ruler*,void>& rLink ) { maDoubleClickHdl = rLink; }
void SetTextRTL(bool bRTL);
- bool GetTextRTL();
+ bool GetTextRTL() const;
void SetCharWidth( long nWidth ) { mnCharWidth = nWidth ; }
void SetLineHeight( long nHeight ) { mnLineHeight = nHeight ; }
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index 10e547669516..f63ba409c58d 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -56,7 +56,7 @@ public:
MapMode GetMapMode() const;
void SetTotalSize( const Size& rNewSize );
- Size GetTotalSize() { return PixelToLogic( aTotPixSz ); }
+ Size GetTotalSize() const { return PixelToLogic( aTotPixSz ); }
using Window::Scroll;
virtual void Scroll( long nDeltaX, long nDeltaY, ScrollFlags nFlags = ScrollFlags::NONE ) override;
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 476e77c6764b..99e0e040c2f3 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -100,7 +100,7 @@ public:
bool IsEnabled() const;
void SortByCol(sal_uInt16, bool bDir=true);
- sal_uInt16 GetSortedCol(){ return nSortCol;}
+ sal_uInt16 GetSortedCol() const { return nSortCol;}
SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const;
bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index bd73d7cb2784..01c8652d3415 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -70,7 +70,7 @@ public:
virtual void dispose() override;
protected:
- bool IsInPopupMode();
+ bool IsInPopupMode() const;
void EndPopupMode();
private:
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index efb44073f2f0..83ba7c83d3e0 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2333,7 +2333,7 @@ void BrowseBox::GetFocus()
}
-sal_uInt16 BrowseBox::GetVisibleRows()
+sal_uInt16 BrowseBox::GetVisibleRows() const
{
return static_cast<sal_uInt16>((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1);
}
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 10f4c0e6f63f..5f1cb50ba254 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -93,7 +93,7 @@ public:
using ConfigItem::SetModified;
using ConfigItem::ClearModified;
void SettingsChanged();
- bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;}
+ bool GetAutoDetectSystemHC() const {return m_bAutoDetectSystemHC;}
DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void );
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 4328e3b8bc65..f3e4dab7b844 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -154,13 +154,13 @@ public:
bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
- sal_Int16 GetSymbolsSize()
+ sal_Int16 GetSymbolsSize() const
{ return m_nSymbolsSize; }
- ToolBoxButtonSize GetSidebarIconSize()
+ ToolBoxButtonSize GetSidebarIconSize() const
{ return m_nSidebarIconSize; }
- ToolBoxButtonSize GetNotebookbarIconSize()
+ ToolBoxButtonSize GetNotebookbarIconSize() const
{ return m_nNotebookbarIconSize; }
void SetSymbolsSize( sal_Int16 nSet );
@@ -192,7 +192,7 @@ public:
{return m_bIconThemeWasSetAutomatically;}
// translate to VCL settings ( "0" = 3D, "1" = FLAT )
- sal_Int16 GetToolboxStyle()
+ sal_Int16 GetToolboxStyle() const
{ return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; }
// translate from VCL settings
diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx
index fd2f777e84d6..8513f882a1e3 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -82,7 +82,7 @@ void Breadcrumb::SetClickHdl( const Link<Breadcrumb*,void>& rLink )
m_aClickHdl = rLink;
}
-const OUString& Breadcrumb::GetHdlURL()
+const OUString& Breadcrumb::GetHdlURL() const
{
return m_sClickedURL;
}
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 3e83d5da1d0d..e58159c2a6c8 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2726,7 +2726,7 @@ long Ruler::GetMargin2() const
}
-bool Ruler::GetTextRTL()
+bool Ruler::GetTextRTL() const
{
return mpData->bTextRTL;
}
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 43e1c6d7f30e..b3d814038b98 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -250,7 +250,7 @@ public:
return static_cast<TabBar*>(Window::GetParent());
}
- bool isModKeyPressed()
+ bool isModKeyPressed() const
{
return mbModKey;
}
@@ -483,7 +483,7 @@ struct TabBar_Impl
vcl::AccessibleFactoryAccess maAccessibleFactory;
- sal_uInt16 getItemSize()
+ sal_uInt16 getItemSize() const
{
return static_cast<sal_uInt16>(mpItemList.size());
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index e64162c6f0d0..1b5f202becd6 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1493,7 +1493,7 @@ void ToolbarPopupBase::statusChanged( const css::frame::FeatureStateEvent& /*Eve
{
}
-bool ToolbarPopup::IsInPopupMode()
+bool ToolbarPopup::IsInPopupMode() const
{
return GetDockingManager()->IsInPopupMode(this);
}
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 0cbedcbf2f18..e303a61cc0b0 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -102,7 +102,7 @@ static MapUnit GetMapUnit( sal_Int32 nUnit )
return aMapUnit;
}
-sal_Int32 ExportDialog::GetDefaultUnit()
+sal_Int32 ExportDialog::GetDefaultUnit() const
{
sal_Int32 nDefaultUnit = UNIT_CM;
switch( mrFltCallPara.eFieldUnit )
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index ac10ffb9a91a..8ba9cb740d2a 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -165,7 +165,7 @@ private:
css::awt::Size GetOriginalSize();
- sal_Int32 GetDefaultUnit();
+ sal_Int32 GetDefaultUnit() const;
public:
ExportDialog( FltCallDialogParameter& rPara,
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 9088a11ebeb2..1cccc09369cc 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -188,19 +188,19 @@ protected:
void setFormatKey(sal_Int32 nKey);
void SetValue(const css::uno::Any& rValue);
- css::uno::Any GetValue();
+ css::uno::Any GetValue() const;
void SetTreatAsNumber(bool bSet);
- bool GetTreatAsNumber();
+ bool GetTreatAsNumber() const;
void SetDefaultValue(const css::uno::Any& rValue);
- css::uno::Any GetDefaultValue();
+ css::uno::Any GetDefaultValue() const;
void SetMinValue(const css::uno::Any& rValue);
- css::uno::Any GetMinValue();
+ css::uno::Any GetMinValue() const;
void SetMaxValue(const css::uno::Any& rValue);
- css::uno::Any GetMaxValue();
+ css::uno::Any GetMaxValue() const;
void NotifyTextListeners();
css::uno::Any convertEffectiveValue(const css::uno::Any& rValue);
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 43cb1d85711e..39b95fbee5b0 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1123,7 +1123,7 @@ void SVTXFormattedField::SetMinValue(const css::uno::Any& rValue)
}
-css::uno::Any SVTXFormattedField::GetMinValue()
+css::uno::Any SVTXFormattedField::GetMinValue() const
{
VclPtr<FormattedField> pField = GetAs< FormattedField >();
if (!pField || !pField->HasMinValue())
@@ -1163,7 +1163,7 @@ void SVTXFormattedField::SetMaxValue(const css::uno::Any& rValue)
}
-css::uno::Any SVTXFormattedField::GetMaxValue()
+css::uno::Any SVTXFormattedField::GetMaxValue() const
{
VclPtr<FormattedField> pField = GetAs< FormattedField >();
if (!pField || !pField->HasMaxValue())
@@ -1208,7 +1208,7 @@ void SVTXFormattedField::SetDefaultValue(const css::uno::Any& rValue)
}
-css::uno::Any SVTXFormattedField::GetDefaultValue()
+css::uno::Any SVTXFormattedField::GetDefaultValue() const
{
VclPtr<FormattedField> pField = GetAs< FormattedField >();
if (!pField || pField->IsEmptyFieldEnabled())
@@ -1223,7 +1223,7 @@ css::uno::Any SVTXFormattedField::GetDefaultValue()
}
-bool SVTXFormattedField::GetTreatAsNumber()
+bool SVTXFormattedField::GetTreatAsNumber() const
{
VclPtr<FormattedField> pField = GetAs< FormattedField >();
if (pField)
@@ -1241,7 +1241,7 @@ void SVTXFormattedField::SetTreatAsNumber(bool bSet)
}
-css::uno::Any SVTXFormattedField::GetValue()
+css::uno::Any SVTXFormattedField::GetValue() const
{
VclPtr<FormattedField> pField = GetAs< FormattedField >();
if (!pField)
More information about the Libreoffice-commits
mailing list