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, 26 deletions

diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 99c93ef2c58e..7103319d8b6d 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -50,18 +50,8 @@ namespace abp
     using namespace ::com::sun::star::ui::dialogs;
 
 
-    static const OUString& lcl_getDriverSettingsNodeName()
-    {
-        static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" );
-        return s_sDriverSettingsNodeName;
-    }
-
-
-    static const OUString& lcl_getAddressBookNodeName()
-    {
-        static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" );
-        return s_sAddressBookNodeName;
-    }
+    static const char sDriverSettingsNodeName[] = "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
+    static const char sAddressBookNodeName[] = "/org.openoffice.Office.DataAccess/AddressBook";
 
 
     namespace fieldmapping
@@ -169,7 +159,7 @@ namespace abp
 
 
                 // access the configuration information which the driver uses for determining it's column names
-                OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName();
+                OUString sDriverAliasesNodeName = sDriverSettingsNodeName;
                 sDriverAliasesNodeName += OUString( "/ColumnAliases" );
 
                 // create a config node for this
@@ -224,7 +214,6 @@ namespace abp
             MapString2String aFieldAssignment( _rFieldAssignment );
 
             // access the configuration information which the driver uses for determining it's column names
-            const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
 
             // create a config node for this
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
@@ -301,7 +290,6 @@ namespace abp
             const OUString& _rDataSourceName, const OUString& _rTableName )
         {
             // access the configuration information which the driver uses for determining it's column names
-            const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
 
             // create a config node for this
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
@@ -319,7 +307,6 @@ namespace abp
         void markPilotSuccess( const Reference< XComponentContext >& _rxContext )
         {
             // access the configuration information which the driver uses for determining it's column names
-            const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
 
             // create a config node for this
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index c67fc94bfbf2..7b3a2dc1f5e6 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -571,7 +571,7 @@ namespace dbp
             if (xColumns.is())
             {
                 m_aContext.aFieldNames = xColumns->getElementNames();
-                static const OUString s_sFieldTypeProperty("Type");
+                static const char s_sFieldTypeProperty[] = "Type";
                 const OUString* pBegin = m_aContext.aFieldNames.getConstArray();
                 const OUString* pEnd   = pBegin + m_aContext.aFieldNames.getLength();
                 for(;pBegin != pEnd;++pBegin)
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 003bd2d029ed..0c68df814ee3 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -103,11 +103,11 @@ namespace dbp
         if (!xColumnFactory.is() || !xColumnContainer.is())
             return;
 
-        static const OUString s_sDataFieldProperty   ("DataField");
-        static const OUString s_sLabelProperty       ("Label");
-        static const OUString s_sWidthProperty       ("Width");
-        static const OUString s_sMouseWheelBehavior ("MouseWheelBehavior");
-        static const OUString s_sEmptyString;
+        static const char s_sDataFieldProperty [] = "DataField";
+        static const char s_sLabelProperty     [] = "Label";
+        static const char s_sWidthProperty     [] = "Width";
+        static const char s_sMouseWheelBehavior[] = "MouseWheelBehavior";
+        static const char s_sEmptyString[] = "";
 
         // collect "descriptors" for the to-be-created (grid)columns
         std::vector< OUString > aColumnServiceNames;  // service names to be used with the XGridColumnFactory
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index aad8888f7e71..c34613fc8fc9 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -188,7 +188,7 @@ namespace dbp
 
     void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps)
     {
-        static const OUString s_sAnchorPropertyName("AnchorType");
+        static const char s_sAnchorPropertyName[] = "AnchorType";
         Reference< XPropertySetInfo > xPropertyInfo;
         if (_rxShapeProps.is())
             xPropertyInfo = _rxShapeProps->getPropertySetInfo();
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index cebf4294fd09..4495b842e97a 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -219,7 +219,7 @@ namespace pcr
             if ( (eType == TypeClass_STRING || eType == TypeClass_SEQUENCE) &&
                     lcl_isLanguageDependentProperty( _rPropertyName ) )
             {
-                static const OUString s_sResourceResolverPropName("ResourceResolver");
+                static const char s_sResourceResolverPropName[] = "ResourceResolver";
 
                 Reference< resource::XStringResourceResolver > xStringResourceResolver;
                 try
@@ -372,8 +372,8 @@ namespace pcr
                     // StringItemList?
                     else if( eType == TypeClass_SEQUENCE )
                     {
-                        static OUString aDot(".");
-                        static OUString aEsc("&");
+                        static const char aDot[] = ".";
+                        static const char aEsc[] = "&";
 
                         // Put strings into resource using new ids
                         Sequence< OUString > aNewStrings;