String to OUString

Change-Id: I8c51db8fce8c5eea1ac7bd5751aa7f3212ef1166
Reviewed-on: https://gerrit.libreoffice.org/5790
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 22 insertions, 22 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index c7debc470e4a..bcad84dcf3e9 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -150,7 +150,7 @@ private:
 
     EDITENG_DLLPRIVATE EditSelection InsertText(
         com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable >& rxDataObj,
-        const String& rBaseURL, const EditPaM& rPaM, bool bUseSpecial);
+        const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial);
 
     EDITENG_DLLPRIVATE EditPaM EndOfWord(
         const EditPaM& rPaM, sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES);
@@ -531,7 +531,7 @@ public:
         ContentNode* pLeft, ContentNode* pRight, bool bBackward = false);
 
     EditPaM InsertField(const EditSelection& rEditSelection, const SvxFieldItem& rFld);
-    EditPaM InsertText(const EditSelection& aCurEditSelection, const String& rStr);
+    EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
     EditSelection InsertText(const EditTextObject& rTextObject, const EditSelection& rSel);
     EditPaM InsertParaBreak(
         const EditSelection& rEditSelection, bool bKeepEndingAttribs = true);
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index c41f54b6e0e2..17b8df88c8bd 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -35,7 +35,7 @@ public:
 
     virtual sal_Int32       GetParagraphCount() const;
     virtual sal_uInt16      GetTextLen( sal_Int32 nParagraph ) const;
-    virtual String          GetText( const ESelection& rSel ) const;
+    virtual OUString        GetText( const ESelection& rSel ) const;
     virtual SfxItemSet      GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
     virtual SfxItemSet      GetParaAttribs( sal_Int32 nPara ) const;
     virtual void            SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
@@ -47,7 +47,7 @@ public:
      virtual sal_uInt16         GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
     virtual sal_uInt16          GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const;
 
-    virtual void            QuickInsertText( const String& rText, const ESelection& rSel );
+    virtual void            QuickInsertText( const OUString& rText, const ESelection& rSel );
     virtual void            QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     virtual void            QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
     virtual void            QuickInsertLineBreak( const ESelection& rSel );
@@ -76,7 +76,7 @@ public:
     virtual sal_uInt16          GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
 
     virtual sal_Bool        Delete( const ESelection& );
-    virtual sal_Bool        InsertText( const String&, const ESelection& );
+    virtual sal_Bool        InsertText( const OUString&, const ESelection& );
     virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
     virtual sal_Int16       GetDepth( sal_Int32 nPara ) const;
     virtual sal_Bool        SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
@@ -86,7 +86,7 @@ public:
     // implementation functions for XParagraphAppend and XTextPortionAppend
     // (not needed for accessibility, only for new import API)
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet );
+    virtual sal_uInt16  AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet );
 
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 07c7567590b6..8c703fef0ff3 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -142,7 +142,7 @@ public:
 
     virtual sal_Int32   GetParagraphCount() const = 0;
     virtual sal_uInt16  GetTextLen( sal_Int32 nParagraph ) const = 0;
-    virtual String      GetText( const ESelection& rSel ) const = 0;
+    virtual OUString    GetText( const ESelection& rSel ) const = 0;
     virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
     virtual SfxItemSet  GetParaAttribs( sal_Int32 nPara ) const = 0;
     virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0;
@@ -152,7 +152,7 @@ public:
     virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0;
     virtual sal_uInt16      GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const = 0;
 
-    virtual void        QuickInsertText( const String& rText, const ESelection& rSel ) = 0;
+    virtual void        QuickInsertText( const OUString& rText, const ESelection& rSel ) = 0;
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) = 0;
     virtual void        QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0;
     virtual void        QuickInsertLineBreak( const ESelection& rSel ) = 0;
@@ -166,7 +166,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph() = 0;
-    virtual xub_StrLen  AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet ) = 0;
+    virtual sal_uInt16  AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0;
 
     // XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource) = 0;
@@ -394,7 +394,7 @@ public:
 
          @return sal_True if text has been successfully inserted
       */
-    virtual sal_Bool        InsertText( const String& rText, const ESelection& rSel ) = 0;
+    virtual sal_Bool        InsertText( const OUString& rText, const ESelection& rSel ) = 0;
 
      /** Updates the formatting
 
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 6a7d7bf111b2..a80a5683e157 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -37,7 +37,7 @@ public:
 
     virtual sal_Int32   GetParagraphCount() const;
     virtual sal_uInt16  GetTextLen( sal_Int32 nParagraph ) const;
-    virtual String      GetText( const ESelection& rSel ) const;
+    virtual OUString    GetText( const ESelection& rSel ) const;
     virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
     virtual SfxItemSet  GetParaAttribs( sal_Int32 nPara ) const;
     virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
@@ -47,7 +47,7 @@ public:
     virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
     virtual sal_uInt16      GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const;
 
-    virtual void        QuickInsertText( const String& rText, const ESelection& rSel );
+    virtual void        QuickInsertText( const OUString& rText, const ESelection& rSel );
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     virtual void        QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
     virtual void        QuickInsertLineBreak( const ESelection& rSel );
@@ -74,7 +74,7 @@ public:
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;
     virtual sal_uInt16          GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
-    virtual sal_Bool        InsertText( const String&, const ESelection& );
+    virtual sal_Bool        InsertText( const OUString&, const ESelection& );
     virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
     virtual sal_Int16       GetDepth( sal_Int32 nPara ) const;
     virtual sal_Bool        SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
@@ -83,7 +83,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet );
+    virtual sal_uInt16  AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 7b88da3455db..a8b1057cea1a 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -55,7 +55,7 @@ public:
 
     virtual sal_Int32   GetParagraphCount() const;
     virtual sal_uInt16  GetTextLen( sal_Int32 nParagraph ) const;
-    virtual String      GetText( const ESelection& rSel ) const;
+    virtual OUString    GetText( const ESelection& rSel ) const;
     virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
     virtual SfxItemSet  GetParaAttribs( sal_Int32 nPara ) const;
     virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
@@ -65,7 +65,7 @@ public:
     virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
     virtual sal_uInt16      GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const;
 
-    virtual void        QuickInsertText( const String& rText, const ESelection& rSel );
+    virtual void        QuickInsertText( const OUString& rText, const ESelection& rSel );
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     virtual void        QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
     virtual void        QuickInsertLineBreak( const ESelection& rSel );
@@ -95,7 +95,7 @@ public:
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nPara, sal_uInt16 nLine ) const;
     virtual sal_uInt16          GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
-    virtual sal_Bool        InsertText( const String&, const ESelection& );
+    virtual sal_Bool        InsertText( const OUString&, const ESelection& );
     virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
     virtual sal_Int16       GetDepth( sal_Int32 nPara ) const;
     virtual sal_Bool        SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
@@ -112,7 +112,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet );
+    virtual sal_uInt16  AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 394079ca573d..dd56df80641d 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -181,7 +181,7 @@ public:
     // SvxTextForwarder
     virtual sal_Int32       GetParagraphCount() const;
     virtual sal_uInt16      GetTextLen( sal_Int32 nParagraph ) const;
-    virtual String          GetText( const ESelection& rSel ) const;
+    virtual OUString        GetText( const ESelection& rSel ) const;
     virtual SfxItemSet      GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
     virtual SfxItemSet      GetParaAttribs( sal_Int32 nPara ) const;
     virtual void            SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
@@ -193,7 +193,7 @@ public:
 
     virtual SfxItemPool*    GetPool() const;
 
-    virtual void            QuickInsertText( const String& rText, const ESelection& rSel );
+    virtual void            QuickInsertText( const OUString& rText, const ESelection& rSel );
     virtual void            QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     virtual void            QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
     virtual void            QuickInsertLineBreak( const ESelection& rSel );
@@ -220,7 +220,7 @@ public:
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;
     virtual sal_uInt16      GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
-    virtual sal_Bool        InsertText( const String&, const ESelection& );
+    virtual sal_Bool        InsertText( const OUString&, const ESelection& );
     virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
     virtual sal_Int16       GetDepth( sal_Int32 nPara ) const;
     virtual sal_Bool        SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
@@ -229,7 +229,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet );
+    virtual sal_uInt16  AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };