pyuno/source/module/pyuno_module.cxx | 6 +++---
sal/osl/all/log.cxx | 2 +-
sax/source/expatwrap/saxwriter.cxx | 10 +++++-----
sax/source/fastparser/fastparser.cxx | 24 ++++++++++++------------
sax/source/fastparser/legacyfastparser.cxx | 18 +++++++++---------
5 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 8030c5cfbb9e88038d34f0b753c415c207927441
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Nov 11 13:50:39 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Nov 11 15:47:38 2024 +0100
loplugin:reftotemp in pyuno..sax
Change-Id: Ia616256e06f64ad3c635ac30abf521e5dab107d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176401
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index f7ed6ca617ab..195382810674 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -171,11 +171,11 @@ void fillStruct(
for( int i = 0 ; i < remainingPosInitialisers && i < nMembers ; i ++ )
{
const int tupleIndex = state.getCntConsumed();
- const OUString& rMemberName (pCompType->ppMemberNames[i]);
- state.setInitialised(rMemberName, tupleIndex);
+ const OUString aMemberName (pCompType->ppMemberNames[i]);
+ state.setInitialised(aMemberName, tupleIndex);
PyObject *element = PyTuple_GetItem( initializer, tupleIndex );
Any a = runtime.pyObject2Any( element, ACCEPT_UNO_ANY );
- inv->setValue( rMemberName, a );
+ inv->setValue( aMemberName, a );
}
}
if ( PyTuple_Size( initializer ) <= 0 )
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 6d6e808e7446..f11fc4accd04 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -243,7 +243,7 @@ std::pair<bool, bool> getTimestampFlags(char const
*selector)
void maybeOutputTimestamp(std::ostringstream &s) {
static const std::pair<bool, bool> aEnvFlags =
getTimestampFlags(getLogLevelEnvVar());
- const auto& [outputTimestamp, outputRelativeTimer] = (pLogSelector ==
nullptr ? aEnvFlags : getTimestampFlags(pLogSelector));
+ const auto [outputTimestamp, outputRelativeTimer] = (pLogSelector ==
nullptr ? aEnvFlags : getTimestampFlags(pLogSelector));
if (!(outputTimestamp || outputRelativeTimer)) {
return;
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index c4d56586c060..75860f62550e 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -687,14 +687,14 @@ SaxInvalidCharacterError
SaxWriterHelper::startElement(const OUString& rName,
if (nCurrentPos == SEQUENCESIZE)
nCurrentPos = writeSequence();
- OUString const& rAttrName(xAttribs->getNameByIndex(i));
+ OUString const aAttrName(xAttribs->getNameByIndex(i));
#ifdef DBG_UTIL
// Well-formedness constraint: Unique Att Spec
- assert(DebugAttributes.find(rAttrName) == DebugAttributes.end());
- DebugAttributes.insert(rAttrName);
+ assert(DebugAttributes.find(aAttrName) == DebugAttributes.end());
+ DebugAttributes.insert(aAttrName);
#endif
- CheckValidName(rAttrName);
- if (!writeString(rAttrName, false, false))
+ CheckValidName(aAttrName);
+ if (!writeString(aAttrName, false, false))
eRet = SAX_ERROR;
mp_Sequence[nCurrentPos] = '=';
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index dd0240502c35..8815cd58329e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -434,7 +434,7 @@ void Entity::startElement( Event const *pEvent )
try
{
- const Reference< XFastAttributeList > & xAttr( pEvent->mxAttributes );
+ const Reference< XFastAttributeList > xAttr( pEvent->mxAttributes );
Reference< XFastContextHandler > xContext;
if ( mxNamespaceHandler.is() )
@@ -1303,9 +1303,9 @@ void FastSaxParserImpl::addUnknownElementWithPrefix(const
xmlChar **attributes,
OUString aNamespaceURI;
if ( !m_bIgnoreMissingNSDecl || attributes[i + 2] != nullptr )
aNamespaceURI = OUString( XML_CAST( attributes[ i + 2 ] ), strlen(
XML_CAST( attributes[ i + 2 ] )), RTL_TEXTENCODING_UTF8 );
- const OString& rPrefix = OString( XML_CAST( attributes[ i + 1 ] ));
- const OString& rLocalName = OString( XML_CAST( attributes[ i ] ));
- OString aQualifiedName = (rPrefix.isEmpty())? rLocalName : rPrefix + ":" +
rLocalName;
+ const OString aPrefix( XML_CAST( attributes[ i + 1 ] ));
+ const OString aLocalName( XML_CAST( attributes[ i ] ));
+ OString aQualifiedName = (aPrefix.isEmpty())? aLocalName : aPrefix + ":" +
aLocalName;
xAttributes->addUnknown( aNamespaceURI, aQualifiedName,
OString( XML_CAST( attributes[ i + 3 ] ), attributes[ i + 4 ] -
attributes[ i + 3 ] ));
SAL_INFO("xmloff", "unknown element " << aQualifiedName << " " <<
aNamespaceURI);
@@ -1580,10 +1580,10 @@ static bool NormalizeW3URI( OUString& rName )
// - xforms
bool bSuccess = false;
- const OUString& sURIPrefix = XML_URI_W3_PREFIX;
+ const OUString sURIPrefix = XML_URI_W3_PREFIX;
if( rName.startsWith( sURIPrefix ) )
{
- const OUString& sURISuffix = XML_URI_XFORMS_SUFFIX ;
+ const OUString sURISuffix = XML_URI_XFORMS_SUFFIX ;
sal_Int32 nCompareFrom = rName.getLength() - sURISuffix.getLength();
if( rName.subView( nCompareFrom ) == sURISuffix )
{
@@ -1624,12 +1624,12 @@ static bool NormalizeOasisURN( OUString& rName )
sal_Int32 nNameLen = rName.getLength();
// :urn:oasis:names:tc.*
- const OUString& rOasisURN = XML_URN_OASIS_NAMES_TC;
- if( !rName.startsWith( rOasisURN ) )
+ const OUString aOasisURN = XML_URN_OASIS_NAMES_TC;
+ if( !rName.startsWith( aOasisURN ) )
return false;
// :urn:oasis:names:tc:.*
- sal_Int32 nPos = rOasisURN.getLength();
+ sal_Int32 nPos = aOasisURN.getLength();
if( nPos >= nNameLen || rName[nPos] != ':' )
return false;
@@ -1642,12 +1642,12 @@ static bool NormalizeOasisURN( OUString& rName )
// :urn:oasis:names:tc:[^:]:xmlns.*
nPos = nTCIdEnd + 1;
std::u16string_view sTmp( rName.subView( nPos ) );
- const OUString& rXMLNS = XML_XMLNS;
- if( !o3tl::starts_with(sTmp, rXMLNS ) )
+ const OUString aXMLNS = XML_XMLNS;
+ if( !o3tl::starts_with(sTmp, aXMLNS ) )
return false;
// :urn:oasis:names:tc:[^:]:xmlns:.*
- nPos += rXMLNS.getLength();
+ nPos += aXMLNS.getLength();
if( nPos >= nNameLen || rName[nPos] != ':' )
return false;
diff --git a/sax/source/fastparser/legacyfastparser.cxx
b/sax/source/fastparser/legacyfastparser.cxx
index 38cc558973a4..55b9f290cc7b 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -210,9 +210,9 @@ void SAL_CALL CallbackDocumentHandler::setDocumentLocator(
const Reference< XLoc
void SAL_CALL CallbackDocumentHandler::startFastElement( sal_Int32 nElement ,
const Reference< XFastAttributeList >& Attribs )
{
- const OUString& rPrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nElement );
- const OUString& rLocalName = CallbackDocumentHandler::getNameFromToken(
nElement );
- startUnknownElement( aDefaultNamespace, (rPrefix.isEmpty())? rLocalName :
rPrefix + aNamespaceSeparator + rLocalName, Attribs );
+ const OUString aPrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nElement );
+ const OUString aLocalName = CallbackDocumentHandler::getNameFromToken(
nElement );
+ startUnknownElement( aDefaultNamespace, (aPrefix.isEmpty())? aLocalName :
aPrefix + aNamespaceSeparator + aLocalName, Attribs );
}
void SAL_CALL CallbackDocumentHandler::startUnknownElement( const OUString&
/*Namespace*/, const OUString& Name, const Reference< XFastAttributeList >&
Attribs )
@@ -228,10 +228,10 @@ void SAL_CALL
CallbackDocumentHandler::startUnknownElement( const OUString& /*Na
{
const OUString& rAttrValue = rAttr.Value;
sal_Int32 nToken = rAttr.Token;
- const OUString& rAttrNamespacePrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nToken );
+ const OUString aAttrNamespacePrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nToken );
OUString sAttrName = CallbackDocumentHandler::getNameFromToken( nToken
);
- if ( !rAttrNamespacePrefix.isEmpty() )
- sAttrName = rAttrNamespacePrefix + aNamespaceSeparator + sAttrName;
+ if ( !aAttrNamespacePrefix.isEmpty() )
+ sAttrName = aAttrNamespacePrefix + aNamespaceSeparator + sAttrName;
rAttrList->AddAttribute( sAttrName, rAttrValue );
}
@@ -249,9 +249,9 @@ void SAL_CALL CallbackDocumentHandler::startUnknownElement(
const OUString& /*Na
void SAL_CALL CallbackDocumentHandler::endFastElement( sal_Int32 nElement )
{
- const OUString& rPrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nElement );
- const OUString& rLocalName = CallbackDocumentHandler::getNameFromToken(
nElement );
- endUnknownElement( aDefaultNamespace, (rPrefix.isEmpty())? rLocalName :
rPrefix + aNamespaceSeparator + rLocalName );
+ const OUString aPrefix =
CallbackDocumentHandler::getNamespacePrefixFromToken( nElement );
+ const OUString aLocalName = CallbackDocumentHandler::getNameFromToken(
nElement );
+ endUnknownElement( aDefaultNamespace, (aPrefix.isEmpty())? aLocalName :
aPrefix + aNamespaceSeparator + aLocalName );
}
