fdo#38835 strip out OUString globals

Change-Id: I1a435214af102461e02217f7d95248dac14e5f1a

11 files changed, 64 insertions, 73 deletions

diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 1f226c1e88f6..d3b07f811662 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -25,8 +25,6 @@ using namespace ::com::sun::star::uno;
 class DBTestBase
     : public UnoApiTest
 {
-protected:
-    static const OUString our_sFilePath;
 public:
     DBTestBase() : UnoApiTest("dbaccess/qa/unit/data") {};
 
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 7557d6cc16ad..5049e2a90e22 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -150,9 +150,9 @@ namespace dbaui
             }
 
             // set the properties
-            static const OUString s_sUniquePropertyName = "IsUnique";
-            static const OUString s_sSortPropertyName = "IsAscending";
-            static const OUString s_sNamePropertyName = "Name";
+            static const char s_sUniquePropertyName[] = "IsUnique";
+            static const char s_sSortPropertyName[] = "IsAscending";
+            static const char s_sNamePropertyName[] = "Name";
             // the index' own props
             xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, css::uno::makeAny(_rPos->bUnique));
             xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
@@ -252,10 +252,10 @@ namespace dbaui
 
     void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor)
     {
-        static const OUString s_sPrimaryIndexPropertyName = "IsPrimaryKeyIndex";
-        static const OUString s_sUniquePropertyName = "IsUnique";
-        static const OUString s_sSortPropertyName = "IsAscending";
-        static const OUString s_sCatalogPropertyName = "Catalog";
+        static const char s_sPrimaryIndexPropertyName[] = "IsPrimaryKeyIndex";
+        static const char s_sUniquePropertyName[] = "IsUnique";
+        static const char s_sSortPropertyName[] = "IsAscending";
+        static const char s_sCatalogPropertyName[] = "Catalog";
 
         _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
         _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index b007a87ebd80..cc815670d601 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -87,7 +87,6 @@ extern const sal_Char szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpi
 
 extern const sal_Char szServiceName_TreeControl[];
 extern const sal_Char szServiceName_TreeControlModel[];
-extern const sal_Char szServiceName_MutableTreeDataModel[];
 
 extern const sal_Char szServiceName_GridControl[];
 extern const sal_Char szServiceName_GridControlModel[];
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 883d3e4d1697..aa830e47ec6b 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -495,8 +495,8 @@ private:
 
     Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
-        static const OUString aServiceName("com.sun.star.awt.grid.DefaultGridDataModel");
-        static const Sequence< OUString > aSeq( &aServiceName, 1 );
+        Sequence< OUString > aSeq( 1 );
+        aSeq[0] = "com.sun.star.awt.grid.DefaultGridDataModel";
         return aSeq;
     }
 
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index ee1468ff22ac..3f50b3d081c5 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -258,9 +258,8 @@ sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& Service
 
 Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
 {
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_MutableTreeDataModel ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[0] = "com.sun.star.awt.tree.MutableTreeDataModel";
     return aSeq;
 }
 
@@ -536,9 +535,8 @@ sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName
 
 Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
 {
-    ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
-    static const OUString aServiceName( "com.sun.star.awt.tree.MutableTreeNode" );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[0] = "com.sun.star.awt.tree.MutableTreeNode";
     return aSeq;
 }
 
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 6d20891a164f..944ac2d79a09 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -86,7 +86,6 @@ const sal_Char szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFra
 const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
 const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
 const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
-const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
 const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
 const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
 const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index 4bfdb4ee8f00..53027d2c44ce 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -150,11 +150,8 @@ VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier,
 uno::Sequence< OUString > SAL_CALL
 VbaGlobalsBase::getAvailableServiceNames(  ) throw (uno::RuntimeException, std::exception)
 {
-    static const OUString names[] = {
-    // common
-        OUString("ooo.vba.msforms.UserForm"),
-      };
-    static uno::Sequence< OUString > serviceNames( names, sizeof( names )/ sizeof( names[0] ) );
+    uno::Sequence< OUString > serviceNames(1);
+    serviceNames[0] = "ooo.vba.msforms.UserForm";
     return serviceNames;
 }
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 8c9f0efa3fe9..a9e742aabb71 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -757,16 +757,16 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
         }
         else
         {
-            static const OUString aBorders[] =
+            static const char* aBorders[] =
             {
-                OUString("TopBorder"), OUString("LeftBorder"), OUString("BottomBorder"), OUString("RightBorder")
+                "TopBorder", "LeftBorder", "BottomBorder", "RightBorder"
             };
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aBorders); ++i)
             {
-                table::BorderLine2 aBorderLine = xPropertySet->getPropertyValue(aBorders[i]).get<table::BorderLine2>();
+                table::BorderLine2 aBorderLine = xPropertySet->getPropertyValue(OUString::createFromAscii(aBorders[i])).get<table::BorderLine2>();
                 aBorderLine.Color = aLineColor.get<sal_Int32>();
                 aBorderLine.LineWidth = aLineWidth.get<sal_Int32>();
-                xPropertySet->setPropertyValue(aBorders[i], uno::makeAny(aBorderLine));
+                xPropertySet->setPropertyValue(OUString::createFromAscii(aBorders[i]), uno::makeAny(aBorderLine));
             }
         }
         if (rShape.oZ)
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 494fe0095350..0165193cdebc 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -547,9 +547,9 @@ namespace xmloff
                 CCA_LABEL, CCA_TITLE
             };
             // the names of all properties which are expected to be of type string
-            static const OUString aStringPropertyNames[] =
+            static const char * aStringPropertyNames[] =
             {
-                OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE)
+                PROPERTY_LABEL, PROPERTY_TITLE
             };
             OSL_ENSURE( sizeof(aStringPropertyNames)/sizeof(aStringPropertyNames[0]) ==
                         sizeof(nStringPropertyAttributeIds)/sizeof(nStringPropertyAttributeIds[0]),
@@ -561,7 +561,7 @@ namespace xmloff
                     exportStringPropertyAttribute(
                         OAttributeMetaData::getCommonControlAttributeNamespace(nStringPropertyAttributeIds[i]),
                         OAttributeMetaData::getCommonControlAttributeName(nStringPropertyAttributeIds[i]),
-                        aStringPropertyNames[i]
+                        OUString::createFromAscii(aStringPropertyNames[i])
                         );
                 #if OSL_DEBUG_LEVEL > 0
                     //  reset the bit for later checking
@@ -576,12 +576,12 @@ namespace xmloff
             {   // attribute flags
                 CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
             };
-            static const OUString pBooleanPropertyNames[] =
+            static const char * pBooleanPropertyNames[] =
             {   // property names
-                OUString(PROPERTY_STATE), OUString(PROPERTY_ENABLED),
-                OUString(PROPERTY_DROPDOWN), OUString(PROPERTY_PRINTABLE),
-                OUString(PROPERTY_READONLY), OUString(PROPERTY_DEFAULT_STATE),
-                OUString(PROPERTY_TABSTOP), OUString(PROPERTY_ENABLEVISIBLE)
+                PROPERTY_STATE, PROPERTY_ENABLED,
+                PROPERTY_DROPDOWN, PROPERTY_PRINTABLE,
+                PROPERTY_READONLY, PROPERTY_DEFAULT_STATE,
+                PROPERTY_TABSTOP, PROPERTY_ENABLEVISIBLE
             };
             static const sal_Bool nBooleanPropertyAttrFlags[] =
             {   // attribute defaults
@@ -600,7 +600,7 @@ namespace xmloff
                     exportBooleanPropertyAttribute(
                         OAttributeMetaData::getCommonControlAttributeNamespace(nBooleanPropertyAttributeIds[i]),
                         OAttributeMetaData::getCommonControlAttributeName(nBooleanPropertyAttributeIds[i]),
-                        pBooleanPropertyNames[i],
+                        OUString::createFromAscii(pBooleanPropertyNames[i]),
                         nBooleanPropertyAttrFlags[i]);
         #if OSL_DEBUG_LEVEL > 0
                     //  reset the bit for later checking
@@ -616,9 +616,9 @@ namespace xmloff
             {   // attribute flags
                 CCA_SIZE, CCA_TAB_INDEX
             };
-            static const OUString pIntegerPropertyNames[] =
+            static const char * pIntegerPropertyNames[] =
             {   // property names
-                OUString(PROPERTY_LINECOUNT), OUString(PROPERTY_TABINDEX)
+                PROPERTY_LINECOUNT, PROPERTY_TABINDEX
             };
             static const sal_Int16 nIntegerPropertyAttrDefaults[] =
             {   // attribute defaults
@@ -641,7 +641,7 @@ namespace xmloff
                     exportInt16PropertyAttribute(
                         OAttributeMetaData::getCommonControlAttributeNamespace(nIntegerPropertyAttributeIds[i]),
                         OAttributeMetaData::getCommonControlAttributeName(nIntegerPropertyAttributeIds[i]),
-                        pIntegerPropertyNames[i],
+                        OUString::createFromAscii(pIntegerPropertyNames[i]),
                         nIntegerPropertyAttrDefaults[i]);
         #if OSL_DEBUG_LEVEL > 0
                     //  reset the bit for later checking
@@ -971,13 +971,13 @@ namespace xmloff
                 SCA_VALIDATION, SCA_MULTI_LINE, SCA_AUTOMATIC_COMPLETION, SCA_MULTIPLE, SCA_DEFAULT_BUTTON, SCA_IS_TRISTATE,
                 SCA_TOGGLE, SCA_FOCUS_ON_CLICK
             };
-            static const OUString pBooleanPropertyNames[] =
+            static const char * pBooleanPropertyNames[] =
             {   // property names
-                OUString(PROPERTY_STRICTFORMAT), OUString(PROPERTY_MULTILINE),
-                OUString(PROPERTY_AUTOCOMPLETE),
-                OUString(PROPERTY_MULTISELECTION),
-                OUString(PROPERTY_DEFAULTBUTTON), OUString(PROPERTY_TRISTATE),
-                OUString(PROPERTY_TOGGLE), OUString(PROPERTY_FOCUS_ON_CLICK)
+                PROPERTY_STRICTFORMAT, PROPERTY_MULTILINE,
+                PROPERTY_AUTOCOMPLETE,
+                PROPERTY_MULTISELECTION,
+                PROPERTY_DEFAULTBUTTON, PROPERTY_TRISTATE,
+                PROPERTY_TOGGLE, PROPERTY_FOCUS_ON_CLICK
             };
             static const sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
         #if OSL_DEBUG_LEVEL > 0
@@ -993,7 +993,7 @@ namespace xmloff
                     exportBooleanPropertyAttribute(
                         OAttributeMetaData::getSpecialAttributeNamespace( *pAttributeId ),
                         OAttributeMetaData::getSpecialAttributeName( *pAttributeId ),
-                        pBooleanPropertyNames[i],
+                        OUString::createFromAscii(pBooleanPropertyNames[i]),
                         ( *pAttributeId == SCA_FOCUS_ON_CLICK ) ? BOOLATTR_DEFAULT_TRUE : BOOLATTR_DEFAULT_FALSE
                     );
             #if OSL_DEBUG_LEVEL > 0
@@ -1010,9 +1010,9 @@ namespace xmloff
             {   // attribute flags
                 SCA_PAGE_STEP_SIZE
             };
-            static const OUString pIntegerPropertyNames[] =
+            static const char * pIntegerPropertyNames[] =
             {   // property names
-                OUString(PROPERTY_BLOCK_INCREMENT)
+                PROPERTY_BLOCK_INCREMENT
             };
             static const sal_Int32 nIntegerPropertyAttrDefaults[] =
             {   // attribute defaults (XML defaults, not runtime defaults!)
@@ -1034,7 +1034,7 @@ namespace xmloff
                     exportInt32PropertyAttribute(
                         OAttributeMetaData::getSpecialAttributeNamespace( nIntegerPropertyAttributeIds[i] ),
                         OAttributeMetaData::getSpecialAttributeName( nIntegerPropertyAttributeIds[i] ),
-                        pIntegerPropertyNames[i],
+                        OUString::createFromAscii(pIntegerPropertyNames[i]),
                         nIntegerPropertyAttrDefaults[i]
                     );
             #if OSL_DEBUG_LEVEL > 0
@@ -2060,9 +2060,9 @@ namespace xmloff
             {
                 faName, /*faAction,*/ faCommand, faFilter, faOrder
             };
-            static const OUString aStringPropertyNames[] =
+            static const char * aStringPropertyNames[] =
             {
-                OUString(PROPERTY_NAME), /*OUString(PROPERTY_TARGETURL),*/ OUString(PROPERTY_COMMAND), OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER)
+                PROPERTY_NAME, /*PROPERTY_TARGETURL,*/ PROPERTY_COMMAND, PROPERTY_FILTER, PROPERTY_ORDER
             };
             static const sal_Int32 nIdCount = sizeof(eStringPropertyIds) / sizeof(eStringPropertyIds[0]);
         #if OSL_DEBUG_LEVEL > 0
@@ -2074,7 +2074,7 @@ namespace xmloff
                 exportStringPropertyAttribute(
                     OAttributeMetaData::getFormAttributeNamespace(eStringPropertyIds[i]),
                     OAttributeMetaData::getFormAttributeName(eStringPropertyIds[i]),
-                    aStringPropertyNames[i]);
+                    OUString::createFromAscii(aStringPropertyNames[i]));
 
             // #i112082# xlink:type is added as part of exportTargetLocationAttribute
 
@@ -2104,14 +2104,14 @@ namespace xmloff
             {
                 faAllowDeletes, faAllowInserts, faAllowUpdates, faApplyFilter, faEscapeProcessing, faIgnoreResult
             };
-            static const OUString pBooleanPropertyNames[] =
+            static const char * pBooleanPropertyNames[] =
             {
-                OUString(PROPERTY_ALLOWDELETES),
-                OUString(PROPERTY_ALLOWINSERTS),
-                OUString(PROPERTY_ALLOWUPDATES),
-                OUString(PROPERTY_APPLYFILTER),
-                OUString(PROPERTY_ESCAPEPROCESSING),
-                OUString(PROPERTY_IGNORERESULT)
+                PROPERTY_ALLOWDELETES,
+                PROPERTY_ALLOWINSERTS,
+                PROPERTY_ALLOWUPDATES,
+                PROPERTY_APPLYFILTER,
+                PROPERTY_ESCAPEPROCESSING,
+                PROPERTY_IGNORERESULT
             };
             static const sal_Int8 nBooleanPropertyAttrFlags[] =
             {
@@ -2128,7 +2128,7 @@ namespace xmloff
                 exportBooleanPropertyAttribute(
                     OAttributeMetaData::getFormAttributeNamespace(eBooleanPropertyIds[i]),
                     OAttributeMetaData::getFormAttributeName(eBooleanPropertyIds[i]),
-                    pBooleanPropertyNames[i],
+                    OUString::createFromAscii(pBooleanPropertyNames[i]),
                     nBooleanPropertyAttrFlags[i]
                 );
         }
@@ -2139,9 +2139,9 @@ namespace xmloff
             {
                 faEnctype, faMethod, faCommandType, faNavigationMode, faTabbingCycle
             };
-            static const OUString pEnumPropertyNames[] =
+            static const char * pEnumPropertyNames[] =
             {
-                OUString(PROPERTY_SUBMIT_ENCODING), OUString(PROPERTY_SUBMIT_METHOD), OUString(PROPERTY_COMMAND_TYPE), OUString(PROPERTY_NAVIGATION), OUString(PROPERTY_CYCLE)
+                PROPERTY_SUBMIT_ENCODING, PROPERTY_SUBMIT_METHOD, PROPERTY_COMMAND_TYPE, PROPERTY_NAVIGATION, PROPERTY_CYCLE
             };
             static const OEnumMapper::EnumProperties eEnumPropertyMaps[] =
             {
@@ -2168,7 +2168,7 @@ namespace xmloff
                 exportEnumPropertyAttribute(
                     OAttributeMetaData::getFormAttributeNamespace(eEnumPropertyIds[i]),
                     OAttributeMetaData::getFormAttributeName(eEnumPropertyIds[i]),
-                    pEnumPropertyNames[i],
+                    OUString::createFromAscii(pEnumPropertyNames[i]),
                     OEnumMapper::getEnumMap(eEnumPropertyMaps[i]),
                     nEnumPropertyAttrDefaults[i],
                     nEnumPropertyAttrDefaultFlags[i]
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 0040d5ddbf19..f1911a49d0b8 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1186,8 +1186,8 @@ namespace xmloff
     bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName,
         const OUString& _rValue)
     {
-        static const OUString s_sReferenceAttributeName = OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR));
-        if (_rLocalName == s_sReferenceAttributeName)
+        static const char * s_sReferenceAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCA_FOR);
+        if (_rLocalName.equalsAscii(s_sReferenceAttributeName))
         {
             m_sReferringControls = _rValue;
             return true;
@@ -1204,8 +1204,8 @@ namespace xmloff
 
     bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
     {
-        static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR));
-        if (_rLocalName == s_sEchoCharAttributeName)
+        static const char * s_sEchoCharAttributeName = OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR);
+        if (_rLocalName.equalsAscii(s_sEchoCharAttributeName))
         {
             // need a special handling for the EchoChar property
             PropertyValue aEchoChar;
@@ -1947,16 +1947,16 @@ namespace xmloff
     bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
     {
         // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them)
-        static const OUString s_sMasterFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields));
-        static const OUString s_sDetailFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels));
+        static const char* s_sMasterFieldsAttributeName = OAttributeMetaData::getFormAttributeName(faMasterFields);
+        static const char* s_sDetailFieldsAttributeName = OAttributeMetaData::getFormAttributeName(faDetailFiels);
 
-        if ( s_sMasterFieldsAttributeName == _rLocalName )
+        if ( _rLocalName.equalsAscii(s_sMasterFieldsAttributeName) )
         {
             implTranslateStringListProperty(PROPERTY_MASTERFIELDS, _rValue);
             return true;
         }
 
-        if ( s_sDetailFieldsAttributeName == _rLocalName )
+        if ( _rLocalName.equalsAscii(s_sDetailFieldsAttributeName) )
         {
             implTranslateStringListProperty(PROPERTY_DETAILFIELDS, _rValue);
             return true;
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 8b13c07f4f5e..6fa19a35da2f 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -482,7 +482,7 @@ namespace xmloff
 
         OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds )
         {
-            static const OUString sControlIdBase(  "control"  );
+            static const char sControlIdBase[] = "control";
             OUString sControlId = sControlIdBase;
 
             size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() );