loplugin:ostr in linguistic

Change-Id: Iebc2db1c5750a8cea835722c396d6f708fe6e0be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167426
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

12 files changed, 62 insertions, 62 deletions

diff --git a/linguistic/qa/restprotocol.cxx b/linguistic/qa/restprotocol.cxx
index d5783d0a90a3..6a3d2c150ae7 100644
--- a/linguistic/qa/restprotocol.cxx
+++ b/linguistic/qa/restprotocol.cxx
@@ -35,7 +35,7 @@ class MockServerThread : public ::osl::Thread
 {
 public:
     MockServerThread()
-        : m_aSocketAddr("localhost", 2022)
+        : m_aSocketAddr(u"localhost"_ustr, 2022)
     {
     }
 
@@ -137,7 +137,7 @@ private:
 
 void TestRestProtocol::testProofreading()
 {
-    css::lang::Locale aLocale("en", "US", "");
+    css::lang::Locale aLocale(u"en"_ustr, u"US"_ustr, u""_ustr);
     using LanguageToolCfg = officecfg::Office::Linguistic::GrammarChecking::LanguageTool;
     auto batch(comphelper::ConfigurationChanges::create());
 
@@ -150,14 +150,14 @@ void TestRestProtocol::testProofreading()
 
     batch->commit();
 
-    CPPUNIT_ASSERT_EQUAL(OUString("duden"), *LanguageToolCfg::RestProtocol::get());
+    CPPUNIT_ASSERT_EQUAL(u"duden"_ustr, *LanguageToolCfg::RestProtocol::get());
 
     Reference<::com::sun::star::linguistic2::XProofreader> xProofreader(
-        m_xSFactory->createInstance("com.sun.star.linguistic2.Proofreader"), UNO_QUERY);
+        m_xSFactory->createInstance(u"com.sun.star.linguistic2.Proofreader"_ustr), UNO_QUERY);
     CPPUNIT_ASSERT(xProofreader.is());
 
     com::sun::star::linguistic2::ProofreadingResult aResult
-        = xProofreader->doProofreading("id", "ths is a tst", aLocale, 0, 0, {});
+        = xProofreader->doProofreading(u"id"_ustr, u"ths is a tst"_ustr, aLocale, 0, 0, {});
 
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aResult.aErrors.getLength());
 }
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index f204cfad0f45..8ec888e38660 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -566,7 +566,7 @@ void SAL_CALL ConvDic::removeFlushListener(
 
 OUString SAL_CALL ConvDic::getImplementationName(  )
 {
-    return "com.sun.star.lingu2.ConvDic";
+    return u"com.sun.star.lingu2.ConvDic"_ustr;
 }
 
 sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index a051fb71a4c0..3fa5cdc07081 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -253,7 +253,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
             ::ucbhelper::Content    aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
                                     uno::Reference< css::ucb::XCommandEnvironment >(),
                                     comphelper::getProcessComponentContext() );
-            aCnt.executeCommand( "delete", Any( true ) );
+            aCnt.executeCommand( u"delete"_ustr, Any( true ) );
         }
         catch( ... )
         {
@@ -515,7 +515,7 @@ void SAL_CALL ConvDicList::removeEventListener(
 
 OUString SAL_CALL ConvDicList::getImplementationName()
 {
-    return "com.sun.star.lingu2.ConvDicList";
+    return u"com.sun.star.lingu2.ConvDicList"_ustr;
 }
 
 sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName )
@@ -525,7 +525,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName )
 
 uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames()
 {
-    return { "com.sun.star.linguistic2.ConversionDictionaryList" };
+    return { u"com.sun.star.linguistic2.ConversionDictionaryList"_ustr };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index dd21122c0794..5fca39078e8f 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -253,7 +253,7 @@ bool ConvDicXMLExport::Export()
 
 ErrCode ConvDicXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass*/ )
 {
-    GetNamespaceMap_().Add( "tcd",
+    GetNamespaceMap_().Add( u"tcd"_ustr,
             XML_NAMESPACE_TCD_STRING, XML_NAMESPACE_TCD );
 
     GetDocHandler()->startDocument();
@@ -261,17 +261,17 @@ ErrCode ConvDicXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass
     // Add xmlns line and some other arguments
     AddAttribute( GetNamespaceMap_().GetAttrNameByKey( XML_NAMESPACE_TCD ),
                   GetNamespaceMap_().GetNameByKey( XML_NAMESPACE_TCD ) );
-    AddAttribute( XML_NAMESPACE_TCD, "package", "org.openoffice.Office" );
+    AddAttribute( XML_NAMESPACE_TCD, u"package"_ustr, u"org.openoffice.Office"_ustr );
 
     OUString aIsoLang( LanguageTag::convertToBcp47( rDic.nLanguage ) );
-    AddAttribute( XML_NAMESPACE_TCD, "lang", aIsoLang );
+    AddAttribute( XML_NAMESPACE_TCD, u"lang"_ustr, aIsoLang );
     OUString aConvType( ConversionTypeToText( rDic.nConversionType ) );
-    AddAttribute( XML_NAMESPACE_TCD, "conversion-type", aConvType );
+    AddAttribute( XML_NAMESPACE_TCD, u"conversion-type"_ustr, aConvType );
 
     //!! block necessary in order to have SvXMLElementExport d-tor called
     //!! before the call to endDocument
     {
-        SvXMLElementExport aRoot( *this, XML_NAMESPACE_TCD, "text-conversion-dictionary", true, true );
+        SvXMLElementExport aRoot( *this, XML_NAMESPACE_TCD, u"text-conversion-dictionary"_ustr, true, true );
         ExportContent_();
     }
 
@@ -291,7 +291,7 @@ void ConvDicXMLExport::ExportContent_()
 
     for (const OUString& aLeftText : aKeySet)
     {
-        AddAttribute( XML_NAMESPACE_TCD, "left-text", aLeftText );
+        AddAttribute( XML_NAMESPACE_TCD, u"left-text"_ustr, aLeftText );
         if (rDic.pConvPropType) // property-type list available?
         {
             sal_Int16 nPropertyType = -1;
@@ -301,10 +301,10 @@ void ConvDicXMLExport::ExportContent_()
             DBG_ASSERT( nPropertyType, "property-type not found" );
             if (nPropertyType == -1)
                 nPropertyType = ConversionPropertyType::NOT_DEFINED;
-            AddAttribute( XML_NAMESPACE_TCD, "property-type", OUString::number(  nPropertyType ) );
+            AddAttribute( XML_NAMESPACE_TCD, u"property-type"_ustr, OUString::number(  nPropertyType ) );
         }
         SvXMLElementExport aEntryMain( *this, XML_NAMESPACE_TCD,
-                "entry" , true, true );
+                u"entry"_ustr , true, true );
 
         std::pair< ConvMap::iterator, ConvMap::iterator > aRange =
                 rDic.aFromLeft.equal_range(aLeftText);
@@ -313,7 +313,7 @@ void ConvDicXMLExport::ExportContent_()
             DBG_ASSERT( aLeftText == (*aIt).first, "key <-> entry mismatch" );
             OUString aRightText( (*aIt).second );
             SvXMLElementExport aEntryRightText( *this, XML_NAMESPACE_TCD,
-                    "right-text" , true, false );
+                    u"right-text"_ustr , true, false );
             Characters( aRightText );
         }
     }
@@ -321,7 +321,7 @@ void ConvDicXMLExport::ExportContent_()
 
     //!!  see comment for pDic member
 ConvDicXMLImport::ConvDicXMLImport( ConvDic *pConvDic ) :
-    SvXMLImport ( comphelper::getProcessComponentContext(), "com.sun.star.lingu2.ConvDicXMLImport", SvXMLImportFlags::ALL ),
+    SvXMLImport ( comphelper::getProcessComponentContext(), u"com.sun.star.lingu2.ConvDicXMLImport"_ustr, SvXMLImportFlags::ALL ),
     pDic        ( pConvDic ), nLanguage(LANGUAGE_NONE), nConversionType(-1)
 {
     GetNamespaceMap().Add( GetXMLToken(XML_NP_TCD), GetXMLToken(XML_N_TCD), XML_NAMESPACE_TCD);
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 1eca995c151a..98e077fd00a2 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -45,7 +45,7 @@ public:
     ConvDicXMLExport( ConvDic &rConvDic,
         const OUString &rFileName,
         css::uno::Reference< css::xml::sax::XDocumentHandler > const &rHandler) :
-        SvXMLExport ( comphelper::getProcessComponentContext(), "com.sun.star.lingu2.ConvDicXMLExport", rFileName,
+        SvXMLExport ( comphelper::getProcessComponentContext(), u"com.sun.star.lingu2.ConvDicXMLExport"_ustr, rFileName,
                       css::util::MeasureUnit::CM, rHandler ),
         rDic        ( rConvDic ),
         bSuccess    ( false )
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index ba39271eee0c..fe8b2e2a878c 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -281,7 +281,7 @@ void DicList::SearchForDictionaries(
     {
         LanguageType nLang = LANGUAGE_NONE;
         bool         bNeg  = false;
-        OUString     aDicTitle = "";
+        OUString     aDicTitle = u""_ustr;
 
         if(!::IsVers2OrNewer( aURL, nLang, bNeg, aDicTitle ))
         {
@@ -588,7 +588,7 @@ void DicList::CreateDicList()
     // create IgnoreAllList dictionary with empty URL (non persistent)
     // and add it to list
     const LanguageTag tag = comphelper::LibreOfficeKit::isActive()
-                                ? LanguageTag("en-US")
+                                ? LanguageTag(u"en-US"_ustr)
                                 : SvtSysLocale().GetUILanguageTag();
     std::locale loc(Translate::Create("svt", tag));
     uno::Reference< XDictionary > xIgnAll(
@@ -661,7 +661,7 @@ void DicList::SaveDics()
 
 OUString SAL_CALL DicList::getImplementationName(  )
 {
-    return "com.sun.star.lingu2.DicList";
+    return u"com.sun.star.lingu2.DicList"_ustr;
 }
 
 
@@ -672,7 +672,7 @@ sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName )
 
 uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames(  )
 {
-    return { "com.sun.star.linguistic2.DictionaryList" };
+    return { u"com.sun.star.linguistic2.DictionaryList"_ustr };
 }
 
 
@@ -718,7 +718,7 @@ static void AddInternal(
         return;
 
     //! TL TODO: word iterator should be used to break up the text
-    OUString aDelim("!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n");
+    OUString aDelim(u"!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n"_ustr);
     OSL_ENSURE(aDelim.indexOf(u'.') == -1,
         "ensure no '.'");
 
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index ad85bab95953..f619638f4767 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -602,10 +602,10 @@ lcl_makeProperties(uno::Reference<text::XFlatParagraph> const& xFlatPara, sal_In
             xFlatPara, uno::UNO_QUERY_THROW);
     css::uno::Any a (nProofInfo);
     return comphelper::InitPropertySequence({
-        { "FieldPositions", xProps->getPropertyValue("FieldPositions") },
-        { "FootnotePositions", xProps->getPropertyValue("FootnotePositions") },
-        { "SortedTextId", xProps->getPropertyValue("SortedTextId") },
-        { "DocumentElementsCount", xProps->getPropertyValue("DocumentElementsCount") },
+        { "FieldPositions", xProps->getPropertyValue(u"FieldPositions"_ustr) },
+        { "FootnotePositions", xProps->getPropertyValue(u"FootnotePositions"_ustr) },
+        { "SortedTextId", xProps->getPropertyValue(u"SortedTextId"_ustr) },
+        { "DocumentElementsCount", xProps->getPropertyValue(u"DocumentElementsCount"_ustr) },
         { "ProofInfo", a }
     });
 }
@@ -1098,11 +1098,11 @@ uno::Reference< util::XChangesBatch > const & GrammarCheckingIterator::GetUpdate
             // get configuration update access
             beans::PropertyValue aValue;
             aValue.Name  = "nodepath";
-            aValue.Value <<= OUString("org.openoffice.Office.Linguistic/ServiceManager");
+            aValue.Value <<= u"org.openoffice.Office.Linguistic/ServiceManager"_ustr;
             uno::Sequence< uno::Any > aProps{ uno::Any(aValue) };
             m_xUpdateAccess.set(
                     xConfigurationProvider->createInstanceWithArguments(
-                        "com.sun.star.configuration.ConfigurationUpdateAccess", aProps ),
+                        u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr, aProps ),
                         uno::UNO_QUERY_THROW );
         }
         catch (uno::Exception &)
@@ -1122,7 +1122,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
     {
         // get node names (locale iso strings) for configured grammar checkers
         uno::Reference< container::XNameAccess > xNA( GetUpdateAccess(), uno::UNO_QUERY_THROW );
-        xNA.set( xNA->getByName( "GrammarCheckerList" ), uno::UNO_QUERY_THROW );
+        xNA.set( xNA->getByName( u"GrammarCheckerList"_ustr ), uno::UNO_QUERY_THROW );
         const uno::Sequence< OUString > aElementNames( xNA->getElementNames() );
 
         for (const OUString& rElementName : aElementNames)
@@ -1167,13 +1167,13 @@ sal_Bool SAL_CALL GrammarCheckingIterator::supportsService(
 
 OUString SAL_CALL GrammarCheckingIterator::getImplementationName(  )
 {
-    return "com.sun.star.lingu2.ProofreadingIterator";
+    return u"com.sun.star.lingu2.ProofreadingIterator"_ustr;
 }
 
 
 uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames(  )
 {
-    return  { "com.sun.star.linguistic2.ProofreadingIterator" };
+    return  { u"com.sun.star.linguistic2.ProofreadingIterator"_ustr };
 }
 
 
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 8752bbb046ea..23df18e0269a 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -99,7 +99,7 @@ void SAL_CALL HHConvDic::addEntry(
 
 OUString SAL_CALL HHConvDic::getImplementationName(  )
 {
-    return "com.sun.star.lingu2.HHConvDic";
+    return u"com.sun.star.lingu2.HHConvDic"_ustr;
 }
 
 
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 0ecf4d455a53..6f70aae74724 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -91,7 +91,7 @@ struct WID_Name
 //! since the WID is used as index in this table!
 WID_Name const aWID_Name[] =
 {
-    { 0,                                  "" },
+    { 0,                                  u""_ustr },
     { UPH_IS_USE_DICTIONARY_LIST,         UPN_IS_USE_DICTIONARY_LIST },
     { UPH_IS_IGNORE_CONTROL_CHARACTERS,   UPN_IS_IGNORE_CONTROL_CHARACTERS },
     { UPH_IS_SPELL_UPPER_CASE,            UPN_IS_SPELL_UPPER_CASE },
@@ -101,16 +101,16 @@ WID_Name const aWID_Name[] =
     { UPH_HYPH_MIN_WORD_LENGTH,           UPN_HYPH_MIN_WORD_LENGTH },
     { UPH_DEFAULT_LOCALE,                 UPN_DEFAULT_LOCALE },
     { UPH_IS_SPELL_AUTO,                  UPN_IS_SPELL_AUTO },
-    { 0,                                  "" },
-    { 0,                                  "" },
+    { 0,                                  u""_ustr },
+    { 0,                                  u""_ustr },
     { UPH_IS_SPELL_SPECIAL,               UPN_IS_SPELL_SPECIAL },
     { UPH_IS_HYPH_AUTO,                   UPN_IS_HYPH_AUTO },
     { UPH_IS_HYPH_SPECIAL,                UPN_IS_HYPH_SPECIAL },
     { UPH_IS_WRAP_REVERSE,                UPN_IS_WRAP_REVERSE },
-    { 0,                                  "" },
-    { 0,                                  "" },
-    { 0,                                  "" },
-    { 0,                                  "" },
+    { 0,                                  u""_ustr },
+    { 0,                                  u""_ustr },
+    { 0,                                  u""_ustr },
+    { 0,                                  u""_ustr },
     { UPH_DEFAULT_LANGUAGE,               UPN_DEFAULT_LANGUAGE },
     { UPH_DEFAULT_LOCALE_CJK,             UPN_DEFAULT_LOCALE_CJK },
     { UPH_DEFAULT_LOCALE_CTL,             UPN_DEFAULT_LOCALE_CTL },
@@ -369,7 +369,7 @@ void SAL_CALL
 // XServiceInfo
 OUString SAL_CALL LinguProps::getImplementationName()
 {
-    return "com.sun.star.lingu2.LinguProps";
+    return u"com.sun.star.lingu2.LinguProps"_ustr;
 }
 
 // XServiceInfo
@@ -381,7 +381,7 @@ sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName )
 // XServiceInfo
 uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames()
 {
-    return { "com.sun.star.linguistic2.LinguProperties" };
+    return { u"com.sun.star.linguistic2.LinguProperties"_ustr };
 }
 
 bool LinguProps::getPropertyBool(const OUString& aPropertyName)
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 62886e587d92..62b13bb47964 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -122,7 +122,7 @@ public:
     virtual sal_Bool SAL_CALL getIsSpellCapitalization() override
         { return false; }
     virtual void SAL_CALL setIsSpellCapitalization(sal_Bool /*p1*/) override
-        { throw new css::beans::UnknownPropertyException( "this deprecated property has been removed"); }
+        { throw new css::beans::UnknownPropertyException( u"this deprecated property has been removed"_ustr); }
     virtual sal_Int16 SAL_CALL getHyphMinLeading() override
         { return getPropertyInt16(UPN_HYPH_MIN_LEADING); }
     virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) override
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index bb503360fbdf..5f990100d853 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -396,7 +396,7 @@ void LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
 
 
 LngSvcMgr::LngSvcMgr()
-    : utl::ConfigItem("Office.Linguistic")
+    : utl::ConfigItem(u"Office.Linguistic"_ustr)
     , aEvtListeners(GetLinguMutex())
     , aUpdateIdle("LngSvcMgr aUpdateIdle")
 {
@@ -404,10 +404,10 @@ LngSvcMgr::LngSvcMgr()
 
     // request notify events when properties (i.e. something in the subtree) changes
     uno::Sequence< OUString > aNames{
-        "ServiceManager/SpellCheckerList",
-        "ServiceManager/GrammarCheckerList",
-        "ServiceManager/HyphenatorList",
-        "ServiceManager/ThesaurusList"
+        u"ServiceManager/SpellCheckerList"_ustr,
+        u"ServiceManager/GrammarCheckerList"_ustr,
+        u"ServiceManager/HyphenatorList"_ustr,
+        u"ServiceManager/ThesaurusList"_ustr
     };
     EnableNotification( aNames );
 
@@ -1152,7 +1152,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
 {
     SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" );
 
-    OUString aNode("ServiceManager/SpellCheckerList");
+    OUString aNode(u"ServiceManager/SpellCheckerList"_ustr);
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
 
     // append path prefix need for 'GetProperties' call below
@@ -1185,7 +1185,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
 {
     SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" );
 
-    OUString aNode("ServiceManager/GrammarCheckerList");
+    OUString aNode(u"ServiceManager/GrammarCheckerList"_ustr);
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
 
     // append path prefix need for 'GetProperties' call below
@@ -1222,7 +1222,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
 {
     SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" );
 
-    OUString aNode("ServiceManager/HyphenatorList");
+    OUString aNode(u"ServiceManager/HyphenatorList"_ustr);
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
 
     // append path prefix need for 'GetProperties' call below
@@ -1259,7 +1259,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
 {
     SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" );
 
-    OUString aNode("ServiceManager/ThesaurusList");
+    OUString aNode(u"ServiceManager/ThesaurusList"_ustr);
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
 
     // append path prefix need for 'GetProperties' call below
@@ -1703,7 +1703,7 @@ uno::Sequence< OUString > SAL_CALL
     OUString *pNames = aNames.getArray();
     if ( rServiceName == SN_SPELLCHECKER )
     {
-        OUString aNode( "ServiceManager/SpellCheckerList");
+        OUString aNode( u"ServiceManager/SpellCheckerList"_ustr);
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1715,7 +1715,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( rServiceName == SN_GRAMMARCHECKER )
     {
-        OUString aNode( "ServiceManager/GrammarCheckerList");
+        OUString aNode( u"ServiceManager/GrammarCheckerList"_ustr);
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1727,7 +1727,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( rServiceName == SN_HYPHENATOR )
     {
-        OUString aNode( "ServiceManager/HyphenatorList");
+        OUString aNode( u"ServiceManager/HyphenatorList"_ustr);
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1739,7 +1739,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( rServiceName == SN_THESAURUS )
     {
-        OUString aNode( "ServiceManager/ThesaurusList");
+        OUString aNode( u"ServiceManager/ThesaurusList"_ustr);
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1814,7 +1814,7 @@ bool LngSvcMgr::AddLngSvcEvtBroadcaster(
 OUString SAL_CALL
     LngSvcMgr::getImplementationName()
 {
-    return "com.sun.star.lingu2.LngSvcMgr";
+    return u"com.sun.star.lingu2.LngSvcMgr"_ustr;
 }
 
 
@@ -1828,7 +1828,7 @@ sal_Bool SAL_CALL
 uno::Sequence< OUString > SAL_CALL
     LngSvcMgr::getSupportedServiceNames()
 {
-    return { "com.sun.star.linguistic2.LinguServiceManager" };
+    return { u"com.sun.star.linguistic2.LinguServiceManager"_ustr };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index f80a849116eb..87e9fa397b9b 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -399,7 +399,7 @@ bool    IsReadOnly( const OUString &rURL, bool *pbExist )
             bExists = aContent.isDocument();
             if (bExists)
             {
-                Any aAny( aContent.getPropertyValue( "IsReadOnly" ) );
+                Any aAny( aContent.getPropertyValue( u"IsReadOnly"_ustr ) );
                 aAny >>= bRes;
             }
         }
@@ -693,7 +693,7 @@ uno::Reference< XDictionary > GetIgnoreAllList()
     if (xDL.is())
     {
         const LanguageTag tag = comphelper::LibreOfficeKit::isActive()
-                                    ? LanguageTag("en-US")
+                                    ? LanguageTag(u"en-US"_ustr)
                                     : SvtSysLocale().GetUILanguageTag();
         std::locale loc(Translate::Create("svt", tag));
         xRes = xDL->getDictionaryByName( Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) );