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 /include | |
| parent | 1e110338a1917504a79aa8250a93e0dc4641e448 (diff) | |
convert include/svx/svdotext.hxx from String to OUString
Change-Id: I21f775444ce2b125b14abee7e6a766bff9353245
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdotext.hxx | 12 |
1 files changed, 6 insertions, 6 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; |