remove static OUStrings from static_initialization_and_destruction chain

7 files changed, 57 insertions, 58 deletions

diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index b1560dc58c7d..5abc559ae3dc 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -44,7 +44,7 @@ namespace css = ::com::sun::star;
 //_______________________________________________
 // definitions
 
-static const ::rtl::OUString ERRMSG_INVALID_COMPONENT_PARAM(RTL_CONSTASCII_USTRINGPARAM("NULL as component reference not allowed."));
+static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed.";
 
 //-----------------------------------------------
 NumberedCollection::NumberedCollection()
@@ -91,7 +91,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix)
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
         if ( ! xComponent.is ())
-            throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
+            throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
 
         long                              pComponent = (long) xComponent.get ();
         TNumberedItemHash::const_iterator pIt        = m_lComponents.find (pComponent);
@@ -167,7 +167,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
         if ( ! xComponent.is ())
-            throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
+            throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
 
         long                        pComponent = (long) xComponent.get ();
         TNumberedItemHash::iterator pIt        = m_lComponents.find (pComponent);
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index bf42f7537d51..a28414386695 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -44,7 +44,7 @@ using namespace ::desktop;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 
-static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
+static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
 
 /* Local function - get access to the configuration */
 static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath )
@@ -56,7 +56,7 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP
     NamedValue aValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), makeAny( rPath ) );
     aArgs[0] <<= aValue;
     return Reference< XPropertySet >(
-            xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), UNO_QUERY_THROW );
+            xConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW );
 }
 
 void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 7b3578a1eab0..9a48732091f7 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -218,9 +218,9 @@ void SilentCommandEnv::pop() throw (uno::RuntimeException)
 
 } // end namespace
 
-//-----------------------------------------------------------------------------
-static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
-//------------------------------------------------------------------------------
+
+static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
+
 static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext )
 {
     rtl::OUString sServiceName = UNISTRING("com.sun.star.deployment.ui.UpdateRequiredDialog");
@@ -333,7 +333,7 @@ static void impl_setNeedsCompatCheck()
                       makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
-            theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+            theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW );
 
         Any value = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("never")) );
 
@@ -385,7 +385,7 @@ static bool impl_needsCompatCheck()
                       makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
-            theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+            theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW );
 
         Any result = pset->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")) );
 
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ca1af31203e8..716655e977ff 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -77,9 +77,8 @@ namespace css = ::com::sun::star;
 // Error message in case filter config seems to be corrupted.
 // Note: Dont tell user something about "setup -repair"!
 // Its no longer supported by using native installers ...
-static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." ));
-
-
+const char MESSAGE_CORRUPTED_FILTERCONFIG[] =
+    "The filter configuration appears to be defective. Please install the office suite again.";
 
 FilterCache::FilterCache()
     : BaseLock    (                                        )
@@ -998,7 +997,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
     catch(const css::uno::Exception& ex)
     {
         throw css::document::CorruptedFilterConfigurationException(
-                MESSAGE_CORRUPTED_FILTERCONFIG,
+                rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                 css::uno::Reference< css::uno::XInterface >(),
                 ex.Message);
     }
@@ -1043,7 +1042,7 @@ void FilterCache::impl_validateAndOptimize()
        )
     {
         throw css::document::CorruptedFilterConfigurationException(
-                MESSAGE_CORRUPTED_FILTERCONFIG,
+                rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                 css::uno::Reference< css::uno::XInterface >(),
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
     }
@@ -1307,7 +1306,7 @@ void FilterCache::impl_validateAndOptimize()
     OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
     if (nErrors>0)
         throw css::document::CorruptedFilterConfigurationException(
-                MESSAGE_CORRUPTED_FILTERCONFIG,
+                rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                 css::uno::Reference< css::uno::XInterface >(),
                 sLogOut);
     OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
@@ -1558,7 +1557,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
     catch(const css::uno::Exception& ex)
     {
         throw css::document::CorruptedFilterConfigurationException(
-                MESSAGE_CORRUPTED_FILTERCONFIG,
+                rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                 css::uno::Reference< css::uno::XInterface >(),
                 ex.Message);
     }
@@ -1587,7 +1586,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
                 catch(const css::uno::Exception& ex)
                 {
                     throw css::document::CorruptedFilterConfigurationException(
-                            MESSAGE_CORRUPTED_FILTERCONFIG,
+                            rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                             css::uno::Reference< css::uno::XInterface >(),
                             ex.Message);
                 }
@@ -1616,7 +1615,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
                 catch(const css::uno::Exception& ex)
                 {
                     throw css::document::CorruptedFilterConfigurationException(
-                            MESSAGE_CORRUPTED_FILTERCONFIG,
+                            rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
                             css::uno::Reference< css::uno::XInterface >(),
                             ex.Message);
                 }
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 665d3dcda42c..fd358bfba848 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -54,8 +54,8 @@
 namespace framework
 {
 
-static const ::rtl::OUString CFGPATH_FACTORIES    (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
-static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
+static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories";
+static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier";
 
 /*-----------------------------------------------
     04.12.2003 09:32
@@ -212,7 +212,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     // we can close it without a flush ... and our read data wont be affected .-)
     css::uno::Reference< css::uno::XInterface >         xCfg      = ::comphelper::ConfigurationHelper::openConfig(
                                                                         xSMGR,
-                                                                        CFGPATH_FACTORIES,
+                                                                        rtl::OUString(CFGPATH_FACTORIES),
                                                                         ::comphelper::ConfigurationHelper::E_STANDARD);
     css::uno::Reference< css::container::XNameAccess >  xModules (xCfg, css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNameReplace > xModule  ;
@@ -266,7 +266,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
           sal_Int32                             c          = lPropNames.getLength();
           sal_Int32                             i          = 0;
 
-    lProps[MODULEPROP_IDENTIFIER] <<= sName;
+    lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName;
     for (i=0; i<c; ++i)
     {
         const ::rtl::OUString& sPropName         = lPropNames[i];
@@ -375,7 +375,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
     {
         xCfg = ::comphelper::ConfigurationHelper::openConfig(
                     xSMGR,
-                    CFGPATH_FACTORIES,
+                    rtl::OUString(CFGPATH_FACTORIES),
                     ::comphelper::ConfigurationHelper::E_READONLY);
     }
     catch(const css::uno::RuntimeException&)
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index f26ce03f9fb2..d96fa497e240 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -45,26 +45,26 @@
 namespace svx
 {
 
-static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchString" ) );
-static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.Backward" ) );
-static const ::rtl::OUString SEARCHITEM_SEARCHFLAGS( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchFlags" ) );
+static const char SEARCHITEM_SEARCHSTRING[] = "SearchItem.SearchString";
+static const char SEARCHITEM_SEARCHBACKWARD[] = "SearchItem.Backward";
+static const char SEARCHITEM_SEARCHFLAGS[] = "SearchItem.SearchFlags";
 
-static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExecuteSearch" ) );
-static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) );
-static const ::rtl::OUString COMMAND_DOWNSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:DownSearch") );
-static const ::rtl::OUString COMMAND_UPSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:UpSearch") );
-static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY( RTL_CONSTASCII_USTRINGPARAM( "AppendSearchHistory") );
+static const char COMMAND_EXECUTESEARCH[] = ".uno:ExecuteSearch";
+static const char COMMAND_FINDTEXT[] = ".uno:FindText";
+static const char COMMAND_DOWNSEARCH[] = ".uno:DownSearch";
+static const char COMMAND_UPSEARCH[] = ".uno:UpSearch";
+static const char COMMAND_APPENDSEARCHHISTORY[] = "AppendSearchHistory";
 
-static const ::rtl::OUString SERVICENAME_URLTRANSFORMER( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer") );
+static const char SERVICENAME_URLTRANSFORMER[] = "com.sun.star.util.URLTransformer";
 static const sal_Int32       REMEMBER_SIZE = 10;
 
 void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
 {
-    css::uno::Reference< css::util::XURLTransformer > xURLTransformer( rSMgr->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY );
+    css::uno::Reference< css::util::XURLTransformer > xURLTransformer( rSMgr->createInstance(rtl::OUString(SERVICENAME_URLTRANSFORMER)), css::uno::UNO_QUERY );
     if ( xURLTransformer.is() )
     {
         css::util::URL aURL;
-        aURL.Complete = COMMAND_EXECUTESEARCH;
+        aURL.Complete = rtl::OUString(COMMAND_EXECUTESEARCH);
         xURLTransformer->parseStrict(aURL);
 
         css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY);
@@ -164,16 +164,16 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
                 ::rtl::OUString sFindText = GetText();
                 css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
 
-                lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+                lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
                 lArgs[0].Value <<= sFindText;
 
-                lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+                lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
                 if (bShift)
                     lArgs[1].Value <<= sal_True;
                 else
                     lArgs[1].Value <<= sal_False;
 
-                lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+                lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
                 lArgs[2].Value <<= (sal_Int32)0;
 
                 impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
@@ -300,7 +300,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag
 FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
     :svt::ToolboxController( rServiceManager,
     css::uno::Reference< css::frame::XFrame >(),
-    COMMAND_FINDTEXT )
+    rtl::OUString(COMMAND_FINDTEXT) )
 {
 }
 
@@ -383,9 +383,9 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
         for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
-            if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
+            if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_DOWNSEARCH)))
                 m_nDownSearchId = i;
-            else if (sItemCommand.equals( COMMAND_UPSEARCH ))
+            else if (sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_UPSEARCH)))
                 m_nUpSearchId = i;
         }
     }
@@ -464,7 +464,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
 DownSearchToolboxController::DownSearchToolboxController(const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
     : svt::ToolboxController( rServiceManager,
     css::uno::Reference< css::frame::XFrame >(),
-    COMMAND_DOWNSEARCH )
+    rtl::OUString(COMMAND_DOWNSEARCH) )
 {
 }
 
@@ -518,7 +518,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL DownSearchToolboxController::getS
 css::uno::Sequence< ::rtl::OUString >  DownSearchToolboxController::getSupportedServiceNames_Static() throw()
 {
     css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController");
     return aSNS;
 }
 
@@ -554,7 +554,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
         for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
-            if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
+            if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_FINDTEXT)) )
             {
                 Window* pItemWin = pToolBox->GetItemWindow(i);
                 if (pItemWin)
@@ -565,17 +565,17 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
     }
 
     css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
-    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+    lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
     lArgs[0].Value <<= sFindText;
-    lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+    lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
     lArgs[1].Value <<= sal_False;
-    lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+    lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
     lArgs[2].Value <<= (sal_Int32)0;
 
     impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
 
     css::frame::FeatureStateEvent aEvent;
-    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+    aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY);
     css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
     if (xStatusListener.is())
         xStatusListener->statusChanged( aEvent );
@@ -595,7 +595,7 @@ void SAL_CALL DownSearchToolboxController::statusChanged( const css::frame::Feat
 UpSearchToolboxController::UpSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager )
     :svt::ToolboxController( rServiceManager,
     css::uno::Reference< css::frame::XFrame >(),
-    COMMAND_UPSEARCH )
+    rtl::OUString(COMMAND_UPSEARCH) )
 {
 }
 
@@ -649,7 +649,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL UpSearchToolboxController::getSup
 css::uno::Sequence< ::rtl::OUString >  UpSearchToolboxController::getSupportedServiceNames_Static() throw()
 {
     css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) );
+    aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController");
     return aSNS;
 }
 
@@ -696,17 +696,17 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
     }
 
     css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
-    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+    lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
     lArgs[0].Value <<= sFindText;
-    lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+    lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
     lArgs[1].Value <<= sal_True;
-    lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+    lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
     lArgs[2].Value <<= (sal_Int32)0;
 
     impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
 
     css::frame::FeatureStateEvent aEvent;
-    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+    aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY);
     css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
     if (xStatusListener.is())
         xStatusListener->statusChanged( aEvent );
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 261599da630b..f10c68285290 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -63,8 +63,8 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-static const rtl::OUString sSpreadsheetDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") );
-static const rtl::OUString sTextDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") );
+static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocument";
+static const char aTextDocument[] = "com.sun.star.text.TextDocument";
 
 typedef  boost::unordered_map< rtl::OUString,
 sal_Int32, ::rtl::OUStringHash,
@@ -146,8 +146,8 @@ public:
         {
             uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY );
             if ( xServiceInfo.is()
-                && (  ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
-                || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
+                && (  ( xServiceInfo->supportsService( rtl::OUString(aSpreadsheetDocument) ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
+                || ( xServiceInfo->supportsService( rtl::OUString(aTextDocument) ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
             {
                 uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
                 m_documents.push_back( xModel );