loplugin:ostr in xmlhelp

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

9 files changed, 59 insertions, 60 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 6d12041de9ec..5b1c1794186e 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -100,13 +100,13 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 // virtual
 OUString SAL_CALL Content::getImplementationName()
 {
-    return "CHelpContent";
+    return u"CHelpContent"_ustr;
 }
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 {
-    return { "com.sun.star.ucb.CHelpContent" };
+    return { u"com.sun.star.ucb.CHelpContent"_ustr };
 }
 
 // XContent methods.
@@ -334,8 +334,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         if ( rProp.Name == "ContentType" )
             xRow->appendString(
                 rProp,
-                OUString(
-                    "application/vnd.sun.star.help" ) );
+                u"application/vnd.sun.star.help"_ustr );
         else if ( rProp.Name == "Title" )
             xRow->appendString ( rProp,m_aURLParameter.get_title() );
         else if ( rProp.Name == "IsReadOnly" )
@@ -354,14 +353,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             if( m_aURLParameter.isActive() )
                 xRow->appendString(
                     rProp,
-                    OUString( "text/plain" ) );
+                    u"text/plain"_ustr );
             else if( m_aURLParameter.isFile() )
                 xRow->appendString(
-                    rProp,OUString( "text/html" ) );
+                    rProp,u"text/html"_ustr );
             else if( m_aURLParameter.isRoot() )
                 xRow->appendString(
                     rProp,
-                    OUString( "text/css" ) );
+                    u"text/css"_ustr );
             else
                 xRow->appendVoid( rProp );
         else if( m_aURLParameter.isModule() )
@@ -411,7 +410,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             }
             else if ( rProp.Name == "SearchScopes" )
             {
-                uno::Sequence< OUString > seq{ "Heading", "FullText" };
+                uno::Sequence< OUString > seq{ u"Heading"_ustr, u"FullText"_ustr };
                 xRow->appendObject( rProp, uno::Any(seq) );
             }
             else if ( rProp.Name == "Order" )
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index b18061e43474..840dd043db37 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -48,42 +48,42 @@ uno::Sequence< beans::Property > Content::getProperties(
     sal_Int32 idx = 0;
     pprops[idx++] =
         beans::Property(
-            "ContentType",
+            u"ContentType"_ustr,
             -1,
             cppu::UnoType<OUString>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     pprops[idx++] =
         beans::Property(
-            "IsReadOnly",
+            u"IsReadOnly"_ustr,
             -1,
             cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     pprops[idx++] =
         beans::Property(
-            "IsErrorDocument",
+            u"IsErrorDocument"_ustr,
             -1,
             cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     pprops[idx++] =
         beans::Property(
-            "IsDocument",
+            u"IsDocument"_ustr,
             -1,
             cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     pprops[idx++] =
         beans::Property(
-            "IsFolder",
+            u"IsFolder"_ustr,
             -1,
             cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     pprops[idx++] =
         beans::Property(
-            "Title",
+            u"Title"_ustr,
             -1,
             cppu::UnoType<OUString>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
@@ -91,7 +91,7 @@ uno::Sequence< beans::Property > Content::getProperties(
     if( withMediaType )
         pprops[idx++] =
             beans::Property(
-                "MediaType",
+                u"MediaType"_ustr,
                 -1,
                 cppu::UnoType<OUString>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
@@ -100,42 +100,42 @@ uno::Sequence< beans::Property > Content::getProperties(
     {
         pprops[idx++] =
             beans::Property(
-                "Order",
+                u"Order"_ustr,
                 -1,
                 cppu::UnoType<sal_Int32>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         pprops[idx++] =
             beans::Property(
-                "KeywordList",
+                u"KeywordList"_ustr,
                 -1,
                 cppu::UnoType<uno::Sequence< OUString >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         pprops[idx++] =
             beans::Property(
-                "KeywordRef",
+                u"KeywordRef"_ustr,
                 -1,
                 cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         pprops[idx++] =
             beans::Property(
-                "KeywordTitleForRef",
+                u"KeywordTitleForRef"_ustr,
                 -1,
                 cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         pprops[idx++] =
             beans::Property(
-                "KeywordAnchorForRef",
+                u"KeywordAnchorForRef"_ustr,
                 -1,
                 cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         pprops[idx++] =
             beans::Property(
-                "SearchScopes",
+                u"SearchScopes"_ustr,
                 -1,
                 cppu::UnoType<uno::Sequence< OUString >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
@@ -145,7 +145,7 @@ uno::Sequence< beans::Property > Content::getProperties(
     {
         pprops[idx++] =
             beans::Property(
-                "AnchorName",
+                u"AnchorName"_ustr,
                 -1,
                 cppu::UnoType<OUString>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
@@ -166,27 +166,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
     {
         // Required commands
         ucb::CommandInfo(
-            "getCommandInfo",
+            u"getCommandInfo"_ustr,
             -1,
             cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
-            "getPropertySetInfo",
+            u"getPropertySetInfo"_ustr,
             -1,
             cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
-            "getPropertyValues",
+            u"getPropertyValues"_ustr,
             -1,
             cppu::UnoType<uno::Sequence< beans::Property >>::get()
         ),
         ucb::CommandInfo(
-            "setPropertyValues",
+            u"setPropertyValues"_ustr,
             -1,
             cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
         ),
         ucb::CommandInfo(
-            "open",
+            u"open"_ustr,
             -1,
             cppu::UnoType<ucb::OpenCommandArgument2>::get()
         )
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 2f20a2d75a73..69fe80d78552 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -184,16 +184,16 @@ OString Databases::getImageTheme() const
     // set root path
     uno::Sequence<uno::Any> lParams(comphelper::InitAnyPropertySequence(
     {
-        {"nodepath", uno::Any(OUString("org.openoffice.Office.Common"))}
+        {"nodepath", uno::Any(u"org.openoffice.Office.Common"_ustr)}
     }));
 
     // open it
     uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
-                "com.sun.star.configuration.ConfigurationAccess",
+                u"com.sun.star.configuration.ConfigurationAccess"_ustr,
                 lParams) );
 
     uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW);
-    uno::Any aResult = xAccess->getByHierarchicalName("Misc/SymbolStyle");
+    uno::Any aResult = xAccess->getByHierarchicalName(u"Misc/SymbolStyle"_ustr);
     OUString aSymbolsStyleName;
     aResult >>= aSymbolsStyleName;
 
@@ -353,7 +353,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( std::u16strin
 
             const sal_Unicode* str = fileContent.getStr();
             OUString current,program,startid,title;
-            OUString order( "1" );
+            OUString order( u"1"_ustr );
 
             for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
             {
@@ -453,7 +453,7 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile(std::unique_lock<std::mutex>&
     if( Database.empty() || Language.isEmpty() )
         return nullptr;
 
-    OUString aFileExt( helpText ? OUString(".ht") : OUString(".db") );
+    OUString aFileExt( helpText ? u".ht"_ustr : u".db"_ustr );
     OUString dbFileName = OUString::Concat("/") + Database + aFileExt;
     OUString key;
     if( pExtensionPath == nullptr )
@@ -853,7 +853,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile(
 
             Reference< XInterface > xIfc
                 = m_xSMgr->createInstanceWithArgumentsAndContext(
-                    "com.sun.star.packages.comp.ZipPackage",
+                    u"com.sun.star.packages.comp.ZipPackage"_ustr,
                     aArguments, m_xContext );
 
             if ( xIfc.is() )
@@ -967,7 +967,7 @@ void Databases::cascadingStylesheet( const OUString& Language,
                 uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY );
                 if ( xVclWindowPeer.is() )
                 {
-                    uno::Any aHCMode = xVclWindowPeer->getProperty( "HighContrastMode" );
+                    uno::Any aHCMode = xVclWindowPeer->getProperty( u"HighContrastMode"_ustr );
                     if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
                     {
                         aCSS = "highcontrastblack";
@@ -1186,7 +1186,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
     }
     if( bRegistered )
     {
-        OUString aHelpMediaType( "application/vnd.sun.star.help" );
+        OUString aHelpMediaType( u"application/vnd.sun.star.help"_ustr );
         if( xPackage->isBundle() )
         {
             const Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle
@@ -1227,7 +1227,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
     {
         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
         m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions
-            ( "user", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+            ( u"user"_ustr, Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bUserPackagesLoaded = true;
     }
 
@@ -1255,7 +1255,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
     {
         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
         m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions
-            ( "shared", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+            ( u"shared"_ustr, Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bSharedPackagesLoaded = true;
     }
 
@@ -1283,7 +1283,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
     {
         Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
         m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions
-            ( "bundled", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+            ( u"bundled"_ustr, Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bBundledPackagesLoaded = true;
     }
 
@@ -1481,7 +1481,7 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( const Reference
     {
         OUString aRegDataUrl = optRegData.Value + "/";
 
-        OUString aHelpFilesBaseName("help");
+        OUString aHelpFilesBaseName(u"help"_ustr);
 
         OUString aUsedLanguage = m_aLanguage;
         pRetHdf = m_rDatabases.getHelpDataFile(
@@ -1666,14 +1666,14 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage(
         Sequence< Any > aArguments{
             Any(zipFile),
             // let ZipPackage be used ( no manifest.xml is required )
-            Any(comphelper::makePropertyValue("StorageFormat",
+            Any(comphelper::makePropertyValue(u"StorageFormat"_ustr,
                                               ZIP_STORAGE_FORMAT_STRING))
         };
 
         Reference< XMultiComponentFactory >xSMgr = m_xContext->getServiceManager();
         Reference< XInterface > xIfc
             = xSMgr->createInstanceWithArgumentsAndContext(
-                "com.sun.star.packages.comp.ZipPackage",
+                u"com.sun.star.packages.comp.ZipPackage"_ustr,
                 aArguments, m_xContext );
 
         if ( xIfc.is() )
@@ -1839,7 +1839,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
                     }
                 }
 
-                HelpIndexer aIndexer(aLang, "help", aLangURL, aZipDir);
+                HelpIndexer aIndexer(aLang, u"help"_ustr, aLangURL, aZipDir);
                 aIndexer.indexDocuments();
 
                 if( bIsWriteAccess )
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index 59c87cef40fc..30b2e1e2e4db 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -107,7 +107,7 @@ XInputStream_impl::skipBytes(
 {
     if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
     {
-        throw io::IOException("XInputStream_impl::skipBytes failed seek");
+        throw io::IOException(u"XInputStream_impl::skipBytes failed seek"_ustr);
     }
 }
 
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index eb28f5a9ca37..457dec5b71d7 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -57,7 +57,7 @@ ContentProvider::~ContentProvider()
 
 OUString SAL_CALL ContentProvider::getImplementationName()
 {
-    return "CHelpContentProvider";
+    return u"CHelpContentProvider"_ustr;
 }
 
 sal_Bool SAL_CALL
@@ -69,7 +69,7 @@ ContentProvider::supportsService(const OUString& ServiceName )
 uno::Sequence< OUString > SAL_CALL
 ContentProvider::getSupportedServiceNames()
 {
-    return { "com.sun.star.help.XMLHelp", "com.sun.star.ucb.HelpContentProvider" };
+    return { u"com.sun.star.help.XMLHelp"_ustr, u"com.sun.star.ucb.HelpContentProvider"_ustr };
 }
 
 // XContentProvider methods.
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 58d8e70c5b49..3a040bbf62a4 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -388,8 +388,8 @@ ResultSetBase::getPropertySetInfo()
 {
     uno::Sequence< beans::Property > seq
     {
-        { "RowCount", -1, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY },
-        { "IsRowCountFinal", -1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY }
+        { u"RowCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY },
+        { u"IsRowCountFinal"_ustr, -1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY }
     };
 
     //t
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index b598c241e75e..07cbdb15b6e6 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -292,7 +292,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
     aIndexFolderResultVectorVector.clear();
 
     sal_Int32 replIdx = strlen( "#HLP#" );
-    OUString replWith = "vnd.sun.star.help://";
+    OUString replWith = u"vnd.sun.star.help://"_ustr;
 
     int nResultCount = aCompleteResultVector.size();
     for( int r = 0 ; r < nResultCount ; ++r )
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 99a55580f9e0..4d6c3d5d5771 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -49,7 +49,7 @@ TVFactory::~TVFactory()
 OUString SAL_CALL
 TVFactory::getImplementationName()
 {
-    return "com.sun.star.help.TreeViewImpl";
+    return u"com.sun.star.help.TreeViewImpl"_ustr;
 }
 
 sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName )
@@ -60,7 +60,7 @@ sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName )
 Sequence< OUString > SAL_CALL
 TVFactory::getSupportedServiceNames()
 {
-    return { "com.sun.star.help.TreeView", "com.sun.star.ucb.HiearchyDataSource" };
+    return { u"com.sun.star.help.TreeView"_ustr, u"com.sun.star.ucb.HiearchyDataSource"_ustr };
 }
 
 // XMultiServiceFactory
@@ -118,7 +118,7 @@ TVFactory::createInstanceWithArguments(
 Sequence< OUString > SAL_CALL
 TVFactory::getAvailableServiceNames( )
 {
-    return { "com.sun.star.ucb.HierarchyDataReadAccess" };
+    return { u"com.sun.star.ucb.HierarchyDataReadAccess"_ustr };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 31f1815979ec..054ad493849a 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -261,7 +261,7 @@ TVRead::getByName( const OUString& aName )
 Sequence< OUString > SAL_CALL
 TVRead::getElementNames( )
 {
-    return { "Title", "TargetURL", "Children" };
+    return { u"Title"_ustr, u"TargetURL"_ustr, u"Children"_ustr };
 }
 
 sal_Bool SAL_CALL
@@ -609,16 +609,16 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
 
         uno::Sequence<uno::Any> lParams(comphelper::InitAnyPropertySequence(
         {
-            {"nodepath", uno::Any(OUString("/org.openoffice.Setup/Product"))}
+            {"nodepath", uno::Any(u"/org.openoffice.Setup/Product"_ustr)}
         }));
 
         // open it
         uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
-                    "com.sun.star.configuration.ConfigurationAccess",
+                    u"com.sun.star.configuration.ConfigurationAccess"_ustr,
                     lParams) );
 
         uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
-        uno::Any aRet = xDirectAccess->getByName("ooSetupExtension");
+        uno::Any aRet = xDirectAccess->getByName(u"ooSetupExtension"_ustr);
 
         aRet >>= setupextension;
     }
@@ -761,7 +761,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
         {
             xHierAccess =
                 Reference< XHierarchicalNameAccess >
-                ( sProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", { Any(OUString::createFromAscii(file)) }),
+                ( sProvider->createInstanceWithArguments( u"com.sun.star.configuration.ConfigurationAccess"_ustr, { Any(OUString::createFromAscii(file)) }),
                   UNO_QUERY );
         }
         catch( const css::uno::Exception& )
@@ -832,7 +832,7 @@ TreeFileIterator::TreeFileIterator( OUString aLanguage )
     m_xContext = ::comphelper::getProcessComponentContext();
     if( !m_xContext.is() )
     {
-        throw RuntimeException( "TreeFileIterator::TreeFileIterator(), no XComponentContext" );
+        throw RuntimeException( u"TreeFileIterator::TreeFileIterator(), no XComponentContext"_ustr );
     }
 
     m_xSFA = ucb::SimpleFileAccess::create(m_xContext);
@@ -902,7 +902,7 @@ Reference< deployment::XPackage > TreeFileIterator::implGetNextUserHelpPackage
     if( !m_bUserPackagesLoaded )
     {
         Reference< XPackageManager > xUserManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager("user");
+            thePackageManagerFactory::get( m_xContext )->getPackageManager(u"user"_ustr);
         m_aUserPackagesSeq = xUserManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
 
@@ -932,7 +932,7 @@ Reference< deployment::XPackage > TreeFileIterator::implGetNextSharedHelpPackage
     if( !m_bSharedPackagesLoaded )
     {
         Reference< XPackageManager > xSharedManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager("shared");
+            thePackageManagerFactory::get( m_xContext )->getPackageManager(u"shared"_ustr);
         m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
 
@@ -962,7 +962,7 @@ Reference< deployment::XPackage > TreeFileIterator::implGetNextBundledHelpPackag
     if( !m_bBundledPackagesLoaded )
     {
         Reference< XPackageManager > xBundledManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager("bundled");
+            thePackageManagerFactory::get( m_xContext )->getPackageManager(u"bundled"_ustr);
         m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );