diff options
Diffstat (limited to 'xmloff/source/core')
| -rw-r--r-- | xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 22 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 2293e726399d..3255e2e6fdbf 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XModifiable2.hpp> @@ -169,7 +173,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( } OUString sClass; - static OUStringLiteral const prefixes[] = { + static std::u16string_view const prefixes[] = { u"application/vnd.oasis.openoffice.", u"application/x-vnd.oasis.openoffice.", u"application/vnd.oasis.opendocument.", @@ -184,15 +188,15 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( if( !sClass.isEmpty() ) { - static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService; + static struct { XMLTokenEnum eClass; std::u16string_view sFilterService; } const aServiceMap[] = { - { XML_TEXT, OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) }, - { XML_ONLINE_TEXT, OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) }, - { XML_SPREADSHEET, OUStringLiteral(u"" XML_IMPORT_FILTER_CALC) }, - { XML_DRAWING, OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) }, - { XML_GRAPHICS, OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) }, - { XML_PRESENTATION, OUStringLiteral(u"" XML_IMPORT_FILTER_IMPRESS) }, - { XML_CHART, OUStringLiteral(u"" XML_IMPORT_FILTER_CHART) }}; + { XML_TEXT, std::u16string_view(u"" XML_IMPORT_FILTER_WRITER) }, + { XML_ONLINE_TEXT, std::u16string_view(u"" XML_IMPORT_FILTER_WRITER) }, + { XML_SPREADSHEET, std::u16string_view(u"" XML_IMPORT_FILTER_CALC) }, + { XML_DRAWING, std::u16string_view(u"" XML_IMPORT_FILTER_DRAW) }, + { XML_GRAPHICS, std::u16string_view(u"" XML_IMPORT_FILTER_DRAW) }, + { XML_PRESENTATION, std::u16string_view(u"" XML_IMPORT_FILTER_IMPRESS) }, + { XML_CHART, std::u16string_view(u"" XML_IMPORT_FILTER_CHART) }}; for (auto const & entry: aServiceMap) { if( IsXMLToken( sClass, entry.eClass ) ) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 0a289c6e9fc5..2aeda90fc229 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -85,8 +85,6 @@ using namespace ::xmloff::token; rtl::Reference< FastTokenHandler > SvXMLImport::xTokenHandler( new FastTokenHandler() ); std::unordered_map< sal_Int32, std::pair< OUString, OUString > > SvXMLImport::aNamespaceMap; std::unordered_map< OUString, OUString > SvXMLImport::aNamespaceURIPrefixMap; -const OUStringLiteral SvXMLImport::aDefaultNamespace = u""; -const OUStringLiteral SvXMLImport::aNamespaceSeparator = u":"; bool SvXMLImport::bIsNSMapsInitialized = false; namespace { |