xmlsecurity/source/helper/ooxmlsecparser.cxx | 156 ++++++++++-----------
xmlsecurity/source/helper/xsecparser.cxx | 194 +++++++++++++--------------
2 files changed, 175 insertions(+), 175 deletions(-)
New commits:
commit 4ce8c219fc4cc252e4f2546c2a59ee0447efa7ee
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 26 19:44:38 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 26 22:44:37 2021 +0200
cid#1489423 Big parameter passed by value
and
cid#1489424 Big parameter passed by value
cid#1489425 Big parameter passed by value
cid#1489427 Big parameter passed by value
cid#1489432 Big parameter passed by value
cid#1489435 Big parameter passed by value
cid#1489436 Big parameter passed by value
cid#1489439 Big parameter passed by value
cid#1489441 Big parameter passed by value
cid#1489443 Big parameter passed by value
cid#1489445 Big parameter passed by value
cid#1489451 Big parameter passed by value
cid#1489459 Big parameter passed by value
cid#1489462 Big parameter passed by value
cid#1489463 Big parameter passed by value
cid#1489465 Big parameter passed by value
cid#1489467 Big parameter passed by value
cid#1489468 Big parameter passed by value
cid#1489469 Big parameter passed by value
cid#1489473 Big parameter passed by value
cid#1489475 Big parameter passed by value
cid#1489476 Big parameter passed by value
cid#1489477 Big parameter passed by value
cid#1489479 Big parameter passed by value
cid#1489481 Big parameter passed by value
cid#1489489 Big parameter passed by value
cid#1489491 Big parameter passed by value
cid#1489493 Big parameter passed by value
cid#1489495 Big parameter passed by value
cid#1489498 Big parameter passed by value
cid#1489501 Big parameter passed by value
cid#1489504 Big parameter passed by value
cid#1489508 Big parameter passed by value
cid#1489509 Big parameter passed by value
cid#1489513 Big parameter passed by value
cid#1489516 Big parameter passed by value
cid#1489518 Big parameter passed by value
cid#1489521 Big parameter passed by value
cid#1489533 Big parameter passed by value
cid#1489534 Big parameter passed by value
cid#1489537 Big parameter passed by value
cid#1489538 Big parameter passed by value
cid#1489540 Big parameter passed by value
Change-Id: If613144a64087b4e0459f5935e1adbcb0e0330b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119531
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmlsecurity/source/helper/xsecparser.cxx
b/xmlsecurity/source/helper/xsecparser.cxx
index f12e7031e349..2e07a1d14f8c 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -39,8 +39,8 @@ class XSecParser::Context
std::optional<SvXMLNamespaceMap> m_pOldNamespaceMap;
public:
- Context(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ Context(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: m_rParser(rParser)
, m_pOldNamespaceMap(std::move(pOldNamespaceMap))
{
@@ -74,8 +74,8 @@ class XSecParser::UnknownContext
: public XSecParser::Context
{
public:
- UnknownContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ UnknownContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -113,8 +113,8 @@ class XSecParser::ReferencedContextImpl
bool m_isReferenced;
public:
- ReferencedContextImpl(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ ReferencedContextImpl(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_isReferenced(isReferenced)
@@ -139,8 +139,8 @@ class XSecParser::LoPGPOwnerContext
OUString m_Value;
public:
- LoPGPOwnerContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ LoPGPOwnerContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -163,8 +163,8 @@ class XSecParser::DsPGPKeyPacketContext
OUString m_Value;
public:
- DsPGPKeyPacketContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsPGPKeyPacketContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -187,8 +187,8 @@ class XSecParser::DsPGPKeyIDContext
OUString m_Value;
public:
- DsPGPKeyIDContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsPGPKeyIDContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -208,8 +208,8 @@ class XSecParser::DsPGPDataContext
: public XSecParser::Context
{
public:
- DsPGPDataContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsPGPDataContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -247,9 +247,9 @@ class XSecParser::DsX509CertificateContext
OUString & m_rValue;
public:
- DsX509CertificateContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509CertificateContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -268,9 +268,9 @@ class XSecParser::DsX509SerialNumberContext
OUString & m_rValue;
public:
- DsX509SerialNumberContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509SerialNumberContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -289,9 +289,9 @@ class XSecParser::DsX509IssuerNameContext
OUString & m_rValue;
public:
- DsX509IssuerNameContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509IssuerNameContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -311,9 +311,9 @@ class XSecParser::DsX509IssuerSerialContext
OUString & m_rX509SerialNumber;
public:
- DsX509IssuerSerialContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rIssuerName, OUString & rSerialNumber)
+ DsX509IssuerSerialContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rIssuerName, OUString& rSerialNumber)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rX509IssuerName(rIssuerName)
, m_rX509SerialNumber(rSerialNumber)
@@ -348,8 +348,8 @@ class XSecParser::DsX509DataContext
std::vector<OUString> m_X509Certificates;
public:
- DsX509DataContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsX509DataContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -382,8 +382,8 @@ class XSecParser::DsKeyInfoContext
: public XSecParser::Context
{
public:
- DsKeyInfoContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsKeyInfoContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -421,8 +421,8 @@ class XSecParser::DsSignatureValueContext
OUString m_Value;
public:
- DsSignatureValueContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureValueContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -451,9 +451,9 @@ class XSecParser::DsDigestValueContext
OUString & m_rValue;
public:
- DsDigestValueContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsDigestValueContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -478,9 +478,9 @@ class XSecParser::DsDigestMethodContext
sal_Int32 & m_rReferenceDigestID;
public:
- DsDigestMethodContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- sal_Int32 & rReferenceDigestID)
+ DsDigestMethodContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ sal_Int32& rReferenceDigestID)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rReferenceDigestID(rReferenceDigestID)
{
@@ -517,9 +517,9 @@ class XSecParser::DsTransformContext
bool & m_rIsC14N;
public:
- DsTransformContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- bool & rIsC14N)
+ DsTransformContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ bool& rIsC14N)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rIsC14N(rIsC14N)
{
@@ -547,9 +547,9 @@ class XSecParser::DsTransformsContext
bool & m_rIsC14N;
public:
- DsTransformsContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- bool & rIsC14N)
+ DsTransformsContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ bool& rIsC14N)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rIsC14N(rIsC14N)
{
@@ -580,8 +580,8 @@ class XSecParser::DsReferenceContext
sal_Int32 m_nReferenceDigestID = css::xml::crypto::DigestID::SHA1;
public:
- DsReferenceContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsReferenceContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -648,8 +648,8 @@ class XSecParser::DsSignatureMethodContext
: public XSecParser::Context
{
public:
- DsSignatureMethodContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureMethodContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -670,8 +670,8 @@ class XSecParser::DsSignedInfoContext
: public XSecParser::Context
{
public:
- DsSignedInfoContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignedInfoContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -711,8 +711,8 @@ class XSecParser::XadesEncapsulatedX509CertificateContext
OUString m_Value;
public:
- XadesEncapsulatedX509CertificateContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ XadesEncapsulatedX509CertificateContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -738,8 +738,8 @@ class XSecParser::XadesCertificateValuesContext
: public XSecParser::Context
{
public:
- XadesCertificateValuesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ XadesCertificateValuesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -767,8 +767,8 @@ class XSecParser::XadesUnsignedSignaturePropertiesContext
: public XSecParser::Context
{
public:
- XadesUnsignedSignaturePropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ XadesUnsignedSignaturePropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -810,8 +810,8 @@ class XSecParser::XadesUnsignedPropertiesContext
: public XSecParser::Context
{
public:
- XadesUnsignedPropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ XadesUnsignedPropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -842,8 +842,8 @@ class XSecParser::LoSignatureLineIdContext
OUString m_Value;
public:
- LoSignatureLineIdContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ LoSignatureLineIdContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -874,8 +874,8 @@ class XSecParser::LoSignatureLineValidImageContext
OUString m_Value;
public:
- LoSignatureLineValidImageContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ LoSignatureLineValidImageContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -906,8 +906,8 @@ class XSecParser::LoSignatureLineInvalidImageContext
OUString m_Value;
public:
- LoSignatureLineInvalidImageContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ LoSignatureLineInvalidImageContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -935,8 +935,8 @@ class XSecParser::LoSignatureLineContext
: public XSecParser::ReferencedContextImpl
{
public:
- LoSignatureLineContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ LoSignatureLineContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -970,9 +970,9 @@ class XSecParser::XadesCertDigestContext
sal_Int32 & m_rReferenceDigestID;
public:
- XadesCertDigestContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rDigestValue, sal_Int32 & rReferenceDigestID)
+ XadesCertDigestContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rDigestValue, sal_Int32& rReferenceDigestID)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rDigestValue(rDigestValue)
, m_rReferenceDigestID(rReferenceDigestID)
@@ -1005,8 +1005,8 @@ class XSecParser::XadesCertContext
OUString m_X509SerialNumber;
public:
- XadesCertContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesCertContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1044,8 +1044,8 @@ class XSecParser::XadesSigningCertificateContext
: public XSecParser::ReferencedContextImpl
{
public:
- XadesSigningCertificateContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSigningCertificateContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1070,8 +1070,8 @@ class XSecParser::XadesSigningTimeContext
OUString m_Value;
public:
- XadesSigningTimeContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSigningTimeContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1099,8 +1099,8 @@ class XSecParser::XadesSignedSignaturePropertiesContext
: public XSecParser::ReferencedContextImpl
{
public:
- XadesSignedSignaturePropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSignedSignaturePropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1137,8 +1137,8 @@ class XSecParser::XadesSignedPropertiesContext
: public XSecParser::ReferencedContextImpl
{
public:
- XadesSignedPropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSignedPropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1167,8 +1167,8 @@ class XSecParser::XadesQualifyingPropertiesContext
: public XSecParser::ReferencedContextImpl
{
public:
- XadesQualifyingPropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesQualifyingPropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1203,9 +1203,9 @@ class XSecParser::DcDateContext
OUString & m_rValue;
public:
- DcDateContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DcDateContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -1224,9 +1224,9 @@ class XSecParser::DcDescriptionContext
OUString & m_rValue;
public:
- DcDescriptionContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DcDescriptionContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -1248,8 +1248,8 @@ class XSecParser::DsSignaturePropertyContext
OUString m_Value;
public:
- DsSignaturePropertyContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ DsSignaturePropertyContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1306,8 +1306,8 @@ class XSecParser::DsSignaturePropertiesContext
: public XSecParser::ReferencedContextImpl
{
public:
- DsSignaturePropertiesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ DsSignaturePropertiesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1335,8 +1335,8 @@ class XSecParser::DsObjectContext
: public XSecParser::ReferencedContextImpl
{
public:
- DsObjectContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsObjectContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
// init with "false" here - the Signature element can't be
referenced by its child
: XSecParser::ReferencedContextImpl(rParser,
std::move(pOldNamespaceMap), false)
{
@@ -1369,8 +1369,8 @@ class XSecParser::DsSignatureContext
: public XSecParser::Context
{
public:
- DsSignatureContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -1415,8 +1415,8 @@ class XSecParser::DsigSignaturesContext
: public XSecParser::Context
{
public:
- DsigSignaturesContext(XSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsigSignaturesContext(XSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: XSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
commit 7e864acc8991d42013a42abe408e5260a2124595
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 26 19:23:53 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 26 22:44:24 2021 +0200
cid#1489419 Big parameter passed by value
and
cid#1489421 Big parameter passed by value
cid#1489426 Big parameter passed by value
cid#1489428 Big parameter passed by value
cid#1489430 Big parameter passed by value
cid#1489433 Big parameter passed by value
cid#1489434 Big parameter passed by value
cid#1489438 Big parameter passed by value
cid#1489442 Big parameter passed by value
cid#1489447 Big parameter passed by value
cid#1489452 Big parameter passed by value
cid#1489455 Big parameter passed by value
cid#1489456 Big parameter passed by value
cid#1489460 Big parameter passed by value
cid#1489461 Big parameter passed by value
cid#1489466 Big parameter passed by value
cid#1489470 Big parameter passed by value
cid#1489471 Big parameter passed by value
cid#1489478 Big parameter passed by value
cid#1489483 Big parameter passed by value
cid#1489488 Big parameter passed by value
cid#1489497 Big parameter passed by value
cid#1489499 Big parameter passed by value
cid#1489500 Big parameter passed by value
cid#1489506 Big parameter passed by value
cid#1489514 Big parameter passed by value
cid#1489515 Big parameter passed by value
cid#1489519 Big parameter passed by value
cid#1489524 Big parameter passed by value
cid#1489528 Big parameter passed by value
cid#1489530 Big parameter passed by value
cid#1489531 Big parameter passed by value
cid#1489536 Big parameter passed by value
Change-Id: I72167511858f16f49b31fd69e39435dbdaf83196
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119530
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx
b/xmlsecurity/source/helper/ooxmlsecparser.cxx
index a25c7ecffa01..690ce594ff22 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx
@@ -31,8 +31,8 @@ class OOXMLSecParser::Context
std::optional<SvXMLNamespaceMap> m_pOldNamespaceMap;
public:
- Context(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ Context(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: m_rParser(rParser)
, m_pOldNamespaceMap(std::move(pOldNamespaceMap))
{
@@ -66,8 +66,8 @@ class OOXMLSecParser::UnknownContext
: public OOXMLSecParser::Context
{
public:
- UnknownContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ UnknownContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -105,8 +105,8 @@ class OOXMLSecParser::ReferencedContextImpl
bool m_isReferenced;
public:
- ReferencedContextImpl(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ ReferencedContextImpl(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_isReferenced(isReferenced)
@@ -131,9 +131,9 @@ class OOXMLSecParser::DsX509CertificateContext
OUString & m_rValue;
public:
- DsX509CertificateContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509CertificateContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -152,9 +152,9 @@ class OOXMLSecParser::DsX509SerialNumberContext
OUString & m_rValue;
public:
- DsX509SerialNumberContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509SerialNumberContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -173,9 +173,9 @@ class OOXMLSecParser::DsX509IssuerNameContext
OUString & m_rValue;
public:
- DsX509IssuerNameContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ DsX509IssuerNameContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -195,9 +195,9 @@ class OOXMLSecParser::DsX509IssuerSerialContext
OUString & m_rX509SerialNumber;
public:
- DsX509IssuerSerialContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rIssuerName, OUString & rSerialNumber)
+ DsX509IssuerSerialContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rIssuerName, OUString& rSerialNumber)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rX509IssuerName(rIssuerName)
, m_rX509SerialNumber(rSerialNumber)
@@ -232,8 +232,8 @@ class OOXMLSecParser::DsX509DataContext
std::vector<OUString> m_X509Certificates;
public:
- DsX509DataContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsX509DataContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -266,8 +266,8 @@ class OOXMLSecParser::DsKeyInfoContext
: public OOXMLSecParser::Context
{
public:
- DsKeyInfoContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsKeyInfoContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -302,8 +302,8 @@ class OOXMLSecParser::DsSignatureValueContext
OUString m_Value;
public:
- DsSignatureValueContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureValueContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -359,9 +359,9 @@ class OOXMLSecParser::DsDigestMethodContext
sal_Int32 & m_rReferenceDigestID;
public:
- DsDigestMethodContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- sal_Int32 & rReferenceDigestID)
+ DsDigestMethodContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ sal_Int32& rReferenceDigestID)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rReferenceDigestID(rReferenceDigestID)
{
@@ -398,9 +398,9 @@ class OOXMLSecParser::DsTransformContext
bool & m_rIsC14N;
public:
- DsTransformContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- bool & rIsC14N)
+ DsTransformContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ bool& rIsC14N)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rIsC14N(rIsC14N)
{
@@ -425,9 +425,9 @@ class OOXMLSecParser::DsTransformsContext
bool & m_rIsC14N;
public:
- DsTransformsContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- bool & rIsC14N)
+ DsTransformsContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ bool& rIsC14N)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rIsC14N(rIsC14N)
{
@@ -458,8 +458,8 @@ class OOXMLSecParser::DsReferenceContext
sal_Int32 m_nReferenceDigestID = css::xml::crypto::DigestID::SHA256;
public:
- DsReferenceContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsReferenceContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -526,8 +526,8 @@ class OOXMLSecParser::DsSignatureMethodContext
: public OOXMLSecParser::Context
{
public:
- DsSignatureMethodContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureMethodContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -548,8 +548,8 @@ class OOXMLSecParser::DsSignedInfoContext
: public OOXMLSecParser::Context
{
public:
- DsSignedInfoContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignedInfoContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
@@ -590,9 +590,9 @@ class OOXMLSecParser::XadesCertDigestContext
sal_Int32 & m_rReferenceDigestID;
public:
- XadesCertDigestContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rDigestValue, sal_Int32 & rReferenceDigestID)
+ XadesCertDigestContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rDigestValue, sal_Int32& rReferenceDigestID)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rDigestValue(rDigestValue)
, m_rReferenceDigestID(rReferenceDigestID)
@@ -625,8 +625,8 @@ class OOXMLSecParser::XadesCertContext
OUString m_X509SerialNumber;
public:
- XadesCertContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesCertContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -664,8 +664,8 @@ class OOXMLSecParser::XadesSigningCertificateContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- XadesSigningCertificateContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSigningCertificateContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -690,8 +690,8 @@ class OOXMLSecParser::XadesSigningTimeContext
OUString m_Value;
public:
- XadesSigningTimeContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSigningTimeContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -719,8 +719,8 @@ class OOXMLSecParser::XadesSignedSignaturePropertiesContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- XadesSignedSignaturePropertiesContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSignedSignaturePropertiesContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -753,8 +753,8 @@ class OOXMLSecParser::XadesSignedPropertiesContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- XadesSignedPropertiesContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesSignedPropertiesContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -783,8 +783,8 @@ class OOXMLSecParser::XadesQualifyingPropertiesContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- XadesQualifyingPropertiesContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ XadesQualifyingPropertiesContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -816,9 +816,9 @@ class OOXMLSecParser::MsodigsigSetupIDContext
OUString & m_rValue;
public:
- MsodigsigSetupIDContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ MsodigsigSetupIDContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -837,9 +837,9 @@ class OOXMLSecParser::MsodigsigSignatureCommentsContext
OUString & m_rValue;
public:
- MsodigsigSignatureCommentsContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ MsodigsigSignatureCommentsContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -859,8 +859,8 @@ class OOXMLSecParser::MsodigsigSignatureInfoV1Context
OUString m_SignatureComments;
public:
- MsodigsigSignatureInfoV1Context(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ MsodigsigSignatureInfoV1Context(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -915,9 +915,9 @@ class OOXMLSecParser::MdssiValueContext
OUString & m_rValue;
public:
- MdssiValueContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ MdssiValueContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -936,9 +936,9 @@ class OOXMLSecParser::MdssiSignatureTimeContext
OUString & m_rValue;
public:
- MdssiSignatureTimeContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
- OUString & rValue)
+ MdssiSignatureTimeContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
+ OUString& rValue)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
, m_rValue(rValue)
{
@@ -967,8 +967,8 @@ class OOXMLSecParser::DsSignaturePropertyContext
OUString m_Value;
public:
- DsSignaturePropertyContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ DsSignaturePropertyContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1023,8 +1023,8 @@ class OOXMLSecParser::DsSignaturePropertiesContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- DsSignaturePropertiesContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ DsSignaturePropertiesContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1052,8 +1052,8 @@ class OOXMLSecParser::DsManifestContext
: public OOXMLSecParser::ReferencedContextImpl
{
public:
- DsManifestContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap,
+ DsManifestContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap,
bool const isReferenced)
: ReferencedContextImpl(rParser, std::move(pOldNamespaceMap),
isReferenced)
{
@@ -1094,8 +1094,8 @@ class OOXMLSecParser::DsObjectContext
OUString m_Value;
public:
- DsObjectContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsObjectContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
// init with "false" here - the Signature element can't be
referenced by its child
: OOXMLSecParser::ReferencedContextImpl(rParser,
std::move(pOldNamespaceMap), false)
{
@@ -1173,8 +1173,8 @@ class OOXMLSecParser::DsSignatureContext
: public OOXMLSecParser::Context
{
public:
- DsSignatureContext(OOXMLSecParser & rParser,
- std::optional<SvXMLNamespaceMap> pOldNamespaceMap)
+ DsSignatureContext(OOXMLSecParser& rParser,
+ std::optional<SvXMLNamespaceMap>&& pOldNamespaceMap)
: OOXMLSecParser::Context(rParser, std::move(pOldNamespaceMap))
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
