convert include/svx/svdotext.hxx from String to OUString

Change-Id: I21f775444ce2b125b14abee7e6a766bff9353245

3 files changed, 12 insertions, 12 deletions

diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index c298ecc97116..4ffc9fc1a156 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -319,11 +319,11 @@ public:
     // werden, um eine Datei in ein Textobjekt zu laden (ohne Verknuepfung).
     // TextLinks koennen nicht editiert werden (allenfalls spaeter mal ReadOnly).
     // Eine Attributierung kann nur am Textrahmen vollzogen werden.
-    void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
+    void SetTextLink(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet);
     void ReleaseTextLink();
     bool IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; }
     bool ReloadLinkedText(bool bForceLoad = false);
-    bool LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
+    bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet);
 
     virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
     virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
@@ -362,10 +362,10 @@ public:
 
     void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; }
     bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
-    void NbcSetText(const String& rStr);
-    void SetText(const String& rStr);
-    void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
-    void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
+    void NbcSetText(const OUString& rStr);
+    void SetText(const OUString& rStr);
+    void NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
+    void SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
 
     // FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt!
     virtual const Size& GetTextSize() const;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 64cdc5b22942..86828e8fbabe 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -226,7 +226,7 @@ void SdrTextObj::FitFrameToTextSize()
     }
 }
 
-void SdrTextObj::NbcSetText(const XubString& rStr)
+void SdrTextObj::NbcSetText(const OUString& rStr)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
@@ -240,7 +240,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
     bTextSizeDirty=sal_False;
 }
 
-void SdrTextObj::SetText(const XubString& rStr)
+void SdrTextObj::SetText(const OUString& rStr)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     NbcSetText(rStr);
@@ -249,7 +249,7 @@ void SdrTextObj::SetText(const XubString& rStr)
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 }
 
-void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
+void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
@@ -263,7 +263,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16
     bTextSizeDirty=sal_False;
 }
 
-void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
+void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     NbcSetText(rInput,rBaseURL,eFormat);
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 1829b90de366..f6c61c377a03 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -129,7 +129,7 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const
 }
 
 
-void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet)
+void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet)
 {
     if(eCharSet == RTL_TEXTENCODING_DONTKNOW)
         eCharSet = osl_getThreadTextEncoding();
@@ -205,7 +205,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
     return bRet;
 }
 
-bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
+bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterName*/, rtl_TextEncoding eCharSet)
 {
     INetURLObject   aFileURL( rFileName );
     bool            bRet = false;