diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 08:43:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 10:26:53 +0100 |
| commit | 9cbafe9085b226d0d109fed85d67ba4e0895974e (patch) | |
| tree | 803236ecf66bfe10dfb579ff092607276e4f8e8a /include/editeng | |
| parent | Implement setTimestamp. (firebird-sdbc) (diff) | |
| download | core-9cbafe9085b226d0d109fed85d67ba4e0895974e.tar.gz core-9cbafe9085b226d0d109fed85d67ba4e0895974e.zip | |
XubString->OUString
Change-Id: I6db7b9e86ea6d17b5ba0a883136e0e4dbdd9e0b3
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/borderline.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/bulletitem.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/editeng.hxx | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index a7713b7edffb..fd91e16cdeea 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -136,7 +136,7 @@ namespace editeng { sal_Bool operator==( const SvxBorderLine &rCmp ) const; - String GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, + OUString GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl, sal_Bool bMetricStr = sal_False ) const; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index deb122f556d4..4ae8ade9ad17 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -89,7 +89,7 @@ public: virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const; - String GetFullText() const; + OUString GetFullText() const; sal_Unicode GetSymbol() const { return cSymbol; } String GetPrevText() const { return aPrevText; } String GetFollowText() const { return aFollowText; } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 3bb562d8612c..6fd91a453e1d 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -245,13 +245,13 @@ public: void SetMaxAutoPaperSize( const Size& rSz ); OUString GetText( LineEnd eEnd = LINEEND_LF ) const; - String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const; + OUString GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const; sal_uInt32 GetTextLen() const; sal_uInt32 GetTextHeight() const; sal_uInt32 GetTextHeightNTP() const; sal_uInt32 CalcTextWidth(); - String GetText( sal_Int32 nParagraph ) const; + OUString GetText( sal_Int32 nParagraph ) const; xub_StrLen GetTextLen( sal_Int32 nParagraph ) const; sal_uInt32 GetTextHeight( sal_Int32 nParagraph ) const; @@ -267,7 +267,7 @@ public: EPosition FindDocPosition( const Point& rDocPos ) const; Rectangle GetCharacterBounds( const EPosition& rPos ) const; - String GetWord( sal_Int32 nPara, xub_StrLen nIndex ); + OUString GetWord(sal_Int32 nPara, xub_StrLen nIndex); ESelection GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const; @@ -279,11 +279,11 @@ public: EditTextObject* CreateTextObject( const ESelection& rESelection ); void SetText( const EditTextObject& rTextObject ); - void RemoveParagraph( sal_Int32 nPara ); - void InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj ); - void InsertParagraph( sal_Int32 nPara, const String& rText); + void RemoveParagraph(sal_Int32 nPara); + void InsertParagraph(sal_Int32 nPara, const EditTextObject& rTxtObj); + void InsertParagraph(sal_Int32 nPara, const OUString& rText); - void SetText( sal_Int32 nPara, const String& rText); + void SetText(sal_Int32 nPara, const OUString& rText); virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); virtual const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; @@ -367,7 +367,7 @@ public: void QuickFormatDoc( sal_Bool bFull = sal_False ); void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); void QuickInsertLineBreak( const ESelection& rSel ); - void QuickInsertText( const String& rText, const ESelection& rSel ); + void QuickInsertText(const OUString& rText, const ESelection& rSel); void QuickDelete( const ESelection& rSel ); void QuickMarkToBeRepainted( sal_Int32 nPara ); |