diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-06-13 22:07:41 +0200 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2013-06-18 08:11:58 +0000 |
commit | 8956854d8e7294b41e65d5aacbc43e11d1795711 (patch) | |
tree | d9d87ffd48d048ddc46fbb34181c3c2c50243981 /include/editeng | |
parent | 66a0713dc9c676182fcd7aa1e21f8dc25c05be5e (diff) |
String to OUString (SfxStringItem and related)
Change-Id: I390413e9ff3efee720a6423fb8695b4c655d7efa
Reviewed-on: https://gerrit.libreoffice.org/4280
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/brushitem.hxx | 1 | ||||
-rw-r--r-- | include/editeng/justifyitem.hxx | 6 | ||||
-rw-r--r-- | include/editeng/tstpitem.hxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 069a3b7f636a..c7130bd2ffa6 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -29,6 +29,7 @@ class Graphic; class GraphicObject; class CntWallpaperItem; +class String; #define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001) diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index cfbdcff00a65..6784a86422a2 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -45,7 +45,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual sal_uInt16 GetValueCount() const; - virtual String GetValueText( sal_uInt16 nVal ) const; + virtual OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; @@ -78,7 +78,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual sal_uInt16 GetValueCount() const; - virtual String GetValueText( sal_uInt16 nVal ) const; + virtual OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; @@ -107,7 +107,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual sal_uInt16 GetValueCount() const; - virtual String GetValueText( sal_uInt16 nVal ) const; + virtual OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index f8eca761395b..254105737573 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -64,7 +64,7 @@ public: sal_Unicode& GetFill() { return cFill; } sal_Unicode GetFill() const { return cFill; } - String GetValueString() const; + OUString GetValueString() const; // the "old" operator==() sal_Bool IsEqual( const SvxTabStop& rTS ) const |