loplugin:ostr in framework

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

3 files changed, 22 insertions, 22 deletions

diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 22965a3e6a5d..6592b9b48d31 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -307,7 +307,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp
     xDispatcher->executeDispatch(
         xProvider,
         aDockWinCommand,
-        "_self",
+        u"_self"_ustr,
         0,
         aArgs);
 }
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index bd122e6f683f..12dcf29f6b0a 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -166,7 +166,7 @@ void LayoutManager::implts_createMenuBar(const OUString& rMenuBarName)
 
     try
     {
-        m_xMenuBar->getPropertyValue("XMenuBar") >>= xMenuBar;
+        m_xMenuBar->getPropertyValue(u"XMenuBar"_ustr) >>= xMenuBar;
     }
     catch (const beans::UnknownPropertyException&)
     {
@@ -215,7 +215,7 @@ void LayoutManager::impl_clearUpMenuBar()
                 {
                     try
                     {
-                        m_xMenuBar->getPropertyValue("XMenuBar") >>= xMenuBar;
+                        m_xMenuBar->getPropertyValue(u"XMenuBar"_ustr) >>= xMenuBar;
                     }
                     catch (const beans::UnknownPropertyException&)
                     {
@@ -654,7 +654,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
         try
         {
             // Check persistent flag of the user interface element
-            xPropSet->getPropertyValue("Persistent") >>= bPersistent;
+            xPropSet->getPropertyValue(u"Persistent"_ustr) >>= bPersistent;
         }
         catch (const beans::UnknownPropertyException&)
         {
@@ -722,8 +722,8 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa
     Reference< ui::XUIElement > xUIElement;
 
     SolarMutexGuard g;
-    Sequence< PropertyValue > aPropSeq{ comphelper::makePropertyValue("Frame", m_xFrame),
-                                        comphelper::makePropertyValue("Persistent", true) };
+    Sequence< PropertyValue > aPropSeq{ comphelper::makePropertyValue(u"Frame"_ustr, m_xFrame),
+                                        comphelper::makePropertyValue(u"Persistent"_ustr, true) };
 
     try
     {
@@ -2359,7 +2359,7 @@ sal_Bool SAL_CALL LayoutManager::isVisible()
 {
     SolarMutexClearableGuard aReadLock;
     bool bStatusBarVisible( isElementVisible( STATUS_BAR_ALIAS ));
-    bool bProgressBarVisible( isElementVisible( "private:resource/progressbar/progressbar" ));
+    bool bProgressBarVisible( isElementVisible( u"private:resource/progressbar/progressbar"_ustr ));
     bool bVisible( m_bVisible );
     Reference< XUIElement > xStatusBar( m_aStatusBarElement.m_xUIElement );
     Reference< XUIElement > xProgressBar( m_aProgressBarElement.m_xUIElement );
@@ -2498,7 +2498,7 @@ void LayoutManager::implts_createMSCompatibleMenuBar( const OUString& aName )
     assert(nFormsMenu != -1);
 
     // Create the MS compatible Form menu
-    css::uno::Reference< css::ui::XUIElement > xFormsMenu = implts_createElement( "private:resource/menubar/mscompatibleformsmenu" );
+    css::uno::Reference< css::ui::XUIElement > xFormsMenu = implts_createElement( u"private:resource/menubar/mscompatibleformsmenu"_ustr );
     if(!xFormsMenu.is())
         return;
 
@@ -2534,8 +2534,8 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose, void*, void)
 
     xDispatcher->executeDispatch(
         xProvider,
-        ".uno:CloseWin",
-        "_self",
+        u".uno:CloseWin"_ustr,
+        u"_self"_ustr,
         0,
         uno::Sequence< beans::PropertyValue >());
 }
@@ -2839,7 +2839,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
             if ( xPropSet.is() )
             {
                 if ( Event.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
-                    xPropSet->setPropertyValue( "ConfigurationSource", Any( m_xDocCfgMgr ));
+                    xPropSet->setPropertyValue( u"ConfigurationSource"_ustr, Any( m_xDocCfgMgr ));
             }
             xElementSettings->updateSettings();
         }
@@ -2883,7 +2883,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
         if ( xElementSettings.is() )
         {
             bool                      bNoSettings( false );
-            OUString           aConfigSourcePropName( "ConfigurationSource" );
+            OUString           aConfigSourcePropName( u"ConfigurationSource"_ustr );
             Reference< XInterface >   xElementCfgMgr;
             Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
 
@@ -2968,7 +2968,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
             Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
 
             if ( xPropSet.is() )
-                xPropSet->getPropertyValue( "ConfigurationSource" ) >>= xElementCfgMgr;
+                xPropSet->getPropertyValue( u"ConfigurationSource"_ustr ) >>= xElementCfgMgr;
 
             if ( !xElementCfgMgr.is() )
                 return;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 39f228ca1133..3b61f2a543f6 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -453,8 +453,8 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
         uno::Reference< ui::XUIElement > xUIElement;
 
         uno::Sequence< beans::PropertyValue > aPropSeq{
-            comphelper::makePropertyValue("Frame", xFrame),
-            comphelper::makePropertyValue("Persistent", true)
+            comphelper::makePropertyValue(u"Frame"_ustr, xFrame),
+            comphelper::makePropertyValue(u"Persistent"_ustr, true)
         };
         uno::Reference<ui::XUIElementFactory> xUIElementFactory;
         {
@@ -543,7 +543,7 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
             {
                 ToolBox* pToolbar = static_cast<ToolBox *>(pWindow.get());
                 ToolBoxMenuType nMenuType = pToolbar->GetMenuType();
-                if ( aCmdOptions.LookupDisabled( "ConfigureDialog" ))
+                if ( aCmdOptions.LookupDisabled( u"ConfigureDialog"_ustr ))
                     pToolbar->SetMenuType( nMenuType & ~ToolBoxMenuType::Customize );
                 else
                     pToolbar->SetMenuType( nMenuType | ToolBoxMenuType::Customize );
@@ -1139,7 +1139,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
                 else
                 {
                     // Create new UI element and try to read its state data
-                    UIElement aNewToolbar( aAddonToolBarName, "toolbar", xUIElement );
+                    UIElement aNewToolbar( aAddonToolBarName, u"toolbar"_ustr, xUIElement );
                     aNewToolbar.m_bFloating = true;
                     implts_readWindowStateData( aAddonToolBarName, aNewToolbar );
                     implts_setElementData( aNewToolbar, xDockWindow );
@@ -1550,7 +1550,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
         try
         {
             // Check persistent flag of the user interface element
-            xPropSet->getPropertyValue("Persistent") >>= bPersistent;
+            xPropSet->getPropertyValue(u"Persistent"_ustr) >>= bPersistent;
         }
         catch (const beans::UnknownPropertyException&)
         {
@@ -3777,7 +3777,7 @@ void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEven
         if ( xPropSet.is() )
         {
             if ( rEvent.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
-                xPropSet->setPropertyValue( "ConfigurationSource", css::uno::Any( m_xDocCfgMgr ));
+                xPropSet->setPropertyValue( u"ConfigurationSource"_ustr, css::uno::Any( m_xDocCfgMgr ));
         }
         xElementSettings->updateSettings();
     }
@@ -3803,7 +3803,7 @@ void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEven
                     xPropSet.set( xCfgMgr->getSettings( rEvent.ResourceURL, false ), uno::UNO_QUERY );
 
                     if ( xPropSet.is() )
-                        xPropSet->getPropertyValue("UIName") >>= aUIName;
+                        xPropSet->getPropertyValue(u"UIName"_ustr) >>= aUIName;
                 }
                 catch (const container::NoSuchElementException&)
                 {
@@ -3842,7 +3842,7 @@ void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent
         return;
 
     bool                                  bNoSettings( false );
-    OUString                       aConfigSourcePropName( "ConfigurationSource" );
+    OUString                       aConfigSourcePropName( u"ConfigurationSource"_ustr );
     uno::Reference< uno::XInterface >     xElementCfgMgr;
     uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
 
@@ -3887,7 +3887,7 @@ void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEven
     uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
 
     if ( xPropSet.is() )
-        xPropSet->getPropertyValue( "ConfigurationSource" ) >>= xElementCfgMgr;
+        xPropSet->getPropertyValue( u"ConfigurationSource"_ustr ) >>= xElementCfgMgr;
 
     if ( !xElementCfgMgr.is() )
         return;