fdo#38835 strip out OUString globals

they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.

Change-Id: I07f73484f82d0582252cb4324d4107c998432c37

5 files changed, 13 insertions, 17 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index bd238ba52ac8..b7b7915ba906 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -702,8 +702,6 @@ void DialogWindow::UpdateBrowser()
     rLayout.UpdatePropertyBrowser();
 }
 
-static OUString aResourceResolverPropName( "ResourceResolver" );
-
 bool DialogWindow::SaveDialog()
 {
     bool bDone = false;
@@ -771,7 +769,7 @@ bool DialogWindow::SaveDialog()
             {
                 try
                 {
-                    Any aResourceResolver = xDialogModelPropSet->getPropertyValue( aResourceResolverPropName );
+                    Any aResourceResolver = xDialogModelPropSet->getPropertyValue( "ResourceResolver" );
                     aResourceResolver >>= xStringResourceResolver;
                 }
                 catch(const beans::UnknownPropertyException& )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 98d0159f3925..b99426439eaf 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1053,12 +1053,10 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe
 
 void Shell::ManageToolbars()
 {
-    static OUString aLayoutManagerName( "LayoutManager" );
-    static OUString aMacroBarResName( "private:resource/toolbar/macrobar" );
-    static OUString aDialogBarResName( "private:resource/toolbar/dialogbar" );
-    static OUString aInsertControlsBarResName( "private:resource/toolbar/insertcontrolsbar" );
-    static OUString aFormControlsBarResName( "private:resource/toolbar/formcontrolsbar" );
-    (void)aInsertControlsBarResName;
+    static const char aMacroBarResName[] = "private:resource/toolbar/macrobar";
+    static const char aDialogBarResName[] = "private:resource/toolbar/dialogbar";
+    static const char aInsertControlsBarResName[] = "private:resource/toolbar/insertcontrolsbar";
+    static const char aFormControlsBarResName[] = "private:resource/toolbar/formcontrolsbar";
 
     if( !pCurWin )
         return;
@@ -1068,7 +1066,7 @@ void Shell::ManageToolbars()
     if ( xFrameProps.is() )
     {
         Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
-        uno::Any a = xFrameProps->getPropertyValue( aLayoutManagerName );
+        uno::Any a = xFrameProps->getPropertyValue( "LayoutManager" );
         a >>= xLayoutManager;
         if ( xLayoutManager.is() )
         {
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index bc442623b6f6..80c11b0c8e3e 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -69,8 +69,8 @@ bool LocalizationMgr::isLibraryLocalized ()
 
 void LocalizationMgr::handleTranslationbar ()
 {
-    static OUString const aLayoutManagerName("LayoutManager");
-    static OUString const aToolBarResName("private:resource/toolbar/translationbar");
+    static const char aLayoutManagerName[] = "LayoutManager";
+    static const char aToolBarResName[] = "private:resource/toolbar/translationbar";
 
     Reference< beans::XPropertySet > xFrameProps
         ( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
@@ -902,7 +902,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
 void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName,
     const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel )
 {
-    static OUString aResourceResolverPropName( "ResourceResolver" );
+    static const char aResourceResolverPropName[] = "ResourceResolver";
 
     // Get library
     Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index ba1a87a3ab98..b6d525c5f2ce 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -57,9 +57,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 
-static OUString aResourceResolverPropName( "ResourceResolver" );
-static OUString aDecorationPropName( "Decoration" );
-static OUString aTitlePropName( "Title" );
+static const char aResourceResolverPropName[] = "ResourceResolver";
+static const char aDecorationPropName[] = "Decoration";
+static const char aTitlePropName[] = "Title";
 
 
 
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index c7346c8f3dbf..e38c26632a82 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -130,7 +130,7 @@ void PropBrw::ImplReCreateController()
 
         // create a property browser controller
         Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW );
-        static const OUString s_sControllerServiceName( "com.sun.star.awt.PropertyBrowserController" );
+        static const char s_sControllerServiceName[] = "com.sun.star.awt.PropertyBrowserController";
         m_xBrowserController = Reference< XPropertySet >(
             xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY
         );