summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-23 16:41:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-23 19:35:46 +0200
commitbc50aa40f9ad790c7a9afc1dd9059ac0755be3fe (patch)
tree2c0765395ed2fd23710357e23c8eb9140166bbf2
parent79e1d1353b4bed9a120c44b3a0436d4b041c30f7 (diff)
loplugin:returnconstval in xmloff
Change-Id: I200080ff1c44544fdb8211e58228fd62465f3732 Reviewed-on: https://gerrit.libreoffice.org/78020 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/xmloff/xmlcnimp.hxx4
-rw-r--r--include/xmloff/xmlimp.hxx8
-rw-r--r--xmloff/source/core/SvXMLAttrCollection.cxx4
-rw-r--r--xmloff/source/core/SvXMLAttrCollection.hxx4
-rw-r--r--xmloff/source/core/xmlcnimp.cxx4
-rw-r--r--xmloff/source/core/xmlimp.cxx8
-rw-r--r--xmloff/source/text/txtflde.cxx12
7 files changed, 22 insertions, 22 deletions
diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index 338a48f753ac..c987e9943138 100644
--- a/include/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
@@ -47,8 +47,8 @@ public:
const OUString& rValue );
size_t GetAttrCount() const;
- const OUString GetAttrNamespace( size_t i ) const;
- const OUString GetAttrPrefix( size_t i ) const;
+ OUString GetAttrNamespace( size_t i ) const;
+ OUString GetAttrPrefix( size_t i ) const;
const OUString& GetAttrLName( size_t i ) const;
const OUString& GetAttrValue( size_t i ) const;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 33ab9dab9d68..9713f720f08a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -376,10 +376,10 @@ public:
// get import helper for events
XMLEventImportHelper& GetEventImport();
- static const OUString getNameFromToken( sal_Int32 nToken );
- static const OUString getNamespacePrefixFromToken(sal_Int32 nToken, const SvXMLNamespaceMap* pMap);
- static const OUString getNamespaceURIFromToken( sal_Int32 nToken );
- static const OUString getNamespacePrefixFromURI( const OUString& rURI );
+ static OUString getNameFromToken( sal_Int32 nToken );
+ static OUString getNamespacePrefixFromToken(sal_Int32 nToken, const SvXMLNamespaceMap* pMap);
+ static OUString getNamespaceURIFromToken( sal_Int32 nToken );
+ static OUString getNamespacePrefixFromURI( const OUString& rURI );
SvXMLNamespaceMap& GetNamespaceMap() { return *mpNamespaceMap; }
const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; }
diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx
index fd79079a7a40..7217aee6393d 100644
--- a/xmloff/source/core/SvXMLAttrCollection.cxx
+++ b/xmloff/source/core/SvXMLAttrCollection.cxx
@@ -130,7 +130,7 @@ const OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const
return aAttrs[i].getValue();
}
-const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const
+OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const
{
OUString sRet;
sal_uInt16 nPos = GetPrefixPos( i );
@@ -140,7 +140,7 @@ const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const
return sRet;
}
-const OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const
+OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const
{
OUString sRet;
sal_uInt16 nPos = GetPrefixPos( i );
diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx
index feed18820a26..e029491ce182 100644
--- a/xmloff/source/core/SvXMLAttrCollection.hxx
+++ b/xmloff/source/core/SvXMLAttrCollection.hxx
@@ -52,8 +52,8 @@ public:
size_t GetAttrCount() const;
const OUString& GetAttrLName(size_t i) const;
const OUString& GetAttrValue(size_t i) const;
- const OUString GetAttrNamespace( size_t i ) const;
- const OUString GetAttrPrefix( size_t i ) const;
+ OUString GetAttrNamespace( size_t i ) const;
+ OUString GetAttrPrefix( size_t i ) const;
const OUString& GetNamespace( sal_uInt16 i ) const;
const OUString& GetPrefix( sal_uInt16 i ) const;
sal_uInt16 GetFirstNamespaceIndex() const;
diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx
index ce5e9968c24f..f9cc065320a6 100644
--- a/xmloff/source/core/xmlcnimp.cxx
+++ b/xmloff/source/core/xmlcnimp.cxx
@@ -106,12 +106,12 @@ const OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const
return pimpl->GetAttrValue(i);
}
-const OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const
+OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const
{
return pimpl->GetAttrNamespace(i);
}
-const OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const
+OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const
{
return pimpl->GetAttrPrefix(i);
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 8964eed35002..1d22fd34449b 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2012,14 +2012,14 @@ bool SvXMLImport::embeddedFontAlreadyProcessed( const OUString& url )
return false;
}
-const OUString SvXMLImport::getNameFromToken( sal_Int32 nToken )
+OUString SvXMLImport::getNameFromToken( sal_Int32 nToken )
{
uno::Sequence< sal_Int8 > aSeq = xTokenHandler->getUTF8Identifier( nToken & TOKEN_MASK );
return OUString( reinterpret_cast< const char* >(
aSeq.getConstArray() ), aSeq.getLength(), RTL_TEXTENCODING_UTF8 );
}
-const OUString SvXMLImport::getNamespacePrefixFromToken(sal_Int32 nToken, const SvXMLNamespaceMap* pMap)
+OUString SvXMLImport::getNamespacePrefixFromToken(sal_Int32 nToken, const SvXMLNamespaceMap* pMap)
{
sal_Int32 nNamespaceToken = ( nToken & NMSP_MASK ) >> NMSP_SHIFT;
auto aIter( aNamespaceMap.find( nNamespaceToken ) );
@@ -2037,7 +2037,7 @@ const OUString SvXMLImport::getNamespacePrefixFromToken(sal_Int32 nToken, const
return OUString();
}
-const OUString SvXMLImport::getNamespaceURIFromToken( sal_Int32 nToken )
+OUString SvXMLImport::getNamespaceURIFromToken( sal_Int32 nToken )
{
sal_Int32 nNamespaceToken = ( nToken & NMSP_MASK ) >> NMSP_SHIFT;
auto aIter( aNamespaceMap.find( nNamespaceToken ) );
@@ -2047,7 +2047,7 @@ const OUString SvXMLImport::getNamespaceURIFromToken( sal_Int32 nToken )
return OUString();
}
-const OUString SvXMLImport::getNamespacePrefixFromURI( const OUString& rURI )
+OUString SvXMLImport::getNamespacePrefixFromURI( const OUString& rURI )
{
auto aIter( aNamespaceURIPrefixMap.find(rURI) );
if( aIter != aNamespaceURIPrefixMap.end() )
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 19d7ed74cad9..67c4e8db7a31 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -283,7 +283,7 @@ static bool GetOptionalBoolProperty(const OUString&,
bool bDefault);
static double GetDoubleProperty(const OUString&,
const Reference<XPropertySet> &);
-static OUString const GetStringProperty(const OUString&,
+static OUString GetStringProperty(const OUString&,
const Reference<XPropertySet> &);
static sal_Int32 GetIntProperty(const OUString&,
const Reference<XPropertySet> &);
@@ -291,9 +291,9 @@ static sal_Int16 GetInt16Property(const OUString&,
const Reference<XPropertySet> &);
static sal_Int8 GetInt8Property(const OUString&,
const Reference<XPropertySet> &);
-static util::DateTime const GetDateTimeProperty( const OUString& sPropName,
+static util::DateTime GetDateTimeProperty( const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
-static Sequence<OUString> const GetStringSequenceProperty(
+static Sequence<OUString> GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
@@ -3504,7 +3504,7 @@ double GetDoubleProperty(
return fDouble;
}
-OUString const GetStringProperty(
+OUString GetStringProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3544,7 +3544,7 @@ sal_Int8 GetInt8Property(
return nInt;
}
-util::DateTime const GetDateTimeProperty(
+util::DateTime GetDateTimeProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3554,7 +3554,7 @@ util::DateTime const GetDateTimeProperty(
return aTime;
}
-Sequence<OUString> const GetStringSequenceProperty(
+Sequence<OUString> GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{