String to OUString

Change-Id: I1c5c6478d91d97092dfa322f31e9376e09063e24
Reviewed-on: https://gerrit.libreoffice.org/5622
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>

2 files changed, 17 insertions, 28 deletions

diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 6030b7e9d340..c182dc3b958c 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -43,7 +43,7 @@ protected:
 public:
     SwXTextFieldMasters(SwDoc* pDoc);
 
-    static sal_Bool getInstanceName(const SwFieldType& rFldType, String& rName);
+    static sal_Bool getInstanceName(const SwFieldType& rFldType, OUString& rName);
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 6ef78727d29e..db9e2a34a3d3 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -796,10 +796,10 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     SwFieldType* pType = GetFldType(true);
     if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_INSTANCE_NAME)) )
     {
-        String sName;
+        OUString sName;
         if(pType)
             SwXTextFieldMasters::getInstanceName(*pType, sName);
-        aRet <<= OUString(sName);
+        aRet <<= sName;
     }
     else if(pType)
     {
@@ -2659,48 +2659,37 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
 }
 
 sal_Bool SwXTextFieldMasters::getInstanceName(
-    const SwFieldType& rFldType, String& rName)
+    const SwFieldType& rFldType, OUString& rName)
 {
-    sal_Bool bRet = sal_True;
+    OUString sField;
+
     switch( rFldType.Which() )
     {
     case RES_USERFLD:
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER_CC ));
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "User."));
-        rName += rFldType.GetName();
+        sField = "User." + rFldType.GetName();
         break;
     case RES_DDEFLD:
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER_CC ));
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "DDE."));
-        rName += rFldType.GetName();
+        sField = "DDE." + rFldType.GetName();
         break;
 
     case RES_SETEXPFLD:
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER_CC ));
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "SetExpression."));
-        rName += String( SwStyleNameMapper::GetSpecialExtraProgName( rFldType.GetName() ) );
+        sField = "SetExpression." + SwStyleNameMapper::GetSpecialExtraProgName( rFldType.GetName() );
         break;
 
     case RES_DBFLD:
-        {
-            rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER_CC ));
-            rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "DataBase."));
-            String sDBName(rFldType.GetName());
-            sDBName.SearchAndReplaceAll(DB_DELIM, '.');
-            rName += sDBName;
-        }
+        sField = "DataBase." + rFldType.GetName().replaceAll(OUString(DB_DELIM), ".");
         break;
 
     case RES_AUTHORITY:
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER_CC ));
-        rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "Bibliography"));
+        sField = "Bibliography";
         break;
 
     default:
-        bRet = sal_False;
+        return sal_False;
     }
 
-    return bRet;
+    rName += COM_TEXT_FLDMASTER_CC + sField;
+    return sal_True;
 }
 
 uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
@@ -2713,8 +2702,8 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
     const SwFldTypes* pFldTypes = GetDoc()->GetFldTypes();
     sal_uInt16 nCount = pFldTypes->size();
 
-    std::vector<String*> aFldNames;
-    String* pString = new String();
+    std::vector<OUString*> aFldNames;
+    OUString* pString = new OUString();
 
     for( sal_uInt16 i = 0; i < nCount; i++)
     {
@@ -2723,7 +2712,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
         if (SwXTextFieldMasters::getInstanceName(rFldType, *pString))
         {
             aFldNames.push_back(pString);
-            pString = new String();
+            pString = new OUString();
         }
     }
     delete pString;