diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-23 12:41:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-28 17:36:20 +0100 |
| commit | 0dc532bffcda35d15a4719c05bb258e470355b98 (patch) | |
| tree | ec7adac5e52ca5aebb52d06a2498654af82e1200 /svx | |
| parent | fdo#51232: i#119987# fix Impress crash when pasting text under Outline view (diff) | |
| download | core-0dc532bffcda35d15a4719c05bb258e470355b98.tar.gz core-0dc532bffcda35d15a4719c05bb258e470355b98.zip | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Changed SfxItemPool::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const; to use OUString.
Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66
Diffstat (limited to 'svx')
84 files changed, 452 insertions, 501 deletions
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 64cc339e6f2a..00a554d6e5f9 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -45,7 +45,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -88,7 +88,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 5dfae8c5aada..92045aa37c77 100644 --- a/svx/inc/svx/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -313,7 +313,7 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const; virtual int operator == (const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 2dbd6892d930..16447dce67cc 100644 --- a/svx/inc/svx/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -43,7 +43,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -73,7 +73,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -103,7 +103,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -134,7 +134,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -165,7 +165,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -193,7 +193,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 24725ff7e620..06836b2827cd 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -43,7 +43,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index dafdbbc2b493..f6cd721e8cd9 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -57,7 +57,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } const String& GetValueString() const { return aStringVal; } diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx index 7bae5a0ea7c9..300dfaabcd4a 100644 --- a/svx/inc/svx/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx @@ -88,7 +88,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index b42dbfcfcc12..48d5dd98f04d 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -79,7 +79,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -120,7 +120,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx index 0a363d42b1d4..9bdd2698551e 100644 --- a/svx/inc/svx/postattr.hxx +++ b/svx/inc/svx/postattr.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -72,7 +72,8 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) @@ -99,11 +100,11 @@ public: SvxPostItTextItem( sal_uInt16 nWhich ); SvxPostItTextItem( const String& rText, sal_uInt16 nWhich ); - // "pure virtual methods" vom SfxPoolItem + // "pure virtual methods" from SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 0861890c891e..f945280fc2b2 100644 --- a/svx/inc/svx/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx @@ -51,7 +51,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String& rText, const IntlWrapper * = 0 ) const; + OUString& rText, const IntlWrapper * = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx index 5cf6b2b53fb3..545edb4cda85 100644 --- a/svx/inc/svx/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx @@ -39,7 +39,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -73,7 +73,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -106,7 +106,7 @@ protected: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -183,7 +183,7 @@ protected: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; @@ -245,7 +245,7 @@ protected: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index acfa7d2c448a..1b5435067332 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -38,7 +38,7 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String& rText, + OUString& rText, const IntlWrapper * pIntlWrapper = 0) const; }; diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index f10d7df1b9a1..67e97fb0c454 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -51,7 +51,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - String &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 6595ca363f7f..b788ed296760 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -81,7 +81,7 @@ private: virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - String &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 0770ea864363..77cdf3c590d5 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -47,7 +47,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String& rText, const IntlWrapper * = 0) const; + OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index 5e4a154c548d..9045dc91916d 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -42,7 +42,7 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String& rText, const IntlWrapper * = 0) const; + OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 08322ca2fa19..c3250ff7af60 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -39,7 +39,7 @@ public: virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 0a9a1a55e026..7e01de417185 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -38,7 +38,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; //------------------------------------------------------------ @@ -56,7 +56,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; + virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const; }; diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 539c11b7bd82..cf8b0d59f1ee 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -33,7 +33,7 @@ public: virtual bool HasMetrics() const; virtual bool ScaleMetrics(long nMul, long nDiv); - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 6af97fe66f8a..25694f32044e 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -47,7 +47,7 @@ public: virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index fa27a3b00452..e6b0a765df50 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -47,7 +47,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; //------------------------------ @@ -73,8 +73,8 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index ace8d1fce278..057bfe522535 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -88,8 +88,8 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index 7d4d46552ea4..c852087b83a7 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ public: SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index 9f6ec58e8bbf..42874cbc6fb3 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -31,7 +31,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - String &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index f6f54a04d5dd..6d15c560e575 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -55,8 +55,8 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; virtual int HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue(sal_Bool bVal); diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 9cc9802841ef..89d91970ae89 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -37,7 +37,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx index cf9f1b116b89..e90e6d89c5f9 100644 --- a/svx/inc/svx/svdpool.hxx +++ b/svx/inc/svx/svdpool.hxx @@ -42,11 +42,11 @@ public: virtual SfxItemPresentation GetPresentation(const SfxPoolItem& rItem, SfxItemPresentation ePresentation, SfxMapUnit ePresentationMetric, - String& rText, + OUString& rText, const IntlWrapper * pIntlWrapper = 0) const; - static void TakeItemName(sal_uInt16 nWhich, String& rItemName); + static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; #endif // _SVDPOOL_HXX diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index a02b99b4addf..c86fd0d35582 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -290,11 +290,11 @@ public: void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=sal_True; bDirty=sal_True; } void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } - void TakeStr(long nVal, XubString& rStr) const; - static void TakeUnitStr(MapUnit eUnit, XubString& rStr); - static void TakeUnitStr(FieldUnit eUnit, XubString& rStr); - static XubString GetUnitStr(MapUnit eUnit) { XubString aStr; TakeUnitStr(eUnit,aStr); return aStr; } - static XubString GetUnitStr(FieldUnit eUnit) { XubString aStr; TakeUnitStr(eUnit,aStr); return aStr; } + void TakeStr(long nVal, OUString& rStr) const; + static void TakeUnitStr(MapUnit eUnit, OUString& rStr); + static void TakeUnitStr(FieldUnit eUnit, OUString& rStr); + static OUString GetUnitStr(MapUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } + static OUString GetUnitStr(FieldUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 8ca26e9f52f7..eabbaeed1d9b 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -40,9 +40,9 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 3; } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; //------------------------------------ diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 316a07dca562..3dc610ff1e76 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -41,7 +41,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index 546b1af7c7ad..ba8d01190b47 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -37,8 +37,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 6565d4c6821e..2f2d420e5da2 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 738af71971c1..688f54bb65d5 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -34,7 +34,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual int operator==(const SfxPoolItem&) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 6a119b306ec4..130f386c6621 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -41,7 +41,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 633308958f3d..4d2182ae14c3 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -43,7 +43,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; //------------------------------ @@ -63,7 +63,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 2719d84ca71b..0ce1cf0f858a 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -40,7 +40,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; #endif diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index caff2421592d..e2a0052eff67 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -27,7 +27,7 @@ public: SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; }; diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index a9aaed68dd4f..6b8cab68dece 100644 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -54,7 +54,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; const XOBitmap& GetBitmapValue() const; // GetValue -> GetBitmapValue void SetBitmapValue( const XOBitmap& rNew ) { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 4ed2b9b11419..596d9c9ae8b4 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -47,7 +47,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual sal_uInt16 GetValueCount() const; XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index 35ab0ae298fd..85bd4dabad17 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -44,7 +44,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index 709a6919dfe9..3c9ea1ce5654 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index d63b05b38b74..5ed01b015d99 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 34899f163ccf..0042e5ad57cd 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen @@ -57,7 +57,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 258372ae0480..c5517d0c6759 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -36,7 +36,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index a226d3a97021..5304484d3892 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -52,7 +52,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index b11a387b5b37..ca14d6a341d8 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -36,7 +36,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index d0902d8cb385..e02345abdd37 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -52,7 +52,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index 4a65560e87b5..7c0320ffe2f7 100644 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -48,7 +48,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index 5c9c0415fd16..494cc99f21fe 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -48,7 +48,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const; + SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const; sal_Bool IsEnabled() const { return bEnabled; } void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; } diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index 52cc5c754699..1c2401f03dda 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -38,7 +38,7 @@ public: XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} XFillGradientItem(sal_uInt16 nWhich_) : NameOrIndex(nWhich_, -1) {} XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); - XFillGradientItem(const UniString& rName, const XGradient& rTheGradient, sal_uInt16 nWhich_ = XATTR_FILLGRADIENT); + XFillGradientItem(const OUString& rName, const XGradient& rTheGradient, sal_uInt16 nWhich = XATTR_FILLGRADIENT); XFillGradientItem(const XGradient& rTheGradient); XFillGradientItem(const XFillGradientItem& rItem); XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); @@ -47,14 +47,14 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index 2e8682d63a81..3b95e97c6a3c 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -51,7 +51,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual bool HasMetrics() const; virtual bool ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index c3eb96962afa..52f475c31845 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -40,7 +40,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index 332b4370dcbc..491a7d41d502 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -40,7 +40,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 650e1f379b57..18fef85b45c7 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -42,7 +42,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual sal_uInt16 GetValueCount() const; XLineStyle GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 64c97fe95493..321656d9ed72 100644 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -43,7 +43,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual sal_uInt16 GetValueCount() const; XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); } diff --git a/svx/inc/svx/xlncapit.hxx b/svx/inc/svx/xlncapit.hxx index b43b6c83a49f..620a7adfc4b3 100644 --- a/svx/inc/svx/xlncapit.hxx +++ b/svx/inc/svx/xlncapit.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual sal_uInt16 GetValueCount() const; com::sun::star::drawing::LineCap GetValue() const; diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index 529bdff90e11..609efaec9e65 100644 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -44,7 +44,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index 446e1c661475..a4d7a6ca7122 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -53,7 +53,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual bool HasMetrics() const; virtual bool ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 927f36c787e1..d06deb80a219 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index fe640571cd04..fdf9abdda894 100644 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -52,7 +52,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; basegfx::B2DPolyPolygon GetLineEndValue() const; void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 7bda36ebb712..e960ea24f8c5 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -44,7 +44,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index a429f4f803a0..241eb668a05e 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index e3baea9fc3e9..1d57bf009b7c 100644 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -52,7 +52,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; basegfx::B2DPolyPolygon GetLineStartValue() const; void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index 0e04a8bde15f..776b97519fcd 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -43,7 +43,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index fc5893a9e23d..8cb0e705ba87 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -40,7 +40,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index 63ebc0363ff0..d8d60ad9022b 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; }; #endif diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index d54fa3cf726c..1634eb053543 100644 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -39,7 +39,7 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index ee7c75f40068..64cbdf1b67d8 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -111,17 +111,17 @@ SfxItemPresentation SvxGridItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: - rText = rtl::OUString("SvxGridItem"); + rText = "SvxGridItem"; return ePres; default: return SFX_ITEM_PRESENTATION_NONE; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index d02eac3fd8c8..fe0651d70c9f 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -124,7 +124,7 @@ SfxItemPresentation SvxLongLRSpaceItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, const IntlWrapper * + OUString& /*rText*/, const IntlWrapper * ) const { @@ -250,7 +250,7 @@ SfxItemPresentation SvxLongULSpaceItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, const IntlWrapper * + OUString& /*rText*/, const IntlWrapper * ) const { return SFX_ITEM_PRESENTATION_NONE; @@ -378,7 +378,7 @@ SfxItemPresentation SvxPagePosSizeItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, const IntlWrapper * + OUString& /*rText*/, const IntlWrapper * ) const { return SFX_ITEM_PRESENTATION_NONE; @@ -452,7 +452,7 @@ SfxItemPresentation SvxColumnItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, const IntlWrapper * + OUString& /*rText*/, const IntlWrapper * ) const { return SFX_ITEM_PRESENTATION_NONE; @@ -607,7 +607,7 @@ SfxItemPresentation SvxObjectItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, const IntlWrapper * + OUString& /*rText*/, const IntlWrapper * ) const { return SFX_ITEM_PRESENTATION_NONE; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 6b29f4d76dc4..bb3876c73e80 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2252,7 +2252,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, if ( !IsInvalidItem( rItem.pItem ) ) { - String aStr; + OUString aStr; rPool.GetPresentation( *rItem.pItem, SFX_ITEM_PRESENTATION_COMPLETE, eMapUnit, aStr ); diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 030bb42730ac..a3ff5d9d775e 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -73,12 +73,12 @@ SfxItemPresentation SvxOrientationItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * ) const + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -241,42 +241,44 @@ SfxItemPresentation SvxMarginItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper *pIntl ) const { + OUString cpDelimTmp = OUString(cpDelim); + switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: { - rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ); - rText += cpDelim; - rText += GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ); - rText += cpDelim; - rText += GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ); - rText += cpDelim; - rText += GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); + rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + + cpDelimTmp + + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + + cpDelimTmp + + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + + cpDelimTmp + + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); return SFX_ITEM_PRESENTATION_NAMELESS; } case SFX_ITEM_PRESENTATION_COMPLETE: { - rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT); - rText += GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ); - rText += SVX_RESSTR(GetMetricId(ePresUnit)); - rText += cpDelim; - rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP); - rText += GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ); - rText += SVX_RESSTR(GetMetricId(ePresUnit)); - rText += cpDelim; - rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT); - rText += GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ); - rText += SVX_RESSTR(GetMetricId(ePresUnit)); - rText += cpDelim; - rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM); - rText += GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); - rText += SVX_RESSTR(GetMetricId(ePresUnit)); + rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) + + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + + SVX_RESSTR(GetMetricId(ePresUnit)) + + cpDelimTmp + + SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) + + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + + SVX_RESSTR(GetMetricId(ePresUnit)) + + cpDelimTmp + + SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) + + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + + SVX_RESSTR(GetMetricId(ePresUnit)) + + cpDelimTmp + + SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) + + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + + SVX_RESSTR(GetMetricId(ePresUnit)); return SFX_ITEM_PRESENTATION_COMPLETE; } default: ; //prevent warning diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index bf401a984f16..ca6d4a7e0e75 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -252,7 +252,7 @@ XubString SvxDoubleItem::GetValueText() const SfxItemPresentation SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, XubString& rText, + SfxMapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * pIntlWrapper) const { DBG_ASSERT( pIntlWrapper, "SvxDoubleItem::GetPresentation: no IntlWrapper" ); diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 1e5fb23d788d..119de61bd20f 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -252,14 +252,12 @@ int SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const + SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { - rText += sal_Unicode( ' ' ); + rText += " "; if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE ) { - XubString aStr; - aStr += sal_Unicode( ' ' ); - rText.Insert( aStr, 0 ); + rText = " " + rText; } return ePresentation; } diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 996e95ac03de..0f497cf601d1 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -59,10 +59,10 @@ SfxItemPresentation SvxColorListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } @@ -128,10 +128,10 @@ SfxItemPresentation SvxGradientListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } @@ -182,10 +182,10 @@ SfxItemPresentation SvxHatchListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } @@ -232,10 +232,10 @@ SfxItemPresentation SvxBitmapListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } @@ -280,10 +280,10 @@ SfxItemPresentation SvxDashListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } @@ -327,10 +327,10 @@ SfxItemPresentation SvxLineEndListItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 29cb3552c90a..3bc7ab1883c6 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -135,23 +135,19 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SfxItemPresentation SvxGrfCrop::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* pIntl ) const + OUString &rText, const IntlWrapper* pIntl ) const { - rText.Erase(); + rText = OUString(); switch( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) { - ( rText.AssignAscii( "L: " )) += ::GetMetricText( GetLeft(), - eCoreUnit, SFX_MAPUNIT_MM, pIntl ); - ( rText.AppendAscii( " R: " )) += ::GetMetricText( GetRight(), - eCoreUnit, SFX_MAPUNIT_MM, pIntl ); - ( rText.AppendAscii( " T: " )) += ::GetMetricText( GetTop(), - eCoreUnit, SFX_MAPUNIT_MM, pIntl ); - ( rText.AppendAscii( " B: " )) += ::GetMetricText( GetBottom(), - eCoreUnit, SFX_MAPUNIT_MM, pIntl ); + rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )); } break; diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index d19d8963ec50..8583b69077d9 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -123,10 +123,10 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 67d491dedb58..ce4a265895fe 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -101,10 +101,11 @@ SfxItemPresentation SvxPageItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); + OUString cpDelimTmp = OUString(cpDelim); switch ( ePres ) { @@ -114,12 +115,10 @@ SfxItemPresentation SvxPageItem::GetPresentation { if ( aDescName.Len() ) { - rText = aDescName; - rText += cpDelim; + rText = aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= SVX_NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType); - rText += cpDelim; + rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); else @@ -127,8 +126,7 @@ SfxItemPresentation SvxPageItem::GetPresentation String aUsageText = GetUsageText( eUse ); if (aUsageText.Len()) { - rText += cpDelim; - rText += aUsageText; + rText += cpDelimTmp + aUsageText; } return SFX_ITEM_PRESENTATION_NAMELESS; } @@ -137,12 +135,10 @@ SfxItemPresentation SvxPageItem::GetPresentation rText += SVX_RESSTR(RID_SVXITEMS_PAGE_COMPLETE); if ( aDescName.Len() ) { - rText += aDescName; - rText += cpDelim; + rText += aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= SVX_NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType); - rText += cpDelim; + rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); else @@ -150,8 +146,7 @@ SfxItemPresentation SvxPageItem::GetPresentation String aUsageText = GetUsageText( eUse ); if (aUsageText.Len()) { - rText += cpDelim; - rText += aUsageText; + rText += cpDelimTmp + aUsageText; } return SFX_ITEM_PRESENTATION_COMPLETE; } @@ -307,10 +302,10 @@ SfxItemPresentation SvxSetItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 5ef93b871ee7..21fcfeeface5 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -50,20 +50,19 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); return SFX_ITEM_PRESENTATION_NAMELESS; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE); - rText += GetValue(); + rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); return SFX_ITEM_PRESENTATION_COMPLETE; default: ;//prevent warning } @@ -99,20 +98,19 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); return SFX_ITEM_PRESENTATION_NAMELESS; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE); - rText += GetValue(); + rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); return SFX_ITEM_PRESENTATION_COMPLETE; default: ;//prevent warning } @@ -148,20 +146,19 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); return SFX_ITEM_PRESENTATION_NAMELESS; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE); - rText += GetValue(); + rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); return SFX_ITEM_PRESENTATION_COMPLETE; default: ;//prevent warning } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 3df20db880ac..dcf0a2d03862 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -69,15 +69,14 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const SfxItemPresentation SvxRotateModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, const IntlWrapper * ) const + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_COMPLETE: - rText.AppendAscii("..."); - rText.AppendAscii(": "); + rText += "...: "; // break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 511368981623..e30f7f92265a 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -364,7 +364,7 @@ SdrItemPool::~SdrItemPool() SfxItemPresentation SdrItemPool::GetPresentation( const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, XubString& rText, + SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper) const { if (!IsInvalidItem(&rItem)) { @@ -373,11 +373,10 @@ SfxItemPresentation SdrItemPool::GetPresentation( rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, GetMetric(nWhich),ePresentationMetric,rText, pIntlWrapper); - String aStr; + OUString aStr; TakeItemName(nWhich, aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; return ePresentation; } @@ -385,7 +384,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( return XOutdevItemPool::GetPresentation(rItem,ePresentation,ePresentationMetric,rText,pIntlWrapper); } -void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) +void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) { ResMgr* pResMgr = ImpGetResMgr(); sal_uInt16 nResId = SIP_UNKNOWN_ATTR; @@ -607,7 +606,7 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) case EE_FEATURE_FIELD : nResId = SIP_EE_FEATURE_FIELD;break; } // switch - rItemName = String( ResId( nResId, *pResMgr ) ); + rItemName = ResId( nResId, *pResMgr ); } //////////////////////////////////////////////////////////////////////////////// @@ -633,7 +632,7 @@ int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const SfxItemPresentation SdrFractionItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const + SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { if(nValue.IsValid()) { @@ -642,22 +641,20 @@ SfxItemPresentation SdrFractionItem::GetPresentation( if(nDiv != 1) { - rText += sal_Unicode('/'); - rText += OUString::valueOf(nDiv); + rText = rText + "/" + OUString::valueOf(nDiv); } } else { - rText = OUString("?"); + rText = "?"; } if(ePresentation == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePresentation; @@ -688,28 +685,25 @@ TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem); SfxItemPresentation SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const + SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { if(GetValue().IsValid()) { sal_Int32 nDiv = GetValue().GetDenominator(); - rText = OUString::valueOf(GetValue().GetNumerator()); - rText += sal_Unicode(':'); - rText += OUString::valueOf(nDiv); + rText = OUString::valueOf(GetValue().GetNumerator()) + ":" + OUString::valueOf(nDiv); } else { - rText = OUString("?"); + rText = "?"; } if(ePresentation == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePresentation; @@ -749,15 +743,14 @@ rtl::OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const } SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -774,7 +767,7 @@ SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrYesNoItem(Which(),rIn); } -rtl::OUString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const +OUString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValYES); @@ -782,15 +775,14 @@ rtl::OUString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const } SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -813,17 +805,16 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const SfxItemPresentation SdrPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText = OUString::number(GetValue()) + "%"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; @@ -847,7 +838,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const SfxItemPresentation SdrAngleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - XubString& rText, const IntlWrapper * pIntlWrapper) const + OUString& rText, const IntlWrapper * pIntlWrapper) const { sal_Int32 nValue(GetValue()); sal_Bool bNeg(nValue < 0); @@ -855,12 +846,12 @@ SfxItemPresentation SdrAngleItem::GetPresentation( if(bNeg) nValue = -nValue; - rText = OUString::valueOf(nValue); + OUStringBuffer aText = OUString::valueOf(nValue); if(nValue) { sal_Unicode aUnicodeNull('0'); - xub_StrLen nAnz(2); + sal_Int32 nAnz(2); const IntlWrapper* pMyIntlWrapper = NULL; if(!pIntlWrapper) @@ -870,30 +861,31 @@ SfxItemPresentation SdrAngleItem::GetPresentation( if(pIntlWrapper->getLocaleData()->isNumLeadingZero()) nAnz++; - while(rText.Len() < nAnz) - rText.Insert(aUnicodeNull, 0); + while(aText.getLength() < nAnz) + aText.insert(0, aUnicodeNull); - xub_StrLen nLen = rText.Len(); - sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull); - sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull); + sal_Int32 nLen = aText.getLength(); + sal_Bool bNull1(aText[nLen-1] == aUnicodeNull); + sal_Bool bNull2(bNull1 && aText[nLen-2] == aUnicodeNull); if(bNull2) { // no decimal place(s) - rText.Erase(nLen-2); + sal_Int32 idx = nLen-2; + aText.remove(idx, aText.getLength()-idx); } else { sal_Unicode cDec = pIntlWrapper->getLocaleData()->getNumDecimalSep()[0]; - rText.Insert(cDec, nLen-2); + aText.insert(nLen-2, cDec); if(bNull1) - rText.Erase(nLen); + aText.remove(nLen, aText.getLength()-nLen); } if(bNeg) - rText.Insert(sal_Unicode('-'), 0); + aText.insert(0, sal_Unicode('-')); if ( pMyIntlWrapper ) { @@ -902,17 +894,17 @@ SfxItemPresentation SdrAngleItem::GetPresentation( } } - rText += sal_Unicode(DEGREE_CHAR); + aText.insert(aText.getLength(), sal_Unicode(DEGREE_CHAR)); if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + aText.insert(0, aStr); } + rText = aText.makeStringAndClear(); return ePres; } @@ -950,20 +942,19 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) } SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const + SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper *) const { long nValue=GetValue(); SdrFormatter aFmt((MapUnit)eCoreMetric,(MapUnit)ePresMetric); aFmt.TakeStr(nValue,rText); - String aStr; + OUString aStr; aFmt.TakeUnitStr((MapUnit)ePresMetric,aStr); rText+=aStr; if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr2; + OUString aStr2; SdrItemPool::TakeItemName(Which(), aStr2); - aStr2 += sal_Unicode(' '); - rText.Insert(aStr2, 0); + rText = aStr2 + " " + rText; } return ePres; } @@ -986,15 +977,14 @@ rtl::OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1013,15 +1003,14 @@ rtl::OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1045,15 +1034,14 @@ rtl::OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1103,15 +1091,14 @@ rtl::OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1153,15 +1140,14 @@ rtl::OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1203,15 +1189,14 @@ rtl::OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1252,15 +1237,14 @@ rtl::OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1296,17 +1280,16 @@ SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con SfxItemPresentation SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - XubString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper *) const { rText = OUString::number(GetValue()) + "ms"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; @@ -1337,7 +1320,7 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) SfxItemPresentation SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - XubString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper *) const { sal_Int32 nValue(GetValue()); @@ -1351,7 +1334,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( else { SdrFormatter aFmt((MapUnit)eCoreMetric, (MapUnit)ePresMetric); - XubString aStr; + OUString aStr; aFmt.TakeStr(nValue, rText); aFmt.TakeUnitStr((MapUnit)ePresMetric, aStr); @@ -1360,11 +1343,10 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; @@ -1387,15 +1369,14 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_ } SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, - String &rText, const IntlWrapper * ) const + OUString &rText, const IntlWrapper * ) const { rText = GetValueTextByVal( GetValue() ); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1480,22 +1461,20 @@ int SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const + SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { sal_uInt32 i, nCount = GetCount(); - rText.Append( OUString::number( nCount ) ); + rText += OUString::number( nCount ); for ( i = 0; i < nCount; i++ ) { - rText += sal_Unicode( ' ' ); - rText.Append( OUString::valueOf( static_cast<sal_Int32>( GetValue( i ).nValue ) ) ); + rText = rText + " " + OUString::number( GetValue( i ).nValue ); } if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE ) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName( Which(), aStr ); - aStr += sal_Unicode( ' ' ); - rText.Insert( aStr, 0 ); + rText = aStr + " " + rText; } return ePresentation; } @@ -1605,15 +1584,14 @@ rtl::OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1795,15 +1773,14 @@ rtl::OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1844,15 +1821,14 @@ rtl::OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1893,15 +1869,14 @@ rtl::OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1938,10 +1913,10 @@ sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { - XubString aRetval; + OUString aRetval; if((FieldUnit)nPos == FUNIT_NONE) - aRetval = rtl::OUString("default"); + aRetval = "default"; else SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval); @@ -1949,15 +1924,14 @@ rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -1996,15 +1970,14 @@ rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const } SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const + SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; } @@ -2050,17 +2023,16 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c SfxItemPresentation SdrSignedPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - XubString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper *) const { rText = OUString::number(GetValue()) + "%"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { - XubString aStr; + OUString aStr; SdrItemPool::TakeItemName(Which(), aStr); - aStr += sal_Unicode(' '); - rText.Insert(aStr, 0); + rText = aStr + " " + rText; } return ePres; @@ -2264,17 +2236,16 @@ rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - XubString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper *) const { rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) ); if( ePres == SFX_ITEM_PRESENTATION_COMPLETE ) { - String aStr; + OUString aStr; SdrItemPool::TakeItemName( Which(), aStr ); - aStr += sal_Unicode(' '); - rText.Insert( aStr, 0 ); + rText = aStr + " " + rText; } return ePres; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index f7cbccab1910..6337a4f2ef29 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -75,13 +75,13 @@ enum ItemType { class ImpItemListRow { public: - XubString aName; - XubString aValue; - SfxItemState eState; + OUString aName; + OUString aValue; + SfxItemState eState; sal_uInt16 nWhichId; - TypeId pType; - ItemType eItemType; + TypeId pType; + ItemType eItemType; sal_Int32 nVal; sal_Int32 nMin; @@ -144,8 +144,8 @@ XubString ImpItemListRow::GetItemTypeStr() const sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const { - return (aName.Equals(rEntry.aName) - && aValue.Equals(rEntry.aValue) + return (aName.equals(rEntry.aName) + && aValue.equals(rEntry.aValue) && eState==rEntry.eState && nWhichId==rEntry.nWhichId && bComment==rEntry.bComment @@ -568,7 +568,7 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP RowInserted(nEntryNum); } else if (*pAktEntry!=rEntry) { bool bStateDiff=rEntry.eState!=pAktEntry->eState; - bool bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue); + bool bValueDiff=!rEntry.aValue.equals(pAktEntry->aValue); bool bAllDiff = true; if (bStateDiff || bValueDiff) { // check whether only state and/or value have changed @@ -968,7 +968,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem while(nIndent > 0) { - aEntry.aName.Insert(sal_Unicode(' '), 0); + aEntry.aName = " " + aEntry.aName; nIndent--; } @@ -1018,8 +1018,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SFX_MAPUNIT_MM, aEntry.aValue); if (aEntry.bCanNum) { - aEntry.aValue.InsertAscii(": ",0); - aEntry.aValue.Insert(OUString::valueOf(aEntry.nVal),0); + aEntry.aValue = OUString::number(aEntry.nVal) + ": " + aEntry.aValue; } } else diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index cd64052082d3..eadaa82d9b6d 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -825,203 +825,201 @@ void SdrFormatter::Undirty() } -void SdrFormatter::TakeStr(long nVal, XubString& rStr) const +void SdrFormatter::TakeStr(long nVal, OUString& rStr) const { - sal_Unicode aNullCode('0'); + OUString aNullCode("0"); if(!nVal) { - rStr = String(); - rStr += aNullCode; + rStr = aNullCode; return; } // we may lose some decimal places here, because of MulDiv instead of Real - sal_Bool bNeg(nVal < 0); + bool bNeg(nVal < 0); SvtSysLocale aSysLoc; const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData(); ForceUndirty(); - sal_Int16 nK(nKomma_); - XubString aStr; + sal_Int16 nC(nKomma_); if(bNeg) nVal = -nVal; - while(nK <= -3) + while(nC <= -3) { nVal *= 1000; - nK += 3; + nC += 3; } - while(nK <= -1) + while(nC <= -1) { nVal *= 10; - nK++; + nC++; } if(nMul_ != nDiv_) nVal = BigMulDiv(nVal, nMul_, nDiv_); - aStr = OUString::valueOf(nVal); + OUStringBuffer aStr = OUString::valueOf(nVal); - if(nK > 0 && aStr.Len() <= nK ) + if(nC > 0 && aStr.getLength() <= nC ) { // decimal separator necessary - sal_Int16 nAnz(nK - aStr.Len()); + sal_Int32 nAnz(nC - aStr.getLength()); if(nAnz >= 0 && rLoc.isNumLeadingZero()) nAnz++; - for(xub_StrLen i=0; i<nAnz; i++) - aStr.Insert(aNullCode, 0); + for(sal_Int32 i=0; i<nAnz; i++) + aStr.insert(0, aNullCode); // remove superfluous decimal points - xub_StrLen nNumDigits(rLoc.getNumDigits()); - xub_StrLen nWeg(nK - nNumDigits); + sal_Int32 nNumDigits(rLoc.getNumDigits()); + sal_Int32 nWeg(nC - nNumDigits); if(nWeg > 0) { // TODO: we should round here - aStr.Erase(aStr.Len() - nWeg); - nK = nNumDigits; + aStr.remove(aStr.getLength() - nWeg, nWeg); + nC = nNumDigits; } } // remember everything before the decimal separator for later - xub_StrLen nVorKomma(aStr.Len() - nK); + sal_Int32 nForComma(aStr.getLength() - nC); - if(nK > 0) + if(nC > 0) { - // insert KommaChar (decimal separator) + // insert comma char (decimal separator) // remove trailing zeros - while(nK > 0 && aStr.GetChar(aStr.Len() - 1) == aNullCode) + while(nC > 0 && aStr[aStr.getLength() - 1] == aNullCode[0]) { - aStr.Erase(aStr.Len() - 1); - nK--; + aStr.remove(aStr.getLength() - 1, 1); + nC--; } - if(nK > 0) + if(nC > 0) { // do we still have decimal places? sal_Unicode cDec(rLoc.getNumDecimalSep()[0]); - aStr.Insert(cDec, nVorKomma); + aStr.insert(nForComma, cDec); } } // add in thousands separator (if necessary) - if( nVorKomma > 3 ) + if( nForComma > 3 ) { - String aThoSep( rLoc.getNumThousandSep() ); - if ( aThoSep.Len() > 0 ) + OUString aThoSep( rLoc.getNumThousandSep() ); + if ( aThoSep.getLength() > 0 ) { - sal_Unicode cTho( aThoSep.GetChar(0) ); - sal_Int32 i(nVorKomma - 3); + sal_Unicode cTho( aThoSep[0] ); + sal_Int32 i(nForComma - 3); while(i > 0) { - rStr.Insert(cTho, (xub_StrLen)i); + aStr.insert(i, cTho); i -= 3; } } } - if(!aStr.Len()) - aStr += aNullCode; + if(!aStr.getLength()) + aStr.insert(aStr.getLength(), aNullCode); - if(bNeg && (aStr.Len() > 1 || aStr.GetChar(0) != aNullCode)) + if(bNeg && (aStr.getLength() > 1 || aStr[0] != aNullCode[0])) { - rStr.Insert(sal_Unicode('-'), 0); + aStr.insert(0, "-"); } - rStr = aStr; + rStr = aStr.makeStringAndClear(); } -void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr) +void SdrFormatter::TakeUnitStr(MapUnit eUnit, OUString& rStr) { switch(eUnit) { // metrically case MAP_100TH_MM : { - rStr = OUString("/100mm"); + rStr = "/100mm"; break; } case MAP_10TH_MM : { - rStr = OUString("/10mm"); + rStr = "/10mm"; break; } case MAP_MM : { - rStr = OUString("mm"); + rStr = "mm"; break; } case MAP_CM : { - rStr = OUString("cm"); + rStr = "cm"; break; } // Inch case MAP_1000TH_INCH: { - rStr = OUString("/1000\""); + rStr = "/1000\""; break; } case MAP_100TH_INCH : { - rStr = OUString("/100\""); + rStr = "/100\""; break; } case MAP_10TH_INCH : { - rStr = OUString("/10\""); + rStr = "/10\""; break; } case MAP_INCH : { - rStr = OUString("\""); + rStr = "\""; break; } case MAP_POINT : { - rStr = OUString("pt"); + rStr = "pt"; break; } case MAP_TWIP : { - rStr = OUString("twip"); + rStr = "twip"; break; } // others case MAP_PIXEL : { - rStr = OUString("pixel"); + rStr = "pixel"; break; } case MAP_SYSFONT : { - rStr = OUString("sysfont"); + rStr = "sysfont"; break; } case MAP_APPFONT : { - rStr = OUString("appfont"); + rStr = "appfont"; break; } case MAP_RELATIVE : { - rStr = OUString("%"); + rStr = "%"; break; } default: break; } } -void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) +void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) { switch(eUnit) { @@ -1036,66 +1034,66 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) // metrically case FUNIT_100TH_MM: { - rStr = OUString("/100mm"); + rStr = "/100mm"; break; } case FUNIT_MM : { - rStr = OUString("mm"); + rStr = "mm"; break; } case FUNIT_CM : { - rStr = OUString("cm"); + rStr = "cm"; break; } case FUNIT_M : { - rStr = OUString("m"); + rStr = "m"; break; } case FUNIT_KM : { - rStr = OUString("km"); + rStr = "km"; break; } // Inch case FUNIT_TWIP : { - rStr = OUString("twip"); + rStr = "twip"; break; } case FUNIT_POINT : { - rStr = OUString("pt"); + rStr = "pt"; break; } case FUNIT_PICA : { - rStr = OUString("pica"); + rStr = "pica"; break; } case FUNIT_INCH : { - rStr = OUString("\""); + rStr = "\""; break; } case FUNIT_FOOT : { - rStr = OUString("ft"); + rStr = "ft"; break; } case FUNIT_MILE : { - rStr = OUString("mile(s)"); + rStr = "mile(s)"; break; } // others case FUNIT_PERCENT: { - rStr = OUString("%"); + rStr = "%"; break; } } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index e2e8a15a94d8..d16b8f5f1b1e 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -506,10 +506,10 @@ SfxItemPresentation XLineStyleItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -934,13 +934,13 @@ SfxItemPresentation XLineDashItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -1295,19 +1295,19 @@ SfxItemPresentation XLineWidthItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, const IntlWrapper * pIntl + OUString& rText, const IntlWrapper * pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl); - rText += SVX_RESSTR( GetMetricId( ePresUnit) ); + eCoreUnit, ePresUnit, pIntl) + + SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -1402,13 +1402,13 @@ SfxItemPresentation XLineColorItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -1671,13 +1671,13 @@ SfxItemPresentation XLineStartItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -2318,13 +2318,13 @@ SfxItemPresentation XLineEndItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -2440,19 +2440,19 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, const IntlWrapper * pIntl + OUString& rText, const IntlWrapper * pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl); - rText += SVX_RESSTR( GetMetricId( ePresUnit) ); + eCoreUnit, ePresUnit, pIntl) + + SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -2531,19 +2531,19 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper *pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl); - rText += SVX_RESSTR( GetMetricId( ePresUnit) ); + eCoreUnit, ePresUnit, pIntl) + + SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -2622,17 +2622,17 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: - rText = XubString( ResId( GetValue() ? RID_SVXSTR_CENTERED : + rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) ); return ePres; default: @@ -2714,17 +2714,17 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: - rText = XubString( ResId( GetValue() ? RID_SVXSTR_CENTERED : + rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) ); return ePres; default: @@ -2814,10 +2814,10 @@ SfxItemPresentation XFillStyleItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -2960,13 +2960,13 @@ SfxItemPresentation XFillColorItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -3034,13 +3034,13 @@ SfxItemPresentation XSecondaryFillColorItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -3162,10 +3162,10 @@ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, |* *************************************************************************/ -XFillGradientItem::XFillGradientItem(const XubString& rName, - const XGradient& rTheGradient, sal_uInt16 nWhich_) : - NameOrIndex(nWhich_, rName), - aGradient(rTheGradient) +XFillGradientItem::XFillGradientItem(const OUString& rName, + const XGradient& rTheGradient, sal_uInt16 nWhich) + : NameOrIndex(nWhich, rName) + , aGradient(rTheGradient) { } @@ -3344,13 +3344,13 @@ SfxItemPresentation XFillGradientItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -3691,7 +3691,7 @@ bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVa SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, + OUString& rText, const IntlWrapper * pIntlWrapper ) const { return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper ); @@ -3923,13 +3923,13 @@ SfxItemPresentation XFillHatchItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 64e2ed82c8b6..5e2fa6ba2a2d 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -86,21 +86,19 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: return ePres; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); - rText.AppendAscii(": "); + rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString::number(GetValue()); - rText += sal_Unicode('%'); + rText = rText + OUString::number( GetValue() ) + "%"; return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -156,9 +154,9 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------------- SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper*) const + SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { - rText.Erase(); + rText = OUString(); switch( ePres ) { @@ -331,9 +329,9 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------------- SfxItemPresentation XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper*) const + SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { - rText.Erase(); + rText = OUString(); switch( ePres ) { @@ -482,21 +480,19 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: return ePres; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); - rText.AppendAscii(": "); + rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString::number(GetValue()); - rText += sal_Unicode('%'); + rText = rText + OUString::number( GetValue() ) + "%"; return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -609,18 +605,17 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: return ePres; case SFX_ITEM_PRESENTATION_COMPLETE: -// rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ); -// rText += ": "; +// rText = OUString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: rText += OUString::number(GetValue()); return ePres; @@ -660,10 +655,10 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -708,10 +703,10 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -761,10 +756,10 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -814,10 +809,10 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -867,10 +862,10 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -915,10 +910,10 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -963,10 +958,10 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -1011,10 +1006,10 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -1059,10 +1054,10 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -1107,10 +1102,10 @@ SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { @@ -1176,9 +1171,9 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con //------------------------------------------------------------------------ SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper*) const + SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { - rText.Erase(); + rText = OUString(); switch( ePres ) { diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 8b8a34dc5ea6..ad524bbe7b37 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -583,13 +583,13 @@ SfxItemPresentation XFillBitmapItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper * ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -608,11 +608,11 @@ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nM nMemberId &= ~CONVERT_TWIPS; // needed for MID_NAME - ::rtl::OUString aApiName; + OUString aApiName; // needed for complete item (MID 0) - ::rtl::OUString aInternalName; + OUString aInternalName; - ::rtl::OUString aURL; + OUString aURL; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; if( nMemberId == MID_NAME ) |