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>

7 files changed, 29 insertions, 29 deletions

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index e3309d407d1a..e8b30c672c28 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -858,7 +858,7 @@ EditPaM EditEngine::InsertField(const EditSelection& rEditSelection, const SvxFi
     return pImpEditEngine->InsertField(rEditSelection, rFld);
 }
 
-EditPaM EditEngine::InsertText(const EditSelection& aCurEditSelection, const String& rStr)
+EditPaM EditEngine::InsertText(const EditSelection& aCurEditSelection, const OUString& rStr)
 {
     return pImpEditEngine->InsertText(aCurEditSelection, rStr);
 }
@@ -870,7 +870,7 @@ EditSelection EditEngine::InsertText(const EditTextObject& rTextObject, const Ed
 
 EditSelection EditEngine::InsertText(
     uno::Reference<datatransfer::XTransferable >& rxDataObj,
-    const String& rBaseURL, const EditPaM& rPaM, bool bUseSpecial)
+    const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial)
 {
     return pImpEditEngine->InsertText(rxDataObj, rBaseURL, rPaM, bUseSpecial);
 }
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 34075afb389f..9e43df306544 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -526,7 +526,7 @@ private:
 
     EditTextObject*     CreateTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 );
     EditSelection       InsertTextObject( const EditTextObject&, EditPaM aPaM );
-    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
+    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const OUString& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
 
     EditPaM             Clear();
     EditPaM             RemoveText();
@@ -548,7 +548,7 @@ private:
     EditPaM             ImpDeleteSelection(const EditSelection& rCurSel);
     EditPaM             ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttribs = true );
     EditPaM             ImpInsertParaBreak( const EditSelection& rEditSelection, bool bKeepEndingAttribs = true );
-    EditPaM             ImpInsertText(const EditSelection& aCurEditSelection, const String& rStr);
+    EditPaM             ImpInsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
     EditPaM             ImpInsertFeature(const EditSelection& rCurSel, const SfxPoolItem& rItem);
     void                ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo = 0 );
     void                ImpRemoveParagraph( sal_Int32 nPara );
@@ -758,7 +758,7 @@ public:
     void            SetText(const OUString& rText);
     EditPaM         DeleteSelected( EditSelection aEditSelection);
     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False );
-    EditPaM         InsertText(const EditSelection& aCurEditSelection, const String& rStr);
+    EditPaM         InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
     EditPaM         AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, Window* pFrameWin = NULL );
     EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
     EditPaM         InsertParaBreak( EditSelection aEditSelection );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 045835a242ae..b9d3103d9fd2 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -600,7 +600,7 @@ sal_Bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
     return sal_True;
 }
 
-EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const String& rStr)
+EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString& rStr)
 {
     EditPaM aPaM = ImpInsertText( aSel, rStr );
     return aPaM;
@@ -2640,7 +2640,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
     return aPaM;
 }
 
-EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const String& rStr)
+EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const OUString& rStr)
 {
     UndoActionStart( EDITUNDO_INSERT );
 
@@ -3470,7 +3470,7 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
     return xDataObj;
 }
 
-EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial )
+EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const OUString& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial )
 {
     EditSelection aNewSelection( rPaM );
 
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 8a1d71be40fb..9369d5633535 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -455,7 +455,7 @@ sal_uInt16 SvxAccessibleTextAdapter::GetTextLen( sal_Int32 nParagraph ) const
     return static_cast< sal_uInt16 >(aIndex.GetIndex());
 }
 
-String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
+OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -601,7 +601,7 @@ sal_uInt16 SvxAccessibleTextAdapter::GetItemState( sal_Int32 nPara, sal_uInt16 n
     return mrTextForwarder->GetItemState( nPara, nWhich );
 }
 
-void SvxAccessibleTextAdapter::QuickInsertText( const String& rText, const ESelection& rSel )
+void SvxAccessibleTextAdapter::QuickInsertText( const OUString& rText, const ESelection& rSel )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1063,7 +1063,7 @@ sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
     return mrTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) );
 }
 
-sal_Bool SvxAccessibleTextAdapter::InsertText( const String& rStr, const ESelection& rSel )
+sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1169,7 +1169,7 @@ void SvxAccessibleTextAdapter::AppendParagraph()
     OSL_FAIL( "not implemented" );
 }
 
-xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( sal_Int32, const String &, const SfxItemSet & )
+sal_uInt16 SvxAccessibleTextAdapter::AppendTextPortion( sal_Int32, const OUString &, const SfxItemSet & )
 {
     OSL_FAIL( "not implemented" );
     return 0;
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index ed926dc8381d..57d77fbe2836 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -56,7 +56,7 @@ sal_uInt16 SvxEditEngineForwarder::GetTextLen( sal_Int32 nParagraph ) const
     return rEditEngine.GetTextLen( nParagraph );
 }
 
-String SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
+OUString SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
 {
     return convertLineEnd(rEditEngine.GetText(rSel, LINEEND_LF), GetSystemLineEnd());
 }
@@ -127,7 +127,7 @@ void SvxEditEngineForwarder::GetPortions( sal_Int32 nPara, std::vector<sal_uInt1
     rEditEngine.GetPortions( nPara, rList );
 }
 
-void SvxEditEngineForwarder::QuickInsertText( const String& rText, const ESelection& rSel )
+void SvxEditEngineForwarder::QuickInsertText( const OUString& rText, const ESelection& rSel )
 {
     rEditEngine.QuickInsertText( rText, rSel );
 }
@@ -447,7 +447,7 @@ sal_Bool SvxEditEngineForwarder::Delete( const ESelection& rSelection )
     return sal_True;
 }
 
-sal_Bool SvxEditEngineForwarder::InsertText( const String& rStr, const ESelection& rSelection )
+sal_Bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
 {
     rEditEngine.QuickInsertText( rStr, rSelection );
     rEditEngine.QuickFormatDoc();
@@ -477,9 +477,9 @@ void SvxEditEngineForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxEditEngineForwarder::AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+sal_uInt16 SvxEditEngineForwarder::AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet & /*rSet*/ )
 {
-    xub_StrLen nLen = 0;
+    sal_uInt16 nLen = 0;
 
     sal_Int32 nParaCount = rEditEngine.GetParagraphCount();
     DBG_ASSERT( nPara < nParaCount, "paragraph index out of bounds" );
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 669cd20fcd6b..d07c68a97a3a 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -63,7 +63,7 @@ sal_uInt16 SvxOutlinerForwarder::GetTextLen( sal_Int32 nParagraph ) const
     return rOutliner.GetEditEngine().GetTextLen( nParagraph );
 }
 
-String SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
+OUString SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
 {
     //! GetText (ESelection) should probably also be in the Outliner
     // in the time beeing use as the hack for the EditEngine:
@@ -195,10 +195,10 @@ void SvxOutlinerForwarder::GetPortions( sal_Int32 nPara, std::vector<sal_uInt16>
     ((EditEngine&)rOutliner.GetEditEngine()).GetPortions( nPara, rList );
 }
 
-void SvxOutlinerForwarder::QuickInsertText( const String& rText, const ESelection& rSel )
+void SvxOutlinerForwarder::QuickInsertText( const OUString& rText, const ESelection& rSel )
 {
     flushCache();
-    if( rText.Len() == 0 )
+    if( rText.isEmpty() )
     {
         rOutliner.QuickDelete( rSel );
     }
@@ -444,7 +444,7 @@ sal_Bool SvxOutlinerForwarder::Delete( const ESelection& rSelection )
     return sal_True;
 }
 
-sal_Bool SvxOutlinerForwarder::InsertText( const String& rStr, const ESelection& rSelection )
+sal_Bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
 {
     flushCache();
     rOutliner.QuickInsertText( rStr, rSelection );
@@ -551,9 +551,9 @@ void SvxOutlinerForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxOutlinerForwarder::AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+sal_uInt16 SvxOutlinerForwarder::AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet & /*rSet*/ )
 {
-    xub_StrLen nLen = 0;
+    sal_uInt16 nLen = 0;
 
     EditEngine& rEditEngine = const_cast< EditEngine& >( rOutliner.GetEditEngine() );
     sal_Int32 nParaCount = rEditEngine.GetParagraphCount();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 9299b6d30fce..f04fa5565b3e 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2208,7 +2208,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
         sal_Int32 nPara = nParaCount - 1;
         SfxItemSet aSet( pTextForwarder->GetParaAttribs( nPara ) );
-        xub_StrLen nStart = pTextForwarder->AppendTextPortion( nPara, rText, aSet );
+        sal_uInt16 nStart = pTextForwarder->AppendTextPortion( nPara, rText, aSet );
         pEditSource->UpdateData();
         xub_StrLen nEnd   = pTextForwarder->GetTextLen( nPara );
 
@@ -2441,9 +2441,9 @@ sal_uInt16 SvxDummyTextSource::GetTextLen( sal_Int32 ) const
     return 0;
 }
 
-String SvxDummyTextSource::GetText( const ESelection& ) const
+OUString SvxDummyTextSource::GetText( const ESelection& ) const
 {
-    return String();
+    return OUString();
 }
 
 SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, sal_Bool ) const
@@ -2486,7 +2486,7 @@ SfxItemPool* SvxDummyTextSource::GetPool() const
     return NULL;
 }
 
-void SvxDummyTextSource::QuickInsertText( const String&, const ESelection& )
+void SvxDummyTextSource::QuickInsertText( const OUString&, const ESelection& )
 {
 }
 
@@ -2615,7 +2615,7 @@ sal_Bool SvxDummyTextSource::Delete( const ESelection& )
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::InsertText( const String&, const ESelection& )
+sal_Bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
 {
     return sal_False;
 }
@@ -2629,7 +2629,7 @@ void SvxDummyTextSource::AppendParagraph()
 {
 }
 
-xub_StrLen SvxDummyTextSource::AppendTextPortion( sal_Int32, const String &, const SfxItemSet & )
+sal_uInt16 SvxDummyTextSource::AppendTextPortion( sal_Int32, const OUString &, const SfxItemSet & )
 {
     return 0;
 }