convert include/editeng/outliner.hxx from String to OUString

Change-Id: I53a9f334845e163625ed245859bdeb030ae61baa

4 files changed, 15 insertions, 15 deletions

diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 83b83c97d131..91e7cb07749c 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -193,7 +193,7 @@ OUString Outliner::GetWordDelimiters() const
     return pEditEngine->GetWordDelimiters();
 }
 
-String Outliner::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
+OUString Outliner::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetWord( nPara, nIndex );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 49465fbd69e8..80ef22b4c331 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1151,7 +1151,7 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara )
     }
 }
 
-sal_uLong Outliner::Read( SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -1813,13 +1813,13 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_u
     }
 }
 
-void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, const SvxFont& rFont,
+void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, const SvxFont& rFont,
     sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
     const Color& rOverlineColor, const Color& rTextLineColor)
 {
     if(aDrawPortionHdl.IsSet())
     {
-        DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.Len(), rFont, nPara, nIndex, NULL, NULL,
+        DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nIndex, NULL, NULL,
             NULL, NULL, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false);
 
         aDrawPortionHdl.Call( &aInfo );
@@ -2051,17 +2051,17 @@ void Outliner::SetFlatMode( sal_Bool bFlat )
     }
 }
 
-String Outliner::ImplGetBulletText( sal_Int32 nPara )
+OUString Outliner::ImplGetBulletText( sal_Int32 nPara )
 {
-        String aRes;
+    OUString aRes;
     Paragraph* pPara = pParaList->GetParagraph( nPara );
-        if (pPara)
-        {
+    if (pPara)
+    {
     // Enable optimization again ...
 //  if( pPara->nFlags & PARAFLAG_SETBULLETTEXT )
         ImplCalcBulletText( nPara, sal_False, sal_False );
-                aRes = pPara->GetText();
-        }
+        aRes = pPara->GetText();
+    }
     return aRes;
 }
 
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 5534781f89e1..9e4e87eaaf7e 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1482,7 +1482,7 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
     pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
 }
 
-sal_uLong OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(OutlinerView,0);
     sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
@@ -1542,7 +1542,7 @@ sal_uInt16 OutlinerView::GetSelectedScriptType() const
     return pEditView->GetSelectedScriptType();
 }
 
-String OutlinerView::GetSurroundingText() const
+OUString OutlinerView::GetSurroundingText() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSurroundingText();
@@ -1585,7 +1585,7 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
 }
 
 
-void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText )
+void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUString &rSynonmText )
 {
     // get selection to use
     ESelection aCurSel( rEditView.GetSelection() );
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 9369d5633535..e566928cc0ca 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -198,7 +198,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa
         aBulletInfo.bVisible &&
         aBulletInfo.nType != SVX_NUM_BITMAP )
     {
-        mnIndex += aBulletInfo.aText.Len();
+        mnIndex += aBulletInfo.aText.getLength();
     }
 
     for( nCurrField=0; nCurrField < nFieldCount; ++nCurrField )
@@ -247,7 +247,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
         aBulletInfo.bVisible &&
         aBulletInfo.nType != SVX_NUM_BITMAP )
     {
-        sal_Int32 nBulletLen = aBulletInfo.aText.Len();
+        sal_Int32 nBulletLen = aBulletInfo.aText.getLength();
 
         if( nIndex < nBulletLen )
         {