String to OUString

Change-Id: I6cff1659b0bacef0bed90fb9767513018a7eeba7

7 files changed, 9 insertions, 9 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a71b21aa17f3..dff338529a91 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1565,7 +1565,7 @@ public:
                                     const bool bNum,
                                     const bool bOutline,
                                     int nNonEmptyAllowed,
-                                    String& sListId,
+                                    OUString& sListId,
                                     const bool bInvestigateStartNode = false );
 
     /// Paragraphs without numbering but with indents.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a8d0d727d3ab..d1eb77b779b7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -545,7 +545,7 @@ public:
                                     const bool bNum,
                                     const bool bOutline,
                                     int nNonEmptyAllowed,
-                                    String& sListId );
+                                    OUString& sListId );
 
     /** Undo.
      Maintain UndoHistory in Document.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4903d25fc57b..2a3105fa70dd 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1205,7 +1205,7 @@ namespace
     {
         SwNumRule* pReplaceNumRule;
         bool bCreateNewList;
-        String sListId;
+        OUString sListId;
 
         ListStyleData()
             : pReplaceNumRule( 0 ),
@@ -1539,7 +1539,7 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                                         const bool bNum,
                                         const bool bOutline,
                                         int nNonEmptyAllowed,
-                                        String& sListId,
+                                        OUString& sListId,
                                         const bool bInvestigateStartNode)
 {
     const SwNumRule * pResult = NULL;
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index e0b0d7a509bc..5b695921deaf 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -920,7 +920,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // First search for non-outline numbering list. Then search for non-outline
     // bullet list.
     // Keep also the <ListId> value for possible propagation.
-    String aListIdToPropagate;
+    OUString aListIdToPropagate;
     const SwNumRule* pNumRuleToPropagate =
         pDoc->SearchNumRule( rPos, false, true, false, 0, aListIdToPropagate, true );
     if ( !pNumRuleToPropagate )
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 282ed26928c5..cd0e1425f9e5 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -830,7 +830,7 @@ const SwNumRule * SwEditShell::SearchNumRule( const bool bForward,
                                               const bool bNum,
                                               const bool bOutline,
                                               int nNonEmptyAllowed,
-                                              String& sListId )
+                                              OUString& sListId )
 {
     return GetDoc()->SearchNumRule( *(bForward ? GetCrsr()->End() : GetCrsr()->Start()),
                                     bForward, bNum, bOutline, nNonEmptyAllowed,
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 902a885ae8c3..c018b5f15021 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1066,7 +1066,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         break;
         case FN_NUM_CONTINUE:
         {
-            String sContinuedListId;
+            OUString sContinuedListId;
             const SwNumRule* pRule =
                 rWrtSh.SearchNumRule( false, true, false, -1, sContinuedListId );
             // #i86492#
@@ -1680,7 +1680,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 {
                     // #i86492#
                     // Search also for bullet list
-                    String aDummy;
+                    OUString aDummy;
                     const SwNumRule* pRule =
                             rSh.SearchNumRule( false, true, false, -1, aDummy );
                     if ( !pRule )
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 0cda8cfe1695..c87aaa1f6493 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1139,7 +1139,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
     }
 
     // Search for a previous numbering/bullet rule to continue it.
-    String sContinuedListId;
+    OUString sContinuedListId;
     if ( !pNumRule )
     {
         pNumRule = GetDoc()->SearchNumRule( *GetCrsr()->GetPoint(),