XubString->OUString

Change-Id: I9ccb06134dfadd9bf1ecb8e5edcd24c02980b754

3 files changed, 10 insertions, 10 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 0246cbeaa47e..3bb562d8612c 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -452,7 +452,7 @@ public:
     virtual void    ParagraphHeightChanged( sal_Int32 nPara );
 
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,
+        const Point& rStartPos, const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,
         const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
@@ -470,7 +470,7 @@ public:
         bool bEndOfParagraph,
         const Color& rOverlineColor,
         const Color& rTextLineColor);
-    virtual String  GetUndoComment( sal_uInt16 nUndoId ) const;
+    virtual OUString  GetUndoComment( sal_uInt16 nUndoId ) const;
     virtual sal_Bool    FormattingParagraph( sal_Int32 nPara );
     virtual sal_Bool    SpellNextDocument();
     virtual void    FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos );
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 1eaec52c4b7a..37a0f5ddcc2d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -115,7 +115,7 @@ public:
     void            SetInsertMode( sal_Bool bInsert );
 
     void            ReplaceSelected( const String& rStr );
-    String          GetSelected();
+    OUString        GetSelected();
     void            DeleteSelected();
 
     sal_uInt16          GetSelectedScriptType() const;
@@ -134,7 +134,7 @@ public:
 
     Cursor*         GetCursor() const;
 
-    void            InsertText( const String& rNew, sal_Bool bSelect = sal_False );
+    void            InsertText( const OUString& rNew, sal_Bool bSelect = sal_False );
 
     sal_Bool            PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
 
@@ -173,7 +173,7 @@ public:
 
     EditTextObject* CreateTextObject();
     void            InsertText( const EditTextObject& rTextObject );
-    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, sal_Bool bUseSpecial );
+    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, sal_Bool bUseSpecial );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetTransferable();
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7336870b41fc..ab67096d4644 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -717,11 +717,11 @@ public:
     OutlinerView*   GetView( size_t nIndex ) const;
     size_t          GetViewCount() const;
 
-    Paragraph*      Insert( const String& rText, sal_Int32 nAbsPos = EE_PARA_APPEND, sal_Int16 nDepth = 0 );
+    Paragraph*      Insert( const OUString& rText, sal_Int32 nAbsPos = EE_PARA_APPEND, sal_Int16 nDepth = 0 );
     void            SetText( const OutlinerParaObject& );
     void            AddText( const OutlinerParaObject& );
-    void            SetText( const String& rText, Paragraph* pParagraph );
-    String          GetText( Paragraph* pPara, sal_Int32 nParaCount=1 ) const;
+    void            SetText( const OUString& rText, Paragraph* pParagraph );
+    OUString        GetText( Paragraph* pPara, sal_Int32 nParaCount=1 ) const;
 
     OutlinerParaObject* CreateParaObject( sal_Int32 nStartPara = 0, sal_Int32 nParaCount = EE_PARA_ALL ) const;
 
@@ -864,7 +864,7 @@ public:
     void            StripPortions();
 
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+        const Point& rStartPos, const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
         const sal_Int32* pDXArray, const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
@@ -931,7 +931,7 @@ public:
     void            QuickInsertLineBreak( const ESelection& rSel );
 
     // Only for EditEngine mode
-    void            QuickInsertText( const String& rText, const ESelection& rSel );
+    void            QuickInsertText( const OUString& rText, const ESelection& rSel );
     void            QuickDelete( const ESelection& rSel );
     void            QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
     void            QuickFormatDoc( sal_Bool bFull = sal_False );