[Libreoffice-commits] core.git: include/sax sax/source sc/source xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 23 08:38:29 UTC 2019
include/sax/fastattribs.hxx | 6 +++---
sax/source/tools/fastattribs.cxx | 2 +-
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 2 +-
sc/source/filter/xml/XMLDDELinksContext.cxx | 4 ++--
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 8 ++++----
sc/source/filter/xml/xmlcoli.cxx | 2 +-
sc/source/filter/xml/xmldpimp.cxx | 4 ++--
sc/source/filter/xml/xmldrani.cxx | 2 +-
sc/source/filter/xml/xmlrowi.cxx | 2 +-
xmloff/source/core/xmlimp.cxx | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 5e01bae7f4a6f81ff70f328d0289dae37fab01eb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 23 09:23:20 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 23 10:37:31 2019 +0200
loplugin:returnconstval in sax
Change-Id: Icf5c337164b71aab10dd960815eee516822c276c
Reviewed-on: https://gerrit.libreoffice.org/77990
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f8005a65a27a..10ca8a2fad1f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -190,9 +190,9 @@ public:
return !strcmp(str, mrList.getFastAttributeValue(mnIdx));
}
};
- const FastAttributeIter begin() const { return FastAttributeIter(*this, 0); }
- const FastAttributeIter end() const { return FastAttributeIter(*this, maAttributeTokens.size()); }
- const FastAttributeIter find( sal_Int32 nToken ) const;
+ FastAttributeIter begin() const { return FastAttributeIter(*this, 0); }
+ FastAttributeIter end() const { return FastAttributeIter(*this, maAttributeTokens.size()); }
+ FastAttributeIter find( sal_Int32 nToken ) const;
private:
sal_Char *mpChunk; ///< buffer to store all attribute values - null terminated strings
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 6175c7873882..8aff8569d903 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -253,7 +253,7 @@ Sequence< FastAttribute > FastAttributeList::getFastAttributes( )
return aSeq;
}
-const FastAttributeList::FastAttributeIter FastAttributeList::find( sal_Int32 nToken ) const
+FastAttributeList::FastAttributeIter FastAttributeList::find( sal_Int32 nToken ) const
{
for (size_t i = 0; i < maAttributeTokens.size(); ++i)
if( maAttributeTokens[i] == nToken )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 1b69a38a34a5..90c59096e300 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -147,7 +147,7 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DATE_VALUE ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DATE_VALUE ) ) );
if (aIter != rAttrList->end())
{
util::DateTime aDateTime;
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 7ddf26f920ef..df0ee77f4fe1 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -265,7 +265,7 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
if ( rAttrList.is() )
{
sal_Int32 nCols(1);
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NUMBER_COLUMNS_REPEATED ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NUMBER_COLUMNS_REPEATED ) ) );
if (aIter != rAttrList->end())
nCols = aIter.toInt32();
@@ -286,7 +286,7 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NUMBER_ROWS_REPEATED ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NUMBER_ROWS_REPEATED ) ) );
if (aIter != rAttrList->end())
nRows = aIter.toInt32();
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 0c75444d925c..5c1e3073067a 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -549,7 +549,7 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport&
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
if (aIter != rAttrList->end())
nID = ScXMLChangeTrackingImportHelper::GetIDFromString( aIter.toString() );
}
@@ -598,7 +598,7 @@ ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport,
sal_uInt32 nID(0);
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
if (aIter != rAttrList->end())
nID = ScXMLChangeTrackingImportHelper::GetIDFromString(aIter.toString());
}
@@ -641,7 +641,7 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport,
sal_uInt32 nID(0);
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
if (aIter != rAttrList->end())
nID = ScXMLChangeTrackingImportHelper::GetIDFromString( aIter.toString() );
}
@@ -953,7 +953,7 @@ ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport,
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
if (aIter != rAttrList->end())
nID = ScXMLChangeTrackingImportHelper::GetIDFromString( aIter.toString() );
}
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 97bb79f705a9..6602e6ad9c62 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -160,7 +160,7 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport,
nGroupStartCol = rImport.GetTables().GetCurrentColCount();
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DISPLAY ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DISPLAY ) ) );
if ( aIter != rAttrList->end() && IsXMLToken(aIter, XML_FALSE) )
bGroupDisplay = false;
}
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 5a5dc443857b..15dd638deaeb 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1503,7 +1503,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport,
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NAME ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NAME ) ) );
if (aIter != rAttrList->end())
sName = aIter.toString();
}
@@ -1545,7 +1545,7 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport&
{
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NAME ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_NAME ) ) );
if (aIter != rAttrList->end())
sName = aIter.toString();
}
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 7439bdc41256..5a6e362677d8 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -612,7 +612,7 @@ ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
OUString sConRes;
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( XLINK, XML_HREF ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( XLINK, XML_HREF ) ) );
if (aIter != rAttrList->end())
sConRes = aIter.toString();
}
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index eff02d8b6cc5..8491d94f8397 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -243,7 +243,7 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport,
++nGroupStartRow;
if ( rAttrList.is() )
{
- auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DISPLAY ) ) );
+ auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DISPLAY ) ) );
if (aIter != rAttrList->end())
bGroupDisplay = IsXMLToken( aIter, XML_TRUE );
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index bc6801ea6897..8964eed35002 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -841,7 +841,7 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element,
{
sax_fastparser::FastAttributeList *pAttribList =
sax_fastparser::FastAttributeList::castToFastAttributeList( Attribs );
- auto &aIter( pAttribList->find( XML_ELEMENT( OFFICE, XML_VERSION ) ) );
+ auto aIter( pAttribList->find( XML_ELEMENT( OFFICE, XML_VERSION ) ) );
if( aIter != pAttribList->end() )
{
mpImpl->aODFVersion = aIter.toString();
More information about the Libreoffice-commits
mailing list