convert sw/source/core/docnode/*.cxx from String to OUString

Change-Id: I1c9e569b41f953510160cefee626ee7c9440c3c0

5 files changed, 6 insertions, 7 deletions

diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 9cd58f543d62..7a8f76cba5fa 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1008,7 +1008,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 int aNumRuleState = SFX_ITEM_UNKNOWN;
                 SwNumRuleItem aNumRuleItem;
                 int aListIdState = SFX_ITEM_UNKNOWN;
-                SfxStringItem aListIdItem( RES_PARATR_LIST_ID, String() );
+                SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() );
                 {
                     const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
                     if (pAttrSet != NULL)
@@ -1153,7 +1153,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             int aNumRuleState = SFX_ITEM_UNKNOWN;
             SwNumRuleItem aNumRuleItem;
             int aListIdState = SFX_ITEM_UNKNOWN;
-            SfxStringItem aListIdItem( RES_PARATR_LIST_ID, String() );
+            SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() );
             {
                 const SfxItemSet* pAttrSet = pDestTxtNd->GetpSwAttrSet();
                 if (pAttrSet != NULL)
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 55baa790e871..b982ac4ca4ad 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -677,8 +677,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     // The LinkFileName could only consist of separators
-    String sCompareString = OUString(sfx2::cTokenSeparator);
-    sCompareString += sfx2::cTokenSeparator;
+    OUString sCompareString = OUString(sfx2::cTokenSeparator) + OUString(sfx2::cTokenSeparator);
     const bool bUpdate =
            (!pSection->IsLinkType() && rNewData.IsLinkType())
             ||  (!rNewData.GetLinkFileName().isEmpty()
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4441bfa8b386..da704fa87632 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -346,7 +346,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
             pColArr = 0;
     }
 
-    String aTblName = GetUniqueTblName();
+    OUString aTblName = GetUniqueTblName();
 
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 22216e4280b0..9d6dbb4434d9 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -191,7 +191,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
         if( !bRestPersData && !bSavePersData && pDestDoc )
             bSavePersData = bRestPersData = sal_True;
 
-        String sNumRule;
+        OUString sNumRule;
         SwNodeIndex aInsPos( rInsPos );
         for( sal_uLong n = 0; n < nSz; n++ )
         {
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 16bd2ff7d877..3de915c651ba 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -395,7 +395,7 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
 
     if( GetObj() )
     {
-        String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
+        OUString aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
         uno::Any aValue;
         GetObj()->GetData( aValue, aMimeType, !IsSynchron() && bWaitForData );