[Libreoffice-commits] core.git: binaryurp/source bridges/inc cppu/source include/sax include/unotools sax/source unotools/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Oct 26 09:00:06 UTC 2017
binaryurp/source/bridge.cxx | 2 -
bridges/inc/cppinterfaceproxy.hxx | 2 -
cppu/source/uno/lbenv.cxx | 4 +-
include/sax/fastattribs.hxx | 4 +-
include/unotools/extendedsecurityoptions.hxx | 2 -
include/unotools/lingucfg.hxx | 6 +--
include/unotools/localedatawrapper.hxx | 4 +-
include/unotools/moduleoptions.hxx | 2 -
include/unotools/syslocaleoptions.hxx | 2 -
include/unotools/tempfile.hxx | 2 -
include/unotools/textsearch.hxx | 2 -
sax/source/tools/fastattribs.cxx | 4 +-
unotools/source/accessibility/accessiblerelationsethelper.cxx | 16 +++++-----
unotools/source/config/eventcfg.cxx | 8 ++---
unotools/source/config/extendedsecurityoptions.cxx | 4 +-
unotools/source/config/historyoptions.cxx | 4 +-
unotools/source/config/lingucfg.cxx | 6 +--
unotools/source/config/moduleoptions.cxx | 2 -
unotools/source/config/syslocaleoptions.cxx | 6 +--
unotools/source/i18n/localedatawrapper.cxx | 4 +-
unotools/source/i18n/textsearch.cxx | 2 -
unotools/source/ucbhelper/tempfile.cxx | 2 -
22 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit d9b6f4fd38da9f875b78f6ff365bcb16fb2c8e8b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Oct 25 17:12:09 2017 +0200
loplugin:constmethods in unotools
Change-Id: I13df4e184a826682f34a1d9e974b601397ba4a3d
Reviewed-on: https://gerrit.libreoffice.org/43865
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index fcb26805f1e7..4460de1d3c60 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -104,7 +104,7 @@ public:
~AttachThread();
- const rtl::ByteSequence& getTid() throw () { return tid_;}
+ const rtl::ByteSequence& getTid() const throw () { return tid_;}
private:
AttachThread(const AttachThread&) = delete;
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index ae6e36092e51..0b97264e42f0 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -66,7 +66,7 @@ public:
Bridge * getBridge() { return pBridge; }
uno_Interface * getUnoI() { return pUnoI; }
typelib_InterfaceTypeDescription * getTypeDescr() { return pTypeDescr; }
- const OUString& getOid() { return oid; }
+ const OUString& getOid() const { return oid; }
// non virtual methods called on incoming vtable calls #1, #2
void acquireProxy();
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 01a300ed94d1..76bf88e6e002 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -88,7 +88,7 @@ struct ObjectEntry
uno_freeProxyFunc fpFreeProxy );
inline InterfaceEntry * find(
typelib_InterfaceTypeDescription * pTypeDescr );
- inline sal_Int32 find( void const * iface_ptr, std::size_t pos );
+ inline sal_Int32 find( void const * iface_ptr, std::size_t pos ) const;
};
@@ -211,7 +211,7 @@ inline InterfaceEntry * ObjectEntry::find(
inline sal_Int32 ObjectEntry::find(
- void const * iface_ptr, std::size_t pos )
+ void const * iface_ptr, std::size_t pos ) const
{
std::size_t size = aInterfaces.size();
for ( ; pos < size; ++pos )
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 75dca6a83f7f..1f343a7235b9 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -89,8 +89,8 @@ public:
sal_Int32 AttributeValueLength(size_t i) const { return maAttributeValues[i + 1] - maAttributeValues[i] - 1; }
// performance sensitive shortcuts to avoid allocation ...
- bool getAsInteger( sal_Int32 nToken, sal_Int32 &rInt);
- bool getAsDouble( sal_Int32 nToken, double &rDouble);
+ bool getAsInteger( sal_Int32 nToken, sal_Int32 &rInt) const;
+ bool getAsDouble( sal_Int32 nToken, double &rDouble) const;
bool getAsChar( sal_Int32 nToken, const char*& rPos ) const;
// XFastAttributeList
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 7eb3d80a7a9d..8a5f271f43ce 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
@@ -55,7 +55,7 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions : public utl
SvtExtendedSecurityOptions();
virtual ~SvtExtendedSecurityOptions() override;
- OpenHyperlinkMode GetOpenHyperlinkMode();
+ OpenHyperlinkMode GetOpenHyperlinkMode() const;
private:
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index eefb89e2ec62..cb66cb3aaf34 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -158,11 +158,11 @@ public:
// borrowed from utl::ConfigItem
css::uno::Sequence< OUString >
- GetNodeNames( const OUString &rNode );
+ GetNodeNames( const OUString &rNode ) const;
css::uno::Sequence< css::uno::Any >
GetProperties(
- const css::uno::Sequence< OUString > &rNames );
+ const css::uno::Sequence< OUString > &rNames ) const;
bool
ReplaceSetProperties(
@@ -195,7 +195,7 @@ public:
css::uno::Sequence< OUString > GetDisabledDictionaries() const;
- std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const OUString &rFormatName );
+ std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const OUString &rFormatName ) const;
// functions returning file URLs to the respective images (if found) and empty string otherwise
OUString GetSpellAndGrammarContextSuggestionImage( const OUString &rServiceImplName ) const;
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 018c7babe456..a5d675988a75 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -99,10 +99,10 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
void scanCurrFormatImpl( const OUString& rCode,
sal_Int32 nStart, sal_Int32& nSign,
sal_Int32& nPar, sal_Int32& nNum,
- sal_Int32& nBlank, sal_Int32& nSym );
+ sal_Int32& nBlank, sal_Int32& nSym ) const;
void getDateOrdersImpl();
- DateOrder scanDateOrderImpl( const OUString& rCode );
+ DateOrder scanDateOrderImpl( const OUString& rCode ) const;
void getDefaultCalendarImpl();
void getSecondaryCalendarImpl();
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 3dcd8321d0e7..fce65d40f814 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -153,7 +153,7 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions : public utl::detail::
static OUString GetFactoryShortName(EFactory eFactory);
- OUString GetDefaultModuleName();
+ OUString GetDefaultModuleName() const;
bool IsMath () const;
bool IsChart () const;
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 826025983cdd..69a093d9bdb3 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -51,7 +51,7 @@ public:
// ConfigItem methods
- bool IsModified();
+ bool IsModified() const;
void Commit();
/** Add a listener to react on config changes
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 31c218c6ef80..9f5ac4c45dab 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -87,7 +87,7 @@ public:
Returns the URL of the tempfile object.
If you want to have the system path file name, use the GetFileName() method of this object
*/
- OUString const & GetURL();
+ OUString const & GetURL() const;
/**
Returns the system path name of the tempfile in host notation
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index dfe563d831d0..b7b3250253af 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -220,7 +220,7 @@ public:
const css::lang::Locale& rLocale );
/* replace back references in the replace string by the sub expressions from the search result */
- void ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const css::util::SearchResult& rResult );
+ void ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const css::util::SearchResult& rResult ) const;
/** Upgrade SearchOptions to SearchOptions2 for places that don't handle
SearchOptions2 yet. Better fix your module if you want to support
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 2416a3bb42c7..06fe66270b12 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -153,7 +153,7 @@ sal_Int32 FastAttributeList::getOptionalValueToken( ::sal_Int32 Token, ::sal_Int
}
// performance sensitive shortcuts to avoid allocation ...
-bool FastAttributeList::getAsInteger( sal_Int32 nToken, sal_Int32 &rInt)
+bool FastAttributeList::getAsInteger( sal_Int32 nToken, sal_Int32 &rInt) const
{
rInt = 0;
for (size_t i = 0; i < maAttributeTokens.size(); ++i)
@@ -165,7 +165,7 @@ bool FastAttributeList::getAsInteger( sal_Int32 nToken, sal_Int32 &rInt)
return false;
}
-bool FastAttributeList::getAsDouble( sal_Int32 nToken, double &rDouble)
+bool FastAttributeList::getAsDouble( sal_Int32 nToken, double &rDouble) const
{
rDouble = 0.0;
for (size_t i = 0; i < maAttributeTokens.size(); ++i)
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 6456085f55a0..07456acf43ac 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -36,14 +36,14 @@ public:
AccessibleRelationSetHelperImpl(const AccessibleRelationSetHelperImpl& rImpl);
/// @throws uno::RuntimeException
- sal_Int32 getRelationCount( );
+ sal_Int32 getRelationCount() const;
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
- AccessibleRelation getRelation( sal_Int32 nIndex );
+ AccessibleRelation getRelation( sal_Int32 nIndex ) const;
/// @throws uno::RuntimeException
- bool containsRelation( sal_Int16 aRelationType );
+ bool containsRelation( sal_Int16 aRelationType ) const;
/// @throws uno::RuntimeException
- AccessibleRelation getRelationByType( sal_Int16 aRelationType );
+ AccessibleRelation getRelationByType( sal_Int16 aRelationType ) const;
/// @throws uno::RuntimeException
void AddRelation(const AccessibleRelation& rRelation);
@@ -60,26 +60,26 @@ AccessibleRelationSetHelperImpl::AccessibleRelationSetHelperImpl(const Accessibl
{
}
-sal_Int32 AccessibleRelationSetHelperImpl::getRelationCount( )
+sal_Int32 AccessibleRelationSetHelperImpl::getRelationCount() const
{
return maRelations.size();
}
-AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nIndex )
+AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nIndex ) const
{
if ((nIndex < 0) || (static_cast<sal_uInt32>(nIndex) >= maRelations.size()))
throw lang::IndexOutOfBoundsException();
return maRelations[nIndex];
}
-bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType )
+bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType ) const
{
AccessibleRelation defaultRelation; // default is INVALID
AccessibleRelation relationByType = getRelationByType(aRelationType);
return relationByType.RelationType != defaultRelation.RelationType;
}
-AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16 aRelationType )
+AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16 aRelationType ) const
{
sal_Int32 nCount(getRelationCount());
sal_Int32 i(0);
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 2a8dc2034822..b998e820f28b 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -113,8 +113,8 @@ public:
/// @throws css::uno::RuntimeException
static css::uno::Type SAL_CALL getElementType( );
/// @throws css::uno::RuntimeException
- bool SAL_CALL hasElements( );
- OUString GetEventName( GlobalEventId nID );
+ bool SAL_CALL hasElements() const;
+ OUString const & GetEventName( GlobalEventId nID ) const;
};
@@ -141,7 +141,7 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl()
assert(!IsModified()); // should have been committed
}
-OUString GlobalEventConfig_Impl::GetEventName( GlobalEventId nIndex )
+OUString const & GlobalEventConfig_Impl::GetEventName( GlobalEventId nIndex ) const
{
return m_supportedEvents[nIndex];
}
@@ -306,7 +306,7 @@ Type SAL_CALL GlobalEventConfig_Impl::getElementType( )
return cppu::UnoType<Sequence<beans::PropertyValue>>::get();
}
-bool SAL_CALL GlobalEventConfig_Impl::hasElements( )
+bool SAL_CALL GlobalEventConfig_Impl::hasElements() const
{
return m_eventBindingHash.empty();
}
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 46841d3dad01..2d1279c95f52 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -72,7 +72,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
virtual void Notify( const Sequence< OUString >& seqPropertyNames ) override;
- SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode() { return m_eOpenHyperlinkMode;}
+ SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode() const { return m_eOpenHyperlinkMode;}
private:
virtual void ImplCommit() override;
@@ -265,7 +265,7 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions()
// public method
-SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode()
+SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode() const
{
MutexGuard aGuard( GetInitMutex() );
return m_pImpl->GetOpenHyperlinkMode();
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index e12403f77784..d867f768d9bf 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -69,7 +69,7 @@ public:
SvtHistoryOptions_Impl();
/// Returns the maximum size of the internal lists, ie. the capacity not the size.
- sal_uInt32 GetCapacity(EHistoryType eHistory);
+ sal_uInt32 GetCapacity(EHistoryType eHistory) const;
/// Clear the specified history list.
void Clear(EHistoryType eHistory);
@@ -121,7 +121,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
}
}
-sal_uInt32 SvtHistoryOptions_Impl::GetCapacity(EHistoryType eHistory)
+sal_uInt32 SvtHistoryOptions_Impl::GetCapacity(EHistoryType eHistory) const
{
uno::Reference<beans::XPropertySet> xListAccess(m_xCommonXCU, uno::UNO_QUERY);
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 6be5e6ce8824..5e2bab397cf3 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -831,12 +831,12 @@ SvtLinguConfigItem & SvtLinguConfig::GetConfigItem()
return *pCfgItem;
}
-uno::Sequence< OUString > SvtLinguConfig::GetNodeNames( const OUString &rNode )
+uno::Sequence< OUString > SvtLinguConfig::GetNodeNames( const OUString &rNode ) const
{
return GetConfigItem().GetNodeNames( rNode );
}
-uno::Sequence< uno::Any > SvtLinguConfig::GetProperties( const uno::Sequence< OUString > &rNames )
+uno::Sequence< uno::Any > SvtLinguConfig::GetProperties( const uno::Sequence< OUString > &rNames ) const
{
return GetConfigItem().GetProperties(rNames);
}
@@ -1008,7 +1008,7 @@ uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const
}
std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionariesByFormat(
- const OUString &rFormatName )
+ const OUString &rFormatName ) const
{
std::vector< SvtLinguConfigDictionaryEntry > aRes;
if (rFormatName.isEmpty())
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 3d92b72cfe1d..12e0eefe6a81 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1120,7 +1120,7 @@ css::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames()
return m_pImpl->GetAllServiceNames();
}
-OUString SvtModuleOptions::GetDefaultModuleName()
+OUString SvtModuleOptions::GetDefaultModuleName() const
{
OUString aModule;
if (m_pImpl->IsModuleInstalled(SvtModuleOptions::EModule::WRITER))
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index d9d15a391c2e..4eadf6d3aa54 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -107,8 +107,8 @@ public:
void SetIgnoreLanguageChange( bool bSet);
bool IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const;
- const LanguageTag& GetRealLocale() { return m_aRealLocale; }
- const LanguageTag& GetRealUILocale() { return m_aRealUILocale; }
+ const LanguageTag& GetRealLocale() const { return m_aRealLocale; }
+ const LanguageTag& GetRealUILocale() const { return m_aRealUILocale; }
};
#define ROOTNODE_SYSLOCALE "Setup/L10N"
@@ -555,7 +555,7 @@ SvtSysLocaleOptions::~SvtSysLocaleOptions()
pImpl.reset();
}
-bool SvtSysLocaleOptions::IsModified()
+bool SvtSysLocaleOptions::IsModified() const
{
MutexGuard aGuard( GetMutex() );
return pImpl->IsModified();
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 09e5c186f517..3ae1ac104f70 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -662,7 +662,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl()
void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode,
sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar,
- sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym )
+ sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) const
{
nSign = nPar = nNum = nBlank = nSym = -1;
const sal_Unicode* const pStr = rCode.getStr();
@@ -901,7 +901,7 @@ DateOrder LocaleDataWrapper::getLongDateOrder() const
return (DateOrder) nLongDateOrder;
}
-DateOrder LocaleDataWrapper::scanDateOrderImpl( const OUString& rCode )
+DateOrder LocaleDataWrapper::scanDateOrderImpl( const OUString& rCode ) const
{
// Only some european versions were translated, the ones with different
// keyword combinations are:
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 06def7e5d8ed..f1191f43c6c0 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -307,7 +307,7 @@ bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
return bRet;
}
-void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const SearchResult& rResult )
+void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const SearchResult& rResult ) const
{
if( rResult.subRegExpressions > 0 )
{
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 3b55739003c8..4df84af0cb6a 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -395,7 +395,7 @@ OUString TempFile::GetFileName() const
return aTmp;
}
-OUString const & TempFile::GetURL()
+OUString const & TempFile::GetURL() const
{
assert(!aName.isEmpty() && "TempFile::GetURL failed: unit test is leaking temp files, add the ucpfile1 component!");
return aName;
More information about the Libreoffice-commits
mailing list