String is now eradicated from the change track code.

sc/inc/chgtrack.hxx

@@ -396,7 +396,8 @@ public:
         rtl::OUString& rStr, ScDocument* pDoc,
         bool bSplitRange = false, bool bWarning = true ) const;
 
-    virtual void GetRefString( String&, ScDocument*, bool bFlag3D = false ) const;
+    virtual void GetRefString(
+        rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const;
 
                         // for DocumentMerge set old date of the other
                         // action, fetched by GetDateTimeUTC
@@ -644,7 +645,8 @@ public:
         rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false,
         bool bWarning = true ) const;
 
-    virtual void GetRefString( String&, ScDocument*, bool bFlag3D = false ) const;
+    virtual void GetRefString(
+        rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const;
 };
 
 
@@ -814,7 +816,7 @@ public:
                             { pPrevContent = p; }
 
     // don't use:
-    // assigns String / creates forumula cell
+    // assigns string / creates forumula cell
     void SetOldValue( const rtl::OUString& rOld, ScDocument* pDoc );
     void SetNewValue( const rtl::OUString& rNew, ScDocument* pDoc );
 
@@ -825,7 +827,8 @@ public:
     virtual void GetDescription(
         rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const;
 
-    virtual void GetRefString( String&, ScDocument*, bool bFlag3D = false ) const;
+    virtual void GetRefString(
+        rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const;
 
     static  ScChangeActionContentCellType   GetContentCellType( const ScBaseCell* );
 
@@ -1173,8 +1176,8 @@ public:
                                     sal_uLong nOldFormat = 0,
                                     sal_uLong nNewFormat = 0 );
 
-                                // Only use the following two if there is no different solution!
-                                // (Assign String for NewValue or creation of a formula respectively)
+    // Only use the following two if there is no different solution! (Assign
+    // string for NewValue or creation of a formula respectively)
 
     SC_DLLPUBLIC void AppendInsert( const ScRange& );
 

sc/source/core/tool/chgtrack.cxx

@@ -617,7 +617,7 @@ void ScChangeAction::SetComment( const rtl::OUString& rStr )
 }
 
 void ScChangeAction::GetRefString(
-    String& rStr, ScDocument* pDoc, bool bFlag3D ) const
+    rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const
 {
     rStr = GetRefString( GetBigRange(), pDoc, bFlag3D );
 }
@@ -1289,14 +1289,17 @@ void ScChangeActionMove::GetDescription(
 
 
 void ScChangeActionMove::GetRefString(
-    String& rStr, ScDocument* pDoc, bool bFlag3D ) const
+    rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const
 {
     if ( !bFlag3D )
         bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() );
-    rStr = ScChangeAction::GetRefString( GetFromRange(), pDoc, bFlag3D );
-    rStr += ',';
-    rStr += ' ';
-    rStr += ScChangeAction::GetRefString( GetBigRange(), pDoc, bFlag3D );
+
+    rtl::OUStringBuffer aBuf;
+    aBuf.append(ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D));
+    aBuf.append(sal_Unicode(','));
+    aBuf.append(sal_Unicode(' '));
+    aBuf.append(ScChangeAction::GetRefString(GetBigRange(), pDoc, bFlag3D));
+    rStr = aBuf.makeStringAndClear(); // overwrite existing string value.
 }
 
 
@@ -1493,7 +1496,7 @@ void ScChangeActionContent::SetNewCell(
     pNewCell = pCell;
     ScChangeActionContent::SetCell( aNewValue, pNewCell, 0, pDoc );
 
-    // #i40704# allow to set formatted text here - don't call SetNewValue with String from XML filter
+    // #i40704# allow to set formatted text here - don't call SetNewValue with string from XML filter
     if (!rFormatted.isEmpty())
         aNewValue = rFormatted;
 }
@@ -1551,9 +1554,7 @@ void ScChangeActionContent::GetDescription(
     rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL);
 
     rtl::OUString aTmpStr;
-    String aFoo;
-    GetRefString(aFoo, pDoc);
-    aTmpStr = aFoo;
+    GetRefString(aTmpStr, pDoc);
 
     sal_Int32 nPos = 0;
     nPos = aRsc.indexOfAsciiL("#1", 2, nPos);
@@ -1592,7 +1593,7 @@ void ScChangeActionContent::GetDescription(
 
 
 void ScChangeActionContent::GetRefString(
-    String& rStr, ScDocument* pDoc, bool bFlag3D ) const
+    rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const
 {
     sal_uInt16 nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 );
     if ( nFlags )
@@ -1617,8 +1618,12 @@ void ScChangeActionContent::GetRefString(
         aTmpAddress.Format( rStr, nFlags, pDoc, pDoc->GetAddressConvention() );
         if ( IsDeletedIn() )
         {
-            rStr.Insert( '(', 0 );
-            rStr += ')';
+            // Insert the parentheses.
+            rtl::OUStringBuffer aBuf;
+            aBuf.append(sal_Unicode('('));
+            aBuf.append(rStr);
+            aBuf.append(sal_Unicode(')'));
+            rStr = aBuf.makeStringAndClear();
         }
     }
     else
@@ -2340,10 +2345,11 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI
         const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions();
         size_t nOldCount = maUserCollection.size();
 
-        String aStr( rUserOptions.GetFirstName() );
-        aStr += ' ';
-        aStr += (String)rUserOptions.GetLastName();
-        SetUser( aStr );
+        rtl::OUStringBuffer aBuf;
+        aBuf.append(rUserOptions.GetFirstName());
+        aBuf.append(sal_Unicode(' '));
+        aBuf.append(rUserOptions.GetLastName());
+        SetUser(aBuf.makeStringAndClear());
 
         if ( maUserCollection.size() != nOldCount )
         {

sc/source/ui/miscdlgs/acredlin.cxx

@@ -392,7 +392,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(
     String aUser=pScChangeAction->GetUser();
     DateTime aDateTime=pScChangeAction->GetDateTime();
 
-    String aRefStr;
+    rtl::OUString aRefStr;
     ScChangeActionType eType=pScChangeAction->GetType();
     rtl::OUStringBuffer aBuf;
     rtl::OUString aDesc;
@@ -569,7 +569,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(
     if(bFlag)
     {
 
-        String aRefStr;
+        rtl::OUString aRefStr;
         ScChangeActionType eType=pScChangeAction->GetType();
         String aString;
         rtl::OUString aDesc;
@@ -688,7 +688,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
             bFlag=true;
     }
 
-    String aRefStr;
+    rtl::OUString aRefStr;
     String aString;
     String a2String;
     String aDesc;