diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-30 17:42:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:20 +0200 |
| commit | aceaa880115bb55391a8cc3622970b74436139d0 (patch) | |
| tree | c30946a6d1fc4addb9fbdad18b4e4d2c215b5e4e /svx/source | |
| parent | 1e110338a1917504a79aa8250a93e0dc4641e448 (diff) | |
convert include/svx/svdotext.hxx from String to OUString
Change-Id: I21f775444ce2b125b14abee7e6a766bff9353245
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
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; |