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 /sw | |
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 'sw')
-rw-r--r-- | sw/inc/fchrfmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtanchr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtautofmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtclds.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtcnct.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmteiro.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtfollowtextflow.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtfsize.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtftntx.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmthdft.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fmtinfmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtline.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtlsplt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtornt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fmtpdsc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtrowsplt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtruby.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtsrnd.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmturl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/format.hxx | 2 | ||||
-rw-r--r-- | sw/inc/grfatr.hxx | 18 | ||||
-rw-r--r-- | sw/inc/hfspacingitem.hxx | 2 | ||||
-rw-r--r-- | sw/inc/paratr.hxx | 8 | ||||
-rw-r--r-- | sw/inc/swatrset.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swtypes.hxx | 2 | ||||
-rw-r--r-- | sw/inc/tgrditem.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/docstyle.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/inc/uiitems.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 285 | ||||
-rw-r--r-- | sw/source/ui/utlui/uiitems.cxx | 13 |
30 files changed, 185 insertions, 205 deletions
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index f953b9e5400c..1e05890d56a6 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -61,7 +61,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/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index fb32d78798b5..7c3d665a7eee 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -57,7 +57,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/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 159daacdfdfa..0a3498fea5e7 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -52,7 +52,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/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 943c7ae3cb67..e8c0b512da88 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -102,7 +102,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/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index f0d70725ed0d..efdda3e20631 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -47,7 +47,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/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index eea916948ca9..efd2be8ed7c6 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -38,7 +38,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 718495d38f41..e9dce29751e4 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -40,7 +40,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index fc1b6cbeea38..2cd26ba0e9ab 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -70,7 +70,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 031a5197284b..6ae1e824d98d 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -63,7 +63,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index d9e7f78ad2f9..6ce288ab3820 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -50,7 +50,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } @@ -83,7 +83,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index d851f0fec274..426857f12ae7 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -57,7 +57,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, diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index e630e0e14c38..088e5bf5dca4 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -44,7 +44,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 49fb83d56cfc..7c6eb62232e5 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -36,7 +36,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index cc0d4cfe8838..f86eddb77e51 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -48,7 +48,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -84,7 +84,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 20787d184f64..b522aebc482b 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -63,7 +63,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 5dd3b4628685..31380bdc24e4 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -36,7 +36,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 1c8f8e7bd1f5..ed8edfe4fac0 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -50,7 +50,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, diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 6c5a5943374d..26a0e0413eb9 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -45,7 +45,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 367c465fadda..4782a3d6320f 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -54,7 +54,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 1f178cb713f5..2a99ba268899 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -146,7 +146,7 @@ public: /// Get attribute-description. Returns passed string. void GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const + SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } /// Format-ID for reading/writing: diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 2952064d6779..d4190465e10e 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -64,7 +64,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, @@ -117,7 +117,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; @@ -140,7 +140,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; @@ -156,7 +156,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; @@ -172,7 +172,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; @@ -225,7 +225,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, @@ -250,7 +250,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; @@ -266,7 +266,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; @@ -289,7 +289,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, diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 2b9f7fabce19..1368c4f17020 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -37,7 +37,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 0b52786911c1..0e12398863dd 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -69,7 +69,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -113,7 +113,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; @@ -151,7 +151,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 ) const; @@ -173,7 +173,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, + OUString &rText, const IntlWrapper* pIntl = 0 ) const; }; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 65572db04478..51d7afd4da6a 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -192,7 +192,7 @@ public: int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); void GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const; + SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const; SwAttrPool* GetPool() const { return (SwAttrPool*)SfxItemSet::GetPool(); } diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 5a07ccff4dc1..ad99ac8bb335 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -44,7 +44,7 @@ namespace utl{ class Size; class ResMgr; -class UniString; +class String; class SwPathFinder; class Graphic; class OutputDevice; diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 264b90a0b7c3..24b3a5f3ffae 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -53,7 +53,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; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 90398f0026ee..023faaa3356c 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -706,13 +706,13 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) break; default: { - String aItemPresentation; + OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && pPool->GetPool().GetPresentation( *pItem, SFX_ITEM_PRESENTATION_COMPLETE, eUnit, aItemPresentation, &aIntlWrapper ) ) { - if ( aDesc.Len() && aItemPresentation.Len() ) + if ( aDesc.Len() && aItemPresentation.getLength() ) aDesc += sPlus; aDesc += aItemPresentation; } @@ -755,7 +755,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) break; default: { - String aItemPresentation; + OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && pPool->GetPool().GetPresentation( *pItem, SFX_ITEM_PRESENTATION_COMPLETE, @@ -782,7 +782,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) bIsDefault = true; if(!bHasCJKFontPrefix) { - aItemPresentation.Insert(SW_RESSTR(STR_CJK_FONT), 0); + aItemPresentation = SW_RESSTR(STR_CJK_FONT) + aItemPresentation; bHasCJKFontPrefix = true; } break; @@ -793,7 +793,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) case RES_CHRATR_WEIGHT: if(!bHasWesternFontPrefix) { - aItemPresentation.Insert(SW_RESSTR(STR_WESTERN_FONT), 0); + aItemPresentation = SW_RESSTR(STR_WESTERN_FONT) + aItemPresentation; bHasWesternFontPrefix = true; bIsDefault = true; } @@ -803,7 +803,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) } if(bIsDefault) { - if ( aDesc.Len() && aItemPresentation.Len() ) + if ( aDesc.Len() && aItemPresentation.getLength() ) aDesc += sPlus; aDesc += aItemPresentation; } diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index ab54b8a87516..eeb738579dce 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -46,7 +46,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/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 4d03bcf2e7ce..ee858b41763e 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -64,12 +64,12 @@ void SwAttrSet::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText ) const + OUString &rText ) const { - static sal_Char const sKomma[] = ", "; + static sal_Char const sComma[] = ", "; - rText.Erase(); - String aStr; + rText = OUString(); + OUString aStr; if( Count() ) { SfxItemIter aIter( *this ); @@ -80,8 +80,8 @@ void SwAttrSet::GetPresentation( aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric, ePresMetric, aStr, &rInt ); - if( rText.Len() && aStr.Len() ) - rText += rtl::OUString(sKomma); + if( rText.getLength() && aStr.getLength() ) + rText += OUString(sComma); rText += aStr; if( aIter.IsAtEnd() ) break; @@ -98,14 +98,14 @@ SfxItemPresentation SwFmtCharFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -113,15 +113,13 @@ SfxItemPresentation SwFmtCharFmt::GetPresentation const SwCharFmt *pCharFmt = GetCharFmt(); if ( pCharFmt ) { - String aStr; - rText = SW_RESSTR(STR_CHARFMT ); + OUString aStr; + rText = OUString( SW_RESSTR( STR_CHARFMT ) ); pCharFmt->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr ); - rText += '('; - rText += aStr; - rText += ')'; + rText = rText + "(" + aStr + ")"; } else - rText = SW_RESSTR( STR_NO_CHARFMT ); + rText = OUString( SW_RESSTR( STR_NO_CHARFMT ) ); return ePres; } default:;//prevent warning @@ -137,19 +135,19 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { - rText.Erase(); //TODO + rText = OUString(); //TODO return ePres; } default:;//prevent warning @@ -165,14 +163,14 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -187,12 +185,12 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - String &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -215,11 +213,11 @@ SfxItemPresentation SwFmtDrop::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: @@ -231,14 +229,14 @@ SfxItemPresentation SwFmtDrop::GetPresentation { if ( GetChars() > 1 ) { - rText = String::CreateFromInt32( GetChars() ); - rText += ' '; + rText = OUString::valueOf( GetChars() ) + " "; } - rText += SW_RESSTR( STR_DROP_OVER ); - rText += ' '; - rText += String::CreateFromInt32( GetLines() ); - rText += ' '; - rText += SW_RESSTR( STR_DROP_LINES ); + rText = rText + + OUString( SW_RESSTR( STR_DROP_OVER ) ) + + " " + + OUString::valueOf( GetLines() ) + + " " + + OUString( SW_RESSTR( STR_DROP_LINES ) ); } else rText = SW_RESSTR( STR_NO_DROP_LINES ); @@ -259,14 +257,14 @@ SfxItemPresentation SwRegisterItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -290,21 +288,21 @@ SfxItemPresentation SwNumRuleItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: { if( GetValue().Len() ) - (((rText = SW_RESSTR( STR_NUMRULE_ON )) += - '(' ) += GetValue() ) += ')'; + rText = SW_RESSTR( STR_NUMRULE_ON ) + + "(" + GetValue() + ")"; else rText = SW_RESSTR( STR_NUMRULE_OFF ); return ePres; @@ -322,14 +320,14 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -355,7 +353,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - String& rText, + OUString& rText, const IntlWrapper* pIntl ) const { @@ -363,41 +361,34 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: { - rText.Erase(); + rText = OUString(); break; } case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { - rText = SW_RESSTR( STR_FRM_WIDTH ); - rText += ' '; + rText = SW_RESSTR( STR_FRM_WIDTH ) + " "; if ( GetWidthPercent() ) { - rText += String::CreateFromInt32(GetWidthPercent()); - rText += '%'; + rText = rText + OUString::valueOf(GetWidthPercent()) + "%"; } else { - rText += ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ); - rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); + rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ) + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } if ( ATT_VAR_SIZE != GetHeightSizeType() ) { - rText += ','; - rText += ' '; const sal_uInt16 nId = ATT_FIX_SIZE == eFrmHeightType ? STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT; - rText += SW_RESSTR( nId ); - rText += ' '; + rText = rText + ", " + SW_RESSTR( nId ) + " s"; if ( GetHeightPercent() ) { - rText += String::CreateFromInt32(GetHeightPercent()); - rText += '%'; + rText = rText + OUString::valueOf(GetHeightPercent()) + "%"; } else { - rText += ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ); - rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); + rText = OUString( ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ) ) + + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } } return ePres; @@ -416,14 +407,14 @@ SfxItemPresentation SwFmtHeader::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -446,14 +437,14 @@ SfxItemPresentation SwFmtFooter::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -473,14 +464,14 @@ SfxItemPresentation SwFmtSurround::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -513,8 +504,7 @@ SfxItemPresentation SwFmtSurround::GetPresentation if ( IsAnchorOnly() ) { - rText += ' '; - rText += SW_RESSTR( STR_SURROUND_ANCHORONLY ); + rText = rText + " " + SW_RESSTR( STR_SURROUND_ANCHORONLY ); } return ePres; } @@ -533,14 +523,14 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - String& rText, + OUString& rText, const IntlWrapper* pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -550,10 +540,9 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation { case text::VertOrientation::NONE: { - rText += SW_RESSTR( STR_POS_Y ); - rText += ' '; - rText += ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ); - rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); + rText = rText + SW_RESSTR( STR_POS_Y ) + " " + + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; case text::VertOrientation::TOP: @@ -594,14 +583,14 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - String& rText, + OUString& rText, const IntlWrapper* pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -611,10 +600,9 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation { case text::HoriOrientation::NONE: { - rText += SW_RESSTR( STR_POS_X ); - rText += ' '; - rText += ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ); - rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); + rText = rText + SW_RESSTR( STR_POS_X ) + " " + + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; case text::HoriOrientation::RIGHT: @@ -654,14 +642,14 @@ SfxItemPresentation SwFmtAnchor::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -695,14 +683,14 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -727,14 +715,14 @@ SfxItemPresentation SwFmtCol::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -742,21 +730,17 @@ SfxItemPresentation SwFmtCol::GetPresentation sal_uInt16 nCnt = GetNumCols(); if ( nCnt > 1 ) { - rText = String::CreateFromInt32(nCnt); - rText += ' '; - rText += SW_RESSTR( STR_COLUMNS ); + rText = OUString::valueOf(nCnt) + " " + SW_RESSTR( STR_COLUMNS ); if ( COLADJ_NONE != GetLineAdj() ) { sal_uInt16 nWdth = sal_uInt16(GetLineWidth()); - rText += ' '; - rText += SW_RESSTR( STR_LINE_WIDTH ); - rText += ' '; - rText += ::GetMetricText( nWdth, eCoreUnit, + rText = rText + " " + SW_RESSTR( STR_LINE_WIDTH ) + " " + + ::GetMetricText( nWdth, eCoreUnit, SFX_MAPUNIT_POINT, pIntl ); } } else - rText.Erase(); + rText = OUString(); return ePres; } default:;//prevent warning @@ -772,11 +756,11 @@ SfxItemPresentation SwFmtURL::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: @@ -785,20 +769,18 @@ SfxItemPresentation SwFmtURL::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { if ( pMap ) - rText.AppendAscii( RTL_CONSTASCII_STRINGPARAM("Client-Map")); + rText += "Client-Map"; if ( sURL.Len() ) { if ( pMap ) - rText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" - ")); - rText.AppendAscii( RTL_CONSTASCII_STRINGPARAM("URL: ")); - rText += sURL; + rText += " - "; + rText = rText + "URL: " + sURL; if ( bIsServerMap ) - rText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" (Server-Map)")); + rText += " (Server-Map)"; } if ( sTargetFrameName.Len() ) { - rText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(", Target: ")); - rText += sTargetFrameName; + rText = rText + ", Target: " + sTargetFrameName; } return ePres; } @@ -816,15 +798,15 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { - rText.Erase(); + rText = OUString(); switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -844,14 +826,14 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -870,7 +852,7 @@ SfxItemPresentation SwFmtRowSplit::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, + OUString& /*rText*/, const IntlWrapper* /*pIntl*/ ) const { @@ -883,14 +865,14 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); + rText = OUString(); break; case SFX_ITEM_PRESENTATION_NAMELESS: @@ -922,14 +904,14 @@ SfxItemPresentation SwFmtChain::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -959,14 +941,14 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -977,9 +959,8 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation rText += SW_RESSTR(STR_DONTLINECOUNT); if ( GetStartValue() ) { - rText += ' '; - rText += SW_RESSTR(STR_LINCOUNT_START); - rText += String::CreateFromInt32(GetStartValue()); + rText = rText + " " + SW_RESSTR(STR_LINCOUNT_START) + + OUString::number( GetStartValue() ); } return ePres; } @@ -993,14 +974,14 @@ SfxItemPresentation SwTextGridItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + OUString& rText, const IntlWrapper* /*pIntl*/ ) 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: @@ -1038,7 +1019,7 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& /*rText*/, + OUString& /*rText*/, const IntlWrapper* /*pIntl*/ ) const { @@ -1050,7 +1031,7 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation SfxItemPresentation SwMirrorGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, const IntlWrapper* /*pIntl*/ ) const + OUString& rText, const IntlWrapper* /*pIntl*/ ) const { switch ( ePres ) { @@ -1076,7 +1057,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1085,7 +1066,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( SfxItemPresentation SwRotationGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { switch( ePres ) { @@ -1093,14 +1074,14 @@ SfxItemPresentation SwRotationGrf::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_ROTATION ); - else if( rText.Len() ) - rText.Erase(); - ( rText += OUString::number( GetValue() )) += '\xB0'; + else if( rText.getLength() ) + rText = OUString(); + rText = rText + OUString::number( GetValue() ) + "\xB0"; break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1108,7 +1089,7 @@ SfxItemPresentation SwRotationGrf::GetPresentation( SfxItemPresentation SwLuminanceGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { switch( ePres ) { @@ -1116,14 +1097,14 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_LUMINANCE ); - else if( rText.Len() ) - rText.Erase(); - ( rText += OUString::number( GetValue() )) += '%'; + else if( rText.getLength() ) + rText = OUString(); + rText = rText + OUString::number( GetValue() ) + "%"; break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1131,7 +1112,7 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation( SfxItemPresentation SwContrastGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { switch( ePres ) { @@ -1139,14 +1120,14 @@ SfxItemPresentation SwContrastGrf::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_CONTRAST ); - else if( rText.Len() ) - rText.Erase(); - ( rText += OUString::number( GetValue() )) += '%'; + else if( rText.getLength() ) + rText = OUString(); + rText = rText + OUString::number( GetValue() ) + "%"; break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1154,7 +1135,7 @@ SfxItemPresentation SwContrastGrf::GetPresentation( SfxItemPresentation SwChannelGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { switch( ePres ) { @@ -1172,17 +1153,17 @@ SfxItemPresentation SwChannelGrf::GetPresentation( } if( nId ) rText = SW_RESSTR( nId ); - else if( rText.Len() ) - rText.Erase(); + else if( rText.getLength() ) + rText = OUString(); } - else if( rText.Len() ) - rText.Erase(); - ( rText += OUString::number( GetValue() )) += '%'; + else if( rText.getLength() ) + rText = OUString(); + rText = rText + OUString::number( GetValue() ) + "%"; break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1190,7 +1171,7 @@ SfxItemPresentation SwChannelGrf::GetPresentation( SfxItemPresentation SwGammaGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { rtl::OUStringBuffer aText; switch( ePres ) @@ -1212,9 +1193,9 @@ SfxItemPresentation SwGammaGrf::GetPresentation( SfxItemPresentation SwInvertGrf::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: @@ -1235,7 +1216,7 @@ SfxItemPresentation SwInvertGrf::GetPresentation( SfxItemPresentation SwTransparencyGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper* /*pIntl*/) const { switch( ePres ) { @@ -1243,14 +1224,14 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_TRANSPARENCY ); - else if( rText.Len() ) - rText.Erase(); - ( rText += OUString::number( GetValue() )) += '%'; + else if( rText.getLength() ) + rText = OUString(); + rText = rText + OUString::number( GetValue() ) + "%"; break; default: ePres = SFX_ITEM_PRESENTATION_NONE; - rText.Erase(); + rText = OUString(); break; } return ePres; @@ -1258,9 +1239,9 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation( SfxItemPresentation SwDrawModeGrf::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: @@ -1276,7 +1257,7 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break; default: nId = STR_DRAWMODE_STD; break; } - (rText = SW_RESSTR( STR_DRAWMODE ) ) += SW_RESSTR( nId ); + rText = SW_RESSTR( STR_DRAWMODE ) + SW_RESSTR( nId ); } break; @@ -1290,10 +1271,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( SfxItemPresentation SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - String &rText, + OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText.Erase(); + rText = OUString(); switch( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index f05b85c611ca..9287f9af14b9 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -69,14 +69,14 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - String& rText, - const IntlWrapper* pIntl + OUString& rText, + const IntlWrapper* pIntl ) 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: @@ -84,10 +84,9 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation sal_uInt16 nHght = (sal_uInt16) GetPageFtnInfo().GetHeight(); if ( nHght ) { - rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ); - rText += ' '; - rText += ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ); - rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); + rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " + + ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } return ePres; } |