summaryrefslogtreecommitdiff
path: root/sax
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-06 10:55:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-13 08:16:03 +0200
commit3457da6abe0fd03efd19442e9790fbd1aa04c160 (patch)
treea7a2d5b51839b200e7cda79af863dce7a04d3a10 /sax
parent47196637a41ddfc9a8707771b1b9f482fd72c3b6 (diff)
loplugin:stringstatic also look for local statics
Add some API to O*StringLiteral, to make it easier to use in some places that were using O*String Change-Id: I1fb93bd47ac2065c9220d509aad3f4320326d99e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100270 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax')
-rw-r--r--sax/qa/cppunit/xmlimport.cxx29
-rw-r--r--sax/source/fastparser/legacyfastparser.cxx8
2 files changed, 22 insertions, 15 deletions
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 449c9ef3b38c..076caefd8740 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -254,9 +254,9 @@ void SAL_CALL NSDocumentHandler::startElement( const OUString& aName, const Refe
class DummyTokenHandler : public sax_fastparser::FastTokenHandlerBase
{
public:
- const static OString tokens[];
+ const static OStringLiteral tokens[];
const static OUStringLiteral namespaceURIs[];
- const static OString namespacePrefixes[];
+ const static OStringLiteral namespacePrefixes[];
// XFastTokenHandler
virtual Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) override;
@@ -265,15 +265,22 @@ public:
virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
};
-const OString DummyTokenHandler::tokens[] = { "Signature", "CanonicalizationMethod", "Algorithm", "Type",
- "DigestMethod", "Reference", "document",
- "spacing", "Player", "Height" };
-
-const OUStringLiteral DummyTokenHandler::namespaceURIs[] = { "http://www.w3.org/2000/09/xmldsig#",
- "http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
- "xyzsports.com/players/football/" };
-
-const OString DummyTokenHandler::namespacePrefixes[] = { "", "w", "Player" };
+const OStringLiteral DummyTokenHandler::tokens[] = {
+ OStringLiteral("Signature"), OStringLiteral("CanonicalizationMethod"),
+ OStringLiteral("Algorithm"), OStringLiteral("Type"),
+ OStringLiteral("DigestMethod"), OStringLiteral("Reference"),
+ OStringLiteral("document"), OStringLiteral("spacing"),
+ OStringLiteral("Player"), OStringLiteral("Height") };
+
+const OUStringLiteral DummyTokenHandler::namespaceURIs[] = {
+ "http://www.w3.org/2000/09/xmldsig#",
+ "http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
+ "xyzsports.com/players/football/" };
+
+const OStringLiteral DummyTokenHandler::namespacePrefixes[] = {
+ OStringLiteral(""),
+ OStringLiteral("w"),
+ OStringLiteral("Player") };
Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( sal_Int32 nToken )
{
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index bb1045970e73..8f57d04a1034 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -131,8 +131,8 @@ private:
OUString getNamespacePrefixFromToken( sal_Int32 nToken );
OUString getNameFromToken( sal_Int32 nToken );
- static const OUString aDefaultNamespace;
- static const OUString aNamespaceSeparator;
+ static const OUStringLiteral aDefaultNamespace;
+ static const OUStringLiteral aNamespaceSeparator;
public:
CallbackDocumentHandler( Reference< XDocumentHandler > const & xDocumentHandler,
@@ -156,8 +156,8 @@ public:
};
-const OUString CallbackDocumentHandler::aDefaultNamespace = OUString("");
-const OUString CallbackDocumentHandler::aNamespaceSeparator = OUString(":");
+const OUStringLiteral CallbackDocumentHandler::aDefaultNamespace = "";
+const OUStringLiteral CallbackDocumentHandler::aNamespaceSeparator = ":";
OUString CallbackDocumentHandler::getNamespacePrefixFromToken( sal_Int32 nToken )
{