More on bool & string conversions.

sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx

@@ -158,7 +158,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat
 #endif
     SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true);
     WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS);
-    String sValue;
+    rtl::OUString sValue;
     static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewString(sValue);
     WriteCell(static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewCell(), sValue);
 }
@@ -177,9 +177,9 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc
                 SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true);
                 if (static_cast<const ScChangeActionContent*>(pDeletedAction)->IsTopContent() && pDeletedAction->IsDeletedIn())
                 {
-                    String sValue;
+                    rtl::OUString sValue;
                     pContentAction->GetNewString(sValue);
-                     WriteCell(pContentAction->GetNewCell(), sValue);
+                    WriteCell(pContentAction->GetNewCell(), sValue);
                 }
             }
             else
@@ -445,7 +445,7 @@ void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction)
         if (pPrevAction)
             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pPrevAction->GetActionNumber()));
         SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, true, true);
-        String sValue;
+        rtl::OUString sValue;
         static_cast<ScChangeActionContent*>(pAction)->GetOldString(sValue);
         WriteCell(static_cast<ScChangeActionContent*>(pAction)->GetOldCell(), sValue);
     }

sc/source/ui/docshell/docsh3.cxx

@@ -1021,7 +1021,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
 
                             OSL_ENSURE( aSourceRange.aStart == aSourceRange.aEnd, "huch?" );
                             ScAddress aPos = aSourceRange.aStart;
-                            String aValue;
+                            rtl::OUString aValue;
                             ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue );
                             sal_uInt8 eMatrix = MM_NONE;
                             const ScBaseCell* pCell = ((const ScChangeActionContent*)pSourceAction)->GetNewCell();
@@ -1039,8 +1039,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                                     ((const ScFormulaCell*)pCell)->GetMatColsRows( nCols, nRows );
                                     aSourceRange.aEnd.SetCol( aPos.Col() + nCols - 1 );
                                     aSourceRange.aEnd.SetRow( aPos.Row() + nRows - 1 );
-                                    aValue.Erase( 0, 1 );
-                                    aValue.Erase( aValue.Len()-1, 1 );
+                                    aValue = aValue.copy(1, aValue.getLength()-2); // remove the 1st and last characters.
                                     GetDocFunc().EnterMatrix( aSourceRange,
                                         NULL, NULL, aValue, false, false,
                                         EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );

sc/source/ui/miscdlgs/acredlin.cxx

@@ -696,7 +696,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
 
     if(nSpecial==RD_SPECIAL_CONTENT)
     {
-        pScChangeAction->GetOldString(a2String);
+        rtl::OUString aTmp;
+        pScChangeAction->GetOldString(aTmp);
+        a2String = aTmp;
         if(a2String.Len()==0) a2String=aStrEmpty;
 
         //aString+="\'";
@@ -708,7 +710,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
     }
     else
     {
-        pScChangeAction->GetNewString(a2String);
+        rtl::OUString aTmp;
+        pScChangeAction->GetNewString(aTmp);
+        a2String = aTmp;
         if(a2String.Len()==0)
         {
             a2String=aStrEmpty;