diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx index 97a19ef8da68..10311ef8176e 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx @@ -74,7 +74,7 @@ CPPUNIT_TEST_FIXTURE(Test, testNumberingRestartStyleParent) uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); uno::Reference xPara; - static constexpr OUStringLiteral aProp(u"ListLabelString"); + static constexpr OUString aProp(u"ListLabelString"_ustr); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("A."), xPara->getPropertyValue(aProp).get()); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index fd27e92510d5..24071c73d1ea 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -799,7 +799,7 @@ void DomainMapper_Impl::RemoveLastParagraph( ) return; uno::Reference xDocProps(GetTextDocument(), uno::UNO_QUERY_THROW); - static constexpr OUStringLiteral RecordChanges(u"RecordChanges"); + static constexpr OUString RecordChanges(u"RecordChanges"_ustr); comphelper::ScopeGuard redlineRestore( [xDocProps, aPreviousValue = xDocProps->getPropertyValue(RecordChanges)]() @@ -4713,7 +4713,7 @@ static sal_Int16 lcl_ParseNumberingType( std::u16string_view rCommand ) // The command looks like: " PAGE \* Arabic " // tdf#132185: but may as well be "PAGE \* Arabic" OUString sNumber; - constexpr OUStringLiteral rSeparator(u"\\* "); + constexpr OUString rSeparator(u"\\* "_ustr); if (size_t nStartIndex = rCommand.find(rSeparator); nStartIndex != std::u16string_view::npos) { sal_Int32 nStartIndex2 = nStartIndex + rSeparator.getLength(); @@ -6299,9 +6299,9 @@ static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks( bool std::vector aNewLevel; aNewLevel.reserve(aLevel.getLength() + 5); // at most 5 added items - static constexpr OUStringLiteral tokType(u"TokenType"); - static constexpr OUStringLiteral tokHStart(u"TokenHyperlinkStart"); - static constexpr OUStringLiteral tokHEnd(u"TokenHyperlinkEnd"); + static constexpr OUString tokType(u"TokenType"_ustr); + static constexpr OUString tokHStart(u"TokenHyperlinkStart"_ustr); + static constexpr OUString tokHEnd(u"TokenHyperlinkEnd"_ustr); static constexpr OUStringLiteral tokPNum(u"TokenPageNumber"); static constexpr OUStringLiteral tokENum(u"TokenEntryNumber"); diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 751b96db385b..40f5d703815e 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -92,7 +92,7 @@ uno::Reference const & FormControlHelper::FormControlHelper_Impl::g if (xFormsSupplier.is()) { uno::Reference xFormsNamedContainer(xFormsSupplier->getForms()); - static constexpr OUStringLiteral sDOCXForm = u"DOCX-Standard"; + static constexpr OUString sDOCXForm = u"DOCX-Standard"_ustr; OUString sFormName(sDOCXForm); sal_uInt16 nUnique = 0; diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index 2a3deb5d0e87..35d7efbbfee2 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -71,7 +71,7 @@ OUString lclGetNameForElementId(sal_uInt32 aId) return aIdMap[aId]; } -constexpr OUStringLiteral constAttributesSequenceName = u"attributes"; +constexpr OUString constAttributesSequenceName = u"attributes"_ustr; } diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 26d8100f7e2b..1d1fee55a809 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -619,11 +619,11 @@ const char sStylesTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/rela const char sFonttableTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/fontTable"; const char sWebSettingsStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/webSettings"; -constexpr OUStringLiteral sId = u"Id"; +constexpr OUString sId = u"Id"_ustr; constexpr OUStringLiteral sType = u"Type"; -constexpr OUStringLiteral sTarget = u"Target"; +constexpr OUString sTarget = u"Target"_ustr; constexpr OUStringLiteral sTargetMode = u"TargetMode"; -constexpr OUStringLiteral sContentType = u"_contentType"; +constexpr OUString sContentType = u"_contentType"_ustr; constexpr OUStringLiteral sRelDom = u"_relDom"; constexpr OUStringLiteral sSettingsContentType = u"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"; constexpr OUStringLiteral sStylesContentType = u"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 0db3eee44304..aa2567ad53b2 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -136,17 +136,17 @@ bool OOXMLStreamImpl::lcl_getTarget(const uno::Reference