diff options
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/qa/cppunit/xmlimport.cxx | 29 | ||||
| -rw-r--r-- | sax/source/fastparser/legacyfastparser.cxx | 8 |
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 ) { |