summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx2
-rw-r--r--avmedia/source/framework/mediaitem.cxx4
-rw-r--r--editeng/inc/editeng/adjitem.hxx2
-rw-r--r--editeng/inc/editeng/akrnitem.hxx2
-rw-r--r--editeng/inc/editeng/blnkitem.hxx2
-rw-r--r--editeng/inc/editeng/bolnitem.hxx2
-rw-r--r--editeng/inc/editeng/boxitem.hxx4
-rw-r--r--editeng/inc/editeng/brkitem.hxx2
-rw-r--r--editeng/inc/editeng/brshitem.hxx2
-rw-r--r--editeng/inc/editeng/bulitem.hxx2
-rw-r--r--editeng/inc/editeng/charhiddenitem.hxx2
-rw-r--r--editeng/inc/editeng/charreliefitem.hxx2
-rw-r--r--editeng/inc/editeng/charrotateitem.hxx2
-rw-r--r--editeng/inc/editeng/charscaleitem.hxx2
-rw-r--r--editeng/inc/editeng/cmapitem.hxx2
-rw-r--r--editeng/inc/editeng/cntritem.hxx2
-rw-r--r--editeng/inc/editeng/colritem.hxx2
-rw-r--r--editeng/inc/editeng/crsditem.hxx2
-rw-r--r--editeng/inc/editeng/cscoitem.hxx2
-rw-r--r--editeng/inc/editeng/emphitem.hxx2
-rw-r--r--editeng/inc/editeng/escpitem.hxx2
-rw-r--r--editeng/inc/editeng/fhgtitem.hxx2
-rw-r--r--editeng/inc/editeng/flstitem.hxx2
-rw-r--r--editeng/inc/editeng/fontitem.hxx2
-rw-r--r--editeng/inc/editeng/forbiddenruleitem.hxx2
-rw-r--r--editeng/inc/editeng/frmdiritem.hxx2
-rw-r--r--editeng/inc/editeng/fwdtitem.hxx2
-rw-r--r--editeng/inc/editeng/hngpnctitem.hxx2
-rw-r--r--editeng/inc/editeng/hyznitem.hxx2
-rw-r--r--editeng/inc/editeng/justifyitem.hxx6
-rw-r--r--editeng/inc/editeng/keepitem.hxx2
-rw-r--r--editeng/inc/editeng/kernitem.hxx2
-rw-r--r--editeng/inc/editeng/langitem.hxx2
-rw-r--r--editeng/inc/editeng/lcolitem.hxx2
-rw-r--r--editeng/inc/editeng/lrspitem.hxx2
-rw-r--r--editeng/inc/editeng/lspcitem.hxx2
-rw-r--r--editeng/inc/editeng/nhypitem.hxx2
-rw-r--r--editeng/inc/editeng/nlbkitem.hxx2
-rw-r--r--editeng/inc/editeng/opaqitem.hxx2
-rw-r--r--editeng/inc/editeng/optitems.hxx4
-rw-r--r--editeng/inc/editeng/orphitem.hxx2
-rw-r--r--editeng/inc/editeng/paravertalignitem.hxx2
-rw-r--r--editeng/inc/editeng/pbinitem.hxx2
-rw-r--r--editeng/inc/editeng/pgrditem.hxx2
-rw-r--r--editeng/inc/editeng/pmdlitem.hxx2
-rw-r--r--editeng/inc/editeng/postitem.hxx2
-rw-r--r--editeng/inc/editeng/prntitem.hxx2
-rw-r--r--editeng/inc/editeng/protitem.hxx2
-rw-r--r--editeng/inc/editeng/prszitem.hxx2
-rw-r--r--editeng/inc/editeng/scriptspaceitem.hxx2
-rw-r--r--editeng/inc/editeng/shaditem.hxx2
-rw-r--r--editeng/inc/editeng/shdditem.hxx2
-rw-r--r--editeng/inc/editeng/sizeitem.hxx2
-rw-r--r--editeng/inc/editeng/spltitem.hxx2
-rw-r--r--editeng/inc/editeng/tstpitem.hxx2
-rw-r--r--editeng/inc/editeng/twolinesitem.hxx2
-rw-r--r--editeng/inc/editeng/udlnitem.hxx2
-rw-r--r--editeng/inc/editeng/ulspitem.hxx2
-rw-r--r--editeng/inc/editeng/wghtitem.hxx2
-rw-r--r--editeng/inc/editeng/widwitem.hxx2
-rw-r--r--editeng/inc/editeng/writingmodeitem.hxx2
-rw-r--r--editeng/inc/editeng/wrlmitem.hxx2
-rw-r--r--editeng/inc/editeng/xmlcnitm.hxx2
-rw-r--r--editeng/source/items/bulitem.cxx4
-rw-r--r--editeng/source/items/charhiddenitem.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx303
-rw-r--r--editeng/source/items/justifyitem.cxx12
-rw-r--r--editeng/source/items/optitems.cxx19
-rw-r--r--editeng/source/items/paraitem.cxx110
-rw-r--r--editeng/source/items/textitem.cxx153
-rw-r--r--editeng/source/items/writingmodeitem.cxx4
-rw-r--r--editeng/source/items/xmlcnitm.cxx2
-rw-r--r--sc/inc/attrib.hxx10
-rw-r--r--sc/inc/docpool.hxx2
-rw-r--r--sc/source/core/data/attrib.cxx91
-rw-r--r--sc/source/core/data/docpool.cxx72
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx4
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx2
-rw-r--r--sfx2/source/config/evntconf.cxx4
-rw-r--r--sfx2/source/doc/frmdescr.cxx4
-rw-r--r--svl/inc/svl/cenumitm.hxx4
-rw-r--r--svl/inc/svl/cintitem.hxx8
-rw-r--r--svl/inc/svl/ctypeitm.hxx2
-rw-r--r--svl/inc/svl/custritm.hxx2
-rw-r--r--svl/inc/svl/dateitem.hxx2
-rw-r--r--svl/inc/svl/flagitem.hxx2
-rw-r--r--svl/inc/svl/intitem.hxx2
-rw-r--r--svl/inc/svl/itempool.hxx2
-rw-r--r--svl/inc/svl/macitem.hxx2
-rw-r--r--svl/inc/svl/poolitem.hxx7
-rw-r--r--svl/inc/svl/ptitem.hxx2
-rw-r--r--svl/inc/svl/rectitem.hxx2
-rw-r--r--svl/inc/svl/rngitem.hxx4
-rw-r--r--svl/inc/svl/slstitm.hxx2
-rw-r--r--svl/inc/svl/srchitem.hxx2
-rw-r--r--svl/inc/svl/szitem.hxx2
-rw-r--r--svl/inc/svl/visitem.hxx2
-rw-r--r--svl/source/items/cenumitm.cxx6
-rw-r--r--svl/source/items/cintitem.cxx14
-rw-r--r--svl/source/items/ctypeitm.cxx4
-rw-r--r--svl/source/items/custritm.cxx2
-rw-r--r--svl/source/items/dateitem.cxx16
-rw-r--r--svl/source/items/flagitem.cxx6
-rw-r--r--svl/source/items/intitem.cxx2
-rw-r--r--svl/source/items/itempool.cxx2
-rw-r--r--svl/source/items/macitem.cxx4
-rw-r--r--svl/source/items/poolitem.cxx6
-rw-r--r--svl/source/items/ptitem.cxx7
-rw-r--r--svl/source/items/rectitem.cxx13
-rw-r--r--svl/source/items/rngitem_inc.cxx4
-rw-r--r--svl/source/items/sitem.cxx2
-rw-r--r--svl/source/items/slstitm.cxx4
-rw-r--r--svl/source/items/srchitem.cxx2
-rw-r--r--svl/source/items/style.cxx6
-rw-r--r--svl/source/items/szitem.cxx7
-rw-r--r--svl/source/items/visitem.cxx6
-rw-r--r--svl/source/misc/inethist.cxx4
-rw-r--r--svx/inc/svx/algitem.hxx4
-rw-r--r--svx/inc/svx/chrtitem.hxx2
-rw-r--r--svx/inc/svx/drawitem.hxx12
-rw-r--r--svx/inc/svx/grfcrop.hxx2
-rw-r--r--svx/inc/svx/numinf.hxx2
-rw-r--r--svx/inc/svx/optgrid.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx4
-rw-r--r--svx/inc/svx/postattr.hxx9
-rw-r--r--svx/inc/svx/rotmodit.hxx2
-rw-r--r--svx/inc/svx/rulritem.hxx10
-rw-r--r--svx/inc/svx/sdangitm.hxx2
-rw-r--r--svx/inc/svx/sdasaitm.hxx2
-rw-r--r--svx/inc/svx/sdasitm.hxx2
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdmetitm.hxx2
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdprcitm.hxx4
-rw-r--r--svx/inc/svx/sdtaaitm.hxx2
-rw-r--r--svx/inc/svx/sdtaditm.hxx2
-rw-r--r--svx/inc/svx/sdtaitm.hxx6
-rw-r--r--svx/inc/svx/sdtakitm.hxx4
-rw-r--r--svx/inc/svx/sdtayitm.hxx2
-rw-r--r--svx/inc/svx/sdtfchim.hxx2
-rw-r--r--svx/inc/svx/sdtfsitm.hxx4
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/inc/svx/svdpool.hxx4
-rw-r--r--svx/inc/svx/svdtrans.hxx10
-rw-r--r--svx/inc/svx/sxcecitm.hxx4
-rw-r--r--svx/inc/svx/sxcikitm.hxx2
-rw-r--r--svx/inc/svx/sxctitm.hxx4
-rw-r--r--svx/inc/svx/sxekitm.hxx2
-rw-r--r--svx/inc/svx/sxfiitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx2
-rw-r--r--svx/inc/svx/sxmtpitm.hxx4
-rw-r--r--svx/inc/svx/sxmuitm.hxx2
-rw-r--r--svx/inc/svx/sxsiitm.hxx2
-rw-r--r--svx/inc/svx/xbtmpit.hxx4
-rw-r--r--svx/inc/svx/xfillit0.hxx2
-rw-r--r--svx/inc/svx/xflbckit.hxx2
-rw-r--r--svx/inc/svx/xflbmpit.hxx2
-rw-r--r--svx/inc/svx/xflbmsli.hxx2
-rw-r--r--svx/inc/svx/xflbmsxy.hxx4
-rw-r--r--svx/inc/svx/xflbmtit.hxx2
-rw-r--r--svx/inc/svx/xflboxy.hxx4
-rw-r--r--svx/inc/svx/xflbstit.hxx2
-rw-r--r--svx/inc/svx/xflbtoxy.hxx4
-rw-r--r--svx/inc/svx/xflclit.hxx2
-rw-r--r--svx/inc/svx/xflftrit.hxx2
-rw-r--r--svx/inc/svx/xflgrit.hxx6
-rw-r--r--svx/inc/svx/xflhtit.hxx2
-rw-r--r--svx/inc/svx/xfltrit.hxx2
-rw-r--r--svx/inc/svx/xgrscit.hxx2
-rw-r--r--svx/inc/svx/xlineit0.hxx2
-rw-r--r--svx/inc/svx/xlinjoit.hxx2
-rw-r--r--svx/inc/svx/xlncapit.hxx2
-rw-r--r--svx/inc/svx/xlnclit.hxx2
-rw-r--r--svx/inc/svx/xlndsit.hxx2
-rw-r--r--svx/inc/svx/xlnedcit.hxx2
-rw-r--r--svx/inc/svx/xlnedit.hxx2
-rw-r--r--svx/inc/svx/xlnedwit.hxx2
-rw-r--r--svx/inc/svx/xlnstcit.hxx2
-rw-r--r--svx/inc/svx/xlnstit.hxx2
-rw-r--r--svx/inc/svx/xlnstwit.hxx2
-rw-r--r--svx/inc/svx/xlntrit.hxx2
-rw-r--r--svx/inc/svx/xlnwtit.hxx2
-rw-r--r--svx/inc/svx/xsflclit.hxx2
-rw-r--r--svx/source/dialog/optgrid.cxx6
-rw-r--r--svx/source/dialog/rulritem.cxx10
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/items/algitem.cxx54
-rw-r--r--svx/source/items/chrtitem.cxx2
-rw-r--r--svx/source/items/customshapeitem.cxx8
-rw-r--r--svx/source/items/drawitem.cxx24
-rw-r--r--svx/source/items/grfitem.cxx16
-rw-r--r--svx/source/items/numinf.cxx4
-rw-r--r--svx/source/items/pageitem.cxx27
-rw-r--r--svx/source/items/postattr.cxx21
-rw-r--r--svx/source/items/rotmodit.cxx7
-rw-r--r--svx/source/svdraw/svdattr.cxx245
-rw-r--r--svx/source/svdraw/svdibrow.cxx21
-rw-r--r--svx/source/svdraw/svdtrans.cxx132
-rw-r--r--svx/source/xoutdev/xattr.cxx86
-rw-r--r--svx/source/xoutdev/xattr2.cxx79
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx10
-rw-r--r--sw/inc/fchrfmt.hxx2
-rw-r--r--sw/inc/fmtanchr.hxx2
-rw-r--r--sw/inc/fmtautofmt.hxx2
-rw-r--r--sw/inc/fmtclds.hxx2
-rw-r--r--sw/inc/fmtcnct.hxx2
-rw-r--r--sw/inc/fmteiro.hxx2
-rw-r--r--sw/inc/fmtfollowtextflow.hxx2
-rw-r--r--sw/inc/fmtfsize.hxx2
-rw-r--r--sw/inc/fmtftntx.hxx2
-rw-r--r--sw/inc/fmthdft.hxx4
-rw-r--r--sw/inc/fmtinfmt.hxx2
-rw-r--r--sw/inc/fmtline.hxx2
-rw-r--r--sw/inc/fmtlsplt.hxx2
-rw-r--r--sw/inc/fmtornt.hxx4
-rw-r--r--sw/inc/fmtpdsc.hxx2
-rw-r--r--sw/inc/fmtrowsplt.hxx2
-rw-r--r--sw/inc/fmtruby.hxx2
-rw-r--r--sw/inc/fmtsrnd.hxx2
-rw-r--r--sw/inc/fmturl.hxx2
-rw-r--r--sw/inc/format.hxx2
-rw-r--r--sw/inc/grfatr.hxx18
-rw-r--r--sw/inc/hfspacingitem.hxx2
-rw-r--r--sw/inc/paratr.hxx8
-rw-r--r--sw/inc/swatrset.hxx2
-rw-r--r--sw/inc/swtypes.hxx2
-rw-r--r--sw/inc/tgrditem.hxx2
-rw-r--r--sw/source/ui/app/docstyle.cxx12
-rw-r--r--sw/source/ui/inc/uiitems.hxx2
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx285
-rw-r--r--sw/source/ui/utlui/uiitems.cxx13
-rw-r--r--tools/source/inet/inetmime.cxx34
232 files changed, 1185 insertions, 1294 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index ce0a389a042c..f14281999307 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -75,7 +75,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *pIntl ) 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/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 05c29aa70dda..244bb553f673 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -139,10 +139,10 @@ SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
SfxMapUnit,
SfxMapUnit,
- XubString& rText,
+ OUString& rText,
const IntlWrapper * ) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index b4c874238c0e..64eceafec178 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -66,7 +66,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;
virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const;
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index 0447cf4fd3f8..19e089edf324 100644
--- a/editeng/inc/editeng/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.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;
inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index 8573ace8d8e4..4ef638ed6f4e 100644
--- a/editeng/inc/editeng/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -50,7 +50,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 5582bec92fac..07ad4da38bc5 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 76e511d2b35a..c1a6d13d7402 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -77,7 +77,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
@@ -184,7 +184,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/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 42a423aa838d..9aab77c02c86 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -55,7 +55,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index fca5653a6aaf..c92f406a0f18 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -86,7 +86,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 32f8be4dc78a..345cf3ff7639 100644
--- a/editeng/inc/editeng/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -122,7 +122,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
static void StoreFont( SvStream&, const Font& );
static Font CreateFont( SvStream&, sal_uInt16 nVer );
diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index ee4c16e99335..651bdc240ef1 100644
--- a/editeng/inc/editeng/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.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;
inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index a472688874e0..445f7afc4461 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -50,7 +50,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 135d964d604b..7845ab69ccd8 100644
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -51,7 +51,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index d8d364a61353..7d9b38761852 100644
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -48,7 +48,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index fc911a618d59..8e2f0f0c326a 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index 98f05f6097c6..079b1d41f64a 100644
--- a/editeng/inc/editeng/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.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;
inline SvxContourItem& operator=(const SvxContourItem& rCont)
{
diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index efc8c34cead3..46d4ea41bd52 100644
--- a/editeng/inc/editeng/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -61,7 +61,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index 4aed4708ad64..6906d185639e 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.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 SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index b36e98250d01..6fc197fb1394 100644
--- a/editeng/inc/editeng/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 2cecc34a481f..7e9695f0be69 100644
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -48,7 +48,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 51b2a5f7653a..d16adbc1aa22 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -60,7 +60,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/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index 5c5c2af762df..661d76c43197 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -59,7 +59,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index 053fdf9f8852..69b64cb8001f 100644
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -56,7 +56,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
const FontList* GetFontList() const { return pFontList; }
};
diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index e570bccb9ed8..e8a119c18c38 100644
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -68,7 +68,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
// Access methods:
void SetFamilyName( const String& rFamilyName ) { aFamilyName = rFamilyName; }
diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index 2896db2fcd6f..2d15a3d00bf3 100644
--- a/editeng/inc/editeng/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -44,7 +44,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
inline SvxForbiddenRuleItem& operator=(
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 4f62b7ab92ce..6ea04dc66f09 100644
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -50,7 +50,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 981570c263d8..73f897ffc06d 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -49,7 +49,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 36ede9560e71..4454faab0b76 100644
--- a/editeng/inc/editeng/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -44,7 +44,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
inline SvxHangingPunctuationItem& operator=(
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 8d9a6b0ba4e9..cacaf8cb1cb7 100644
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -60,7 +60,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/justifyitem.hxx b/editeng/inc/editeng/justifyitem.hxx
index 5d03c09332ca..cfbdcff00a65 100644
--- a/editeng/inc/editeng/justifyitem.hxx
+++ b/editeng/inc/editeng/justifyitem.hxx
@@ -39,7 +39,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 );
@@ -72,7 +72,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 );
@@ -101,7 +101,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/editeng/inc/editeng/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index c950e5b865bb..32a9abd00d6e 100644
--- a/editeng/inc/editeng/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.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;
};
inline SvxFmtKeepItem::SvxFmtKeepItem( const sal_Bool bKeep, const sal_uInt16 _nWhich ) :
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index 7305b465d401..cfdf916e484a 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -55,7 +55,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
inline SvxKerningItem& operator=(const SvxKerningItem& rKern) {
SetValue( rKern.GetValue() );
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index d77dfbab235f..ff78d9d60139 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 31fa25c2e4f1..5b97c52d6c6d 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -39,7 +39,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * pIntlWrapper = 0 )
const;
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 5b12bceda592..af4a2071ff12 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -82,7 +82,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 6d30bb2d554e..ebbd3cd6efbe 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -64,7 +64,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index f26c1a076188..51942c318bbd 100644
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -39,7 +39,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
{
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index 9a0fa3241ac0..209b0539ba07 100644
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -39,7 +39,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB)
{
diff --git a/editeng/inc/editeng/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 930acb73681b..8174def1969c 100644
--- a/editeng/inc/editeng/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.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;
};
inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const sal_Bool bOpa )
diff --git a/editeng/inc/editeng/optitems.hxx b/editeng/inc/editeng/optitems.hxx
index eb340e218e1e..34970ebbc42c 100644
--- a/editeng/inc/editeng/optitems.hxx
+++ b/editeng/inc/editeng/optitems.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 SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
@@ -77,7 +77,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;
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const;
diff --git a/editeng/inc/editeng/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index 686823a49e70..90e464518946 100644
--- a/editeng/inc/editeng/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.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;
inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
{
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index 04803674b68a..ab65b8994325 100644
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -48,7 +48,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index 5fefd2f66567..38630c78f86c 100644
--- a/editeng/inc/editeng/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -49,7 +49,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
};
inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
diff --git a/editeng/inc/editeng/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index 4f40b8be213c..9c4c47cce882 100644
--- a/editeng/inc/editeng/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -46,7 +46,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/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index f1a2697b65d5..55fee950d8f0 100644
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.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 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/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index be5cd9f344ec..2d9428f2612a 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index 548db4223488..050131953dc3 100644
--- a/editeng/inc/editeng/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -49,7 +49,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
};
inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const sal_Bool bPrt )
diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 7899699ba352..356ae1f5d393 100644
--- a/editeng/inc/editeng/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/editeng/inc/editeng/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 76a6ed5222cb..d89669d8eca2 100644
--- a/editeng/inc/editeng/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.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;
inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize)
{
diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index 581d9e97c6f0..f58234baf042 100644
--- a/editeng/inc/editeng/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -45,7 +45,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 7abe135e2857..acf9f9c7a824 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -63,7 +63,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index c69d8fffaf0f..ea198dd0113f 100644
--- a/editeng/inc/editeng/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.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;
inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) {
SetValue(rShadow.GetValue());
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index e99f6c002bed..df70d40c47cf 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.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 SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index c203ad23f883..f4a10f65f854 100644
--- a/editeng/inc/editeng/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.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;
};
inline SvxFmtSplitItem::SvxFmtSplitItem( const sal_Bool bSplit, const sal_uInt16 nWh ) :
diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index d3f9d2c8470a..f8eca761395b 100644
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -148,7 +148,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;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 0d5babfee83b..b453b8ebcbba 100644
--- a/editeng/inc/editeng/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.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, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index 985da198faf0..4422647bedef 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.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 SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index dc965e1f78ef..c79efa64a5e9 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -59,7 +59,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;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 4168d0de01f8..db74f2b37e0f 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.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;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/editeng/inc/editeng/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index 3bf165a45c87..580c652253ab 100644
--- a/editeng/inc/editeng/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.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;
inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
{
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 9474a16acf17..c1ad81587f42 100644
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -45,7 +45,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/editeng/inc/editeng/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index b2ddc8bf9c0e..04d21c60301c 100644
--- a/editeng/inc/editeng/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.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;
inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
{
diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index 0ca640289125..f82439572452 100644
--- a/editeng/inc/editeng/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -49,7 +49,7 @@ public:
SfxItemPresentation ePresentation,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresentationMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper *pIntlWrapper = 0 ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 0a433ecfa49e..6b93d576429f 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -381,14 +381,14 @@ SfxItemPresentation SvxBulletItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper *
) const
{
SfxItemPresentation eRet = SFX_ITEM_PRESENTATION_NONE;
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
eRet = SFX_ITEM_PRESENTATION_NONE;
break;
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 5fa79fae4abc..4a2d257c73b0 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -38,13 +38,13 @@ SfxItemPresentation SvxCharHiddenItem::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:
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 6e202da73a87..1d6798c495d8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -207,17 +207,17 @@ SfxItemPresentation SvxPaperBinItem::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 = String::CreateFromInt32( GetValue() );
+ rText = OUString::number( GetValue() );
return SFX_ITEM_PRESENTATION_NAMELESS;
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -228,9 +228,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
else
{
- rText = EE_RESSTR(RID_SVXSTR_PAPERBIN);
- rText += sal_Unicode(' ');
- rText += String::CreateFromInt32( nValue );
+ rText = EE_RESSTR(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue );
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -355,29 +353,30 @@ SfxItemPresentation SvxSizeItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
- XubString& rText, const IntlWrapper *pIntl
+ OUString& rText, const IntlWrapper *pIntl
) const
{
+ OUString cpDelimTmp(cpDelim);
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
- rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
+ rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
+ cpDelimTmp +
+ GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
return SFX_ITEM_PRESENTATION_NAMELESS;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
- rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
- rText += cpDelim;
- rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
- rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) +
+ GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit)) +
+ cpDelimTmp +
+ EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT) +
+ GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
//no break necessary
default: ;//prevent warning
@@ -607,30 +606,30 @@ SfxItemPresentation SvxLRSpaceItem::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 SFX_ITEM_PRESENTATION_NONE;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
if ( 100 != nPropLeftMargin )
- ( rText = String::CreateFromInt32( nPropLeftMargin )) += sal_Unicode('%');
+ rText = OUString::number( nPropLeftMargin ) + "%";
else
rText = GetMetricText( (long)nLeftMargin,
eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText += OUString(cpDelim);
if ( 100 != nPropFirstLineOfst )
- ( rText += String::CreateFromInt32( nPropFirstLineOfst )) += sal_Unicode('%');
+ rText = rText + OUString::number( nPropFirstLineOfst ) + "%";
else
rText += GetMetricText( (long)nFirstLineOfst,
eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText += OUString(cpDelim);
if ( 100 != nRightMargin )
- ( rText += String::CreateFromInt32( nRightMargin )) += sal_Unicode('%');
+ rText = rText + OUString::number( nRightMargin ) + "%";
else
rText += GetMetricText( (long)nRightMargin,
eCoreUnit, ePresUnit, pIntl );
@@ -640,36 +639,37 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
{
rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
if ( 100 != nPropLeftMargin )
- ( rText += String::CreateFromInt32( nPropLeftMargin )) += sal_Unicode('%');
+ rText += OUString::number( nPropLeftMargin ) + "%";
else
{
- rText += GetMetricText( (long)nLeftMargin,
- eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
- rText += cpDelim;
+ rText += OUString(cpDelim);
if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
{
rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
if ( 100 != nPropFirstLineOfst )
- ( rText += String::CreateFromInt32( nPropFirstLineOfst ))
- += sal_Unicode('%');
+ rText = rText + OUString::number( nPropFirstLineOfst ) + "%";
else
{
- rText += GetMetricText( (long)nFirstLineOfst,
- eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nFirstLineOfst,
+ eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
- rText += cpDelim;
+ rText += OUString(cpDelim);
}
rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
- ( rText += String::CreateFromInt32( nPropRightMargin )) += sal_Unicode('%');
+ rText = rText + OUString::number( nPropRightMargin ) + "%";
else
{
- rText += GetMetricText( (long)nRightMargin,
- eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nRightMargin,
+ eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -967,23 +967,23 @@ SfxItemPresentation SvxULSpaceItem::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 SFX_ITEM_PRESENTATION_NONE;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
if ( 100 != nPropUpper )
- ( rText = String::CreateFromInt32( nPropUpper )) += sal_Unicode('%');
+ rText = OUString::number( nPropUpper ) + "%";
else
rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText += OUString(cpDelim);
if ( 100 != nPropLower )
- ( rText += String::CreateFromInt32( nPropLower )) += sal_Unicode('%');
+ rText += OUString::number( nPropLower ) + "%";
else
rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
return SFX_ITEM_PRESENTATION_NAMELESS;
@@ -992,20 +992,21 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
{
rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
if ( 100 != nPropUpper )
- ( rText += String::CreateFromInt32( nPropUpper )) += sal_Unicode('%');
+ rText += OUString::number( nPropUpper ) + "%";
else
{
- rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
- rText += cpDelim;
- rText += EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
+ rText = rText + OUString(cpDelim) + EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
if ( 100 != nPropLower )
- ( rText += String::CreateFromInt32( nPropLower )) += sal_Unicode('%');
+ rText += OUString::number( nPropLower ) + "%";
else
{
- rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -1103,13 +1104,13 @@ SfxItemPresentation SvxPrintItem::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:
@@ -1158,13 +1159,13 @@ SfxItemPresentation SvxOpaqueItem::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:
@@ -1241,13 +1242,13 @@ SfxItemPresentation SvxProtectItem::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:
@@ -1257,14 +1258,12 @@ SfxItemPresentation SvxProtectItem::GetPresentation
if ( bCntnt )
nId = RID_SVXITEMS_PROT_CONTENT_TRUE;
- rText = EE_RESSTR(nId);
- rText += cpDelim;
+ rText = EE_RESSTR(nId) + OUString(cpDelim);
nId = RID_SVXITEMS_PROT_SIZE_FALSE;
if ( bSize )
nId = RID_SVXITEMS_PROT_SIZE_TRUE;
- rText += EE_RESSTR(nId);
- rText += cpDelim;
+ rText = rText + EE_RESSTR(nId) + OUString(cpDelim);
nId = RID_SVXITEMS_PROT_POS_FALSE;
if ( bPos )
@@ -1464,45 +1463,46 @@ SfxItemPresentation SvxShadowItem::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:
{
- rText = ::GetColorString( aShadowColor );
- rText += cpDelim;
+ rText = ::GetColorString( aShadowColor ) + OUString(cpDelim);
sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
if ( aShadowColor.GetTransparency() )
nId = RID_SVXITEMS_TRANSPARENT_TRUE;
- rText += EE_RESSTR(nId);
- rText += cpDelim;
- rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
- rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+ rText = rText +
+ EE_RESSTR(nId) +
+ OUString(cpDelim) +
+ GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
+ OUString(cpDelim) +
+ EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return ePres;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
- rText += ::GetColorString( aShadowColor );
- rText += cpDelim;
+ rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE) +
+ ::GetColorString( aShadowColor ) +
+ OUString(cpDelim);
sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
if ( aShadowColor.GetTransparency() )
nId = RID_SVXITEMS_TRANSPARENT_TRUE;
- rText += EE_RESSTR(nId);
- rText += cpDelim;
- rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
- rText += cpDelim;
- rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+ rText = rText +
+ EE_RESSTR(nId) +
+ OUString(cpDelim) +
+ GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit)) +
+ OUString(cpDelim) +
+ EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return ePres;
}
default: ;//prevent warning
@@ -2063,54 +2063,52 @@ SfxItemPresentation SvxBoxItem::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.Erase();
+ rText = OUString();
if ( pTop )
{
- rText = pTop->GetValueString( eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText = pTop->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
}
if( !(pTop && pBottom && pLeft && pRight &&
*pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight) )
{
if ( pBottom )
{
- rText += pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
}
if ( pLeft )
{
- rText += pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
}
if ( pRight )
{
- rText += pRight->GetValueString( eCoreUnit, ePresUnit, pIntl );
- rText += cpDelim;
+ rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
}
}
rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl );
if( nTopDist != nBottomDist || nTopDist != nLeftDist ||
nTopDist != nRightDist )
{
- (((((rText += cpDelim)
- += GetMetricText( (long)nBottomDist, eCoreUnit,
- ePresUnit, pIntl ))
- += cpDelim)
- += GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ))
- += cpDelim)
- += GetMetricText( (long)nRightDist, eCoreUnit,
+ rText = rText +
+ cpDelimTmp +
+ GetMetricText( (long)nBottomDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ cpDelimTmp +
+ GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ) +
+ cpDelimTmp +
+ GetMetricText( (long)nRightDist, eCoreUnit,
ePresUnit, pIntl );
}
return SFX_ITEM_PRESENTATION_NAMELESS;
@@ -2119,8 +2117,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation
{
if( !(pTop || pBottom || pLeft || pRight) )
{
- rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE);
- rText += cpDelim;
+ rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp;
}
else
{
@@ -2128,34 +2125,37 @@ SfxItemPresentation SvxBoxItem::GetPresentation
if( pTop && pBottom && pLeft && pRight &&
*pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
{
- rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
- rText += cpDelim;
+ rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True ) + cpDelimTmp;
}
else
{
if ( pTop )
{
- rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP);
- rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
- rText += cpDelim;
+ rText = rText +
+ EE_RESSTR(RID_SVXITEMS_BORDER_TOP) +
+ pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True ) +
+ cpDelimTmp;
}
if ( pBottom )
{
- rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
- rText += pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
- rText += cpDelim;
+ rText = rText +
+ EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM) +
+ pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True ) +
+ cpDelimTmp;
}
if ( pLeft )
{
- rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT);
- rText += pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
- rText += cpDelim;
+ rText = rText +
+ EE_RESSTR(RID_SVXITEMS_BORDER_LEFT) +
+ pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True ) +
+ cpDelimTmp;
}
if ( pRight )
{
- rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
- rText += pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
- rText += cpDelim;
+ rText = rText +
+ EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT) +
+ pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True ) +
+ cpDelimTmp;
}
}
}
@@ -2164,31 +2164,33 @@ SfxItemPresentation SvxBoxItem::GetPresentation
if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
nTopDist == nRightDist )
{
- rText += GetMetricText( (long)nTopDist, eCoreUnit,
- ePresUnit, pIntl );
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ GetMetricText( (long)nTopDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
else
{
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
- += GetMetricText( (long)nTopDist, eCoreUnit,
- ePresUnit, pIntl ))
- += EE_RESSTR(GetMetricId(ePresUnit)))
- += cpDelim;
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
- += GetMetricText( (long)nBottomDist, eCoreUnit,
- ePresUnit, pIntl ))
- += EE_RESSTR(GetMetricId(ePresUnit)))
- += cpDelim;
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
- += GetMetricText( (long)nLeftDist, eCoreUnit,
- ePresUnit, pIntl ))
- += EE_RESSTR(GetMetricId(ePresUnit)))
- += cpDelim;
- ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
- += GetMetricText( (long)nRightDist, eCoreUnit,
- ePresUnit, pIntl ))
- += EE_RESSTR(GetMetricId(ePresUnit));
+ rText = rText +
+ EE_RESSTR(RID_SVXITEMS_BORDER_TOP) +
+ GetMetricText( (long)nTopDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit)) +
+ cpDelimTmp +
+ EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM) +
+ GetMetricText( (long)nBottomDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit)) +
+ cpDelimTmp +
+ EE_RESSTR(RID_SVXITEMS_BORDER_LEFT) +
+ GetMetricText( (long)nLeftDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit)) +
+ cpDelimTmp +
+ EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT) +
+ GetMetricText( (long)nRightDist, eCoreUnit,
+ ePresUnit, pIntl ) +
+ EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -2583,10 +2585,10 @@ SfxItemPresentation SvxBoxInfoItem::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;
}
@@ -2929,13 +2931,13 @@ SfxItemPresentation SvxFmtBreakItem::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:
@@ -3080,13 +3082,13 @@ SfxItemPresentation SvxFmtKeepItem::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:
@@ -3230,10 +3232,10 @@ SfxItemPresentation SvxLineItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
- XubString& rText, const IntlWrapper *pIntl
+ OUString& rText, const IntlWrapper *pIntl
) const
{
- rText.Erase();
+ rText = OUString();
switch ( ePres )
{
@@ -3766,13 +3768,13 @@ SfxItemPresentation SvxBrushItem::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:
@@ -3780,8 +3782,7 @@ SfxItemPresentation SvxBrushItem::GetPresentation
{
if ( GPOS_NONE == eGraphicPos )
{
- rText = ::GetColorString( aColor );
- rText += cpDelim;
+ rText = ::GetColorString( aColor ) + OUString(cpDelim);
sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
if ( aColor.GetTransparency() )
@@ -4194,13 +4195,13 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *) const
+ OUString& rText, const IntlWrapper *) const
{
SfxItemPresentation eRet = ePres;
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index c92220346e33..e938426dbcde 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -55,12 +55,12 @@ SfxItemPresentation SvxHorJustifyItem::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:
@@ -212,13 +212,13 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ 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:
@@ -353,13 +353,13 @@ SfxItemPresentation SvxJustifyMethodItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ 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:
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index f5b58883d385..3c5133421bd6 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -63,14 +63,14 @@ SfxItemPresentation SfxSpellCheckItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit ,
SfxMapUnit ,
- String& rText,
+ 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:
@@ -142,24 +142,25 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit ,
SfxMapUnit ,
- String& rText,
+ 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 += String::CreateFromInt32( nMinLead );
- rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD );
- rText += ',';
- rText += String::CreateFromInt32( nMinTrail );
- rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL );
+ rText = rText +
+ OUString::number( nMinLead ) +
+ EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD ) +
+ "," +
+ OUString::number( nMinTrail ) +
+ EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL );
return ePres;
}
default:
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index f430dc92109e..f9e7c5ed7378 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -244,13 +244,13 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper *
) const
{
#ifdef DBG_UTIL
- rText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SvxLineSpacingItem" ));
+ rText = "SvxLineSpacingItem";
#else
- rText.Erase();
+ rText = OUString();
#endif
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -437,13 +437,13 @@ SfxItemPresentation SvxAdjustItem::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:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -566,14 +566,14 @@ SfxItemPresentation SvxWidowsItem::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();
break;
}
@@ -585,9 +585,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE);
- rText += ' ';
- rText += EE_RESSTR(RID_SVXITEMS_LINES);
+ rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES);
}
default:
@@ -596,7 +594,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
}
}
- rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) );
+ rText = rText.replaceFirst( "%1", OUString::number( GetValue() ) );
return ePres;
}
@@ -638,14 +636,14 @@ SfxItemPresentation SvxOrphansItem::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();
break;
}
@@ -657,9 +655,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE);
- rText += ' ';
- rText += EE_RESSTR(RID_SVXITEMS_LINES);
+ rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES);
}
default:
@@ -668,7 +664,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
}
}
- rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) );
+ rText = rText.replaceFirst( "%1", OUString::number( GetValue() ) );
return ePres;
}
@@ -759,13 +755,14 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper *
) const
{
+ OUString cpDelimTmp(cpDelim);
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
@@ -773,19 +770,15 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
if ( bHyphen )
nId = RID_SVXITEMS_HYPHEN_TRUE;
- rText = EE_RESSTR(nId);
- rText += cpDelim;
+ rText = EE_RESSTR(nId) + cpDelimTmp;
nId = RID_SVXITEMS_PAGE_END_FALSE;
if ( bPageEnd )
nId = RID_SVXITEMS_PAGE_END_TRUE;
- rText += EE_RESSTR(nId);
- rText += cpDelim;
- rText += String::CreateFromInt32( nMinLead );
- rText += cpDelim;
- rText += String::CreateFromInt32( nMinTrail );
- rText += cpDelim;
- rText += String::CreateFromInt32( nMaxHyphens );
+ rText = rText + EE_RESSTR(nId) + cpDelimTmp +
+ OUString::number( nMinLead ) + cpDelimTmp +
+ OUString::number( nMinTrail ) + cpDelimTmp +
+ OUString::number( nMaxHyphens );
return SFX_ITEM_PRESENTATION_COMPLETE;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -794,22 +787,22 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
if ( bHyphen )
nId = RID_SVXITEMS_HYPHEN_TRUE;
- rText = EE_RESSTR(nId);
- rText += cpDelim;
+ rText = EE_RESSTR(nId) + cpDelimTmp;
nId = RID_SVXITEMS_PAGE_END_FALSE;
if ( bPageEnd )
nId = RID_SVXITEMS_PAGE_END_TRUE;
- rText += EE_RESSTR(nId);
- rText += cpDelim;
- rText += String::CreateFromInt32(nMinLead);
- rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD);
- rText += cpDelim;
- rText += String::CreateFromInt32(nMinTrail);
- rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL);
- rText += cpDelim;
- rText += String::CreateFromInt32(nMaxHyphens);
- rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
+ rText = rText +
+ EE_RESSTR(nId) +
+ cpDelimTmp +
+ OUString::number( nMinLead ) +
+ EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD) +
+ cpDelimTmp +
+ OUString::number( nMinTrail ) +
+ EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL) +
+ cpDelimTmp +
+ OUString::number( nMaxHyphens ) +
+ EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ;//prevent warning
@@ -1128,10 +1121,10 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
- XubString& rText, const IntlWrapper *pIntl
+ OUString& rText, const IntlWrapper *pIntl
) const
{
- rText.Erase();
+ rText = OUString();
if ( ePres > SFX_ITEM_PRESENTATION_NONE )
{
@@ -1142,7 +1135,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
if ( SVX_TAB_ADJUST_DEFAULT != ((*this)[i]).GetAdjustment() )
{
if ( bComma )
- rText += sal_Unicode(',');
+ rText += ",";
rText += GetMetricText(
((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
@@ -1294,13 +1287,13 @@ SfxItemPresentation SvxFmtSplitItem::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:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -1360,10 +1353,10 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper *
) const
{
- rText.Erase();
+ rText = OUString();
bool bSet = ( GetValue().Len() > 0 );
switch ( ePres )
@@ -1379,8 +1372,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
if ( bSet )
{
- rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE);
- rText += GetValue();
+ rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue();
}
return SFX_ITEM_PRESENTATION_COMPLETE;
default: ;//prevent warning
@@ -1420,12 +1412,12 @@ sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxScriptSpaceItem::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:
@@ -1473,12 +1465,12 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxHangingPunctuationItem::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:
@@ -1526,12 +1518,12 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxForbiddenRuleItem::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:
@@ -1583,12 +1575,12 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
- String &rText, const IntlWrapper* ) const
+ OUString &rText, const IntlWrapper* ) const
{
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -1668,12 +1660,12 @@ sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxParaGridItem::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:
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index d5846a098afb..a993a15bc62c 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -203,10 +203,10 @@ SfxItemPresentation SvxFontListItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -448,13 +448,13 @@ SfxItemPresentation SvxFontItem::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:
@@ -517,13 +517,13 @@ SfxItemPresentation SvxPostureItem::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:
@@ -682,13 +682,13 @@ SfxItemPresentation SvxWeightItem::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:
@@ -1046,32 +1046,32 @@ SfxItemPresentation SvxFontHeightItem::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:
{
if( SFX_MAPUNIT_RELATIVE != ePropUnit )
{
- ( rText = String::CreateFromInt32( (short)nProp ) ) +=
+ rText = OUString::number( (short)nProp ) +
EE_RESSTR( GetMetricId( ePropUnit ) );
if( 0 <= (short)nProp )
- rText.Insert( sal_Unicode('+'), 0 );
+ rText = "+" + rText;
}
else if( 100 == nProp )
{
rText = GetMetricText( (long)nHeight,
- eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
- rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
+ EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
- ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
+ rText = OUString::number( nProp ) + "%";
return ePres;
}
default: ; //prevent warning
@@ -1247,13 +1247,13 @@ SfxItemPresentation SvxFontWidthItem::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:
@@ -1261,11 +1261,11 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
if ( 100 == nProp )
{
rText = GetMetricText( (long)nWidth,
- eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
- rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
+ EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
- ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
+ rText = OUString::number( nProp ) + "%";
return ePres;
}
default: ; //prevent warning
@@ -1341,19 +1341,19 @@ SfxItemPresentation SvxTextLineItem::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 = GetValueTextByPos( GetValue() );
if( !mColor.GetTransparency() )
- ( rText += cpDelim ) += ::GetColorString( mColor );
+ rText = rText + OUString(cpDelim) + ::GetColorString( mColor );
return ePres;
default: ; //prevent warning
}
@@ -1569,13 +1569,13 @@ SfxItemPresentation SvxCrossedOutItem::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:
@@ -1666,13 +1666,13 @@ SfxItemPresentation SvxShadowedItem::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:
@@ -1727,13 +1727,13 @@ SfxItemPresentation SvxAutoKernItem::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:
@@ -1789,13 +1789,13 @@ SfxItemPresentation SvxWordLineModeItem::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:
@@ -1850,13 +1850,13 @@ SfxItemPresentation SvxContourItem::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:
@@ -1911,10 +1911,10 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -2030,13 +2030,13 @@ SfxItemPresentation SvxColorItem::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:
@@ -2107,10 +2107,10 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -2167,17 +2167,17 @@ SfxItemPresentation SvxKerningItem::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:
- rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
- rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
+ EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
case SFX_ITEM_PRESENTATION_COMPLETE:
{
@@ -2191,8 +2191,9 @@ SfxItemPresentation SvxKerningItem::GetPresentation
if ( nId )
rText += EE_RESSTR(nId);
- rText += GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
- rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ rText = rText +
+ GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
+ EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
}
default: ; //prevent warning
@@ -2265,13 +2266,13 @@ SfxItemPresentation SvxCaseMapItem::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:
@@ -2413,13 +2414,13 @@ SfxItemPresentation SvxEscapementItem::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:
@@ -2429,9 +2430,9 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
if ( nEsc != 0 )
{
if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc )
- rText += String( EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO) );
+ rText += EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO);
else
- ( rText += String::CreateFromInt32( nEsc )) += sal_Unicode('%');
+ rText = rText + OUString::number( nEsc ) + "%";
}
return ePres;
}
@@ -2578,13 +2579,13 @@ SfxItemPresentation SvxLanguageItem::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:
@@ -2678,10 +2679,10 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -2723,10 +2724,10 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -2764,7 +2765,7 @@ SfxItemPresentation SvxLineColorItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
- XubString& rText,
+ OUString& rText,
const IntlWrapper * pIntlWrapper
) const
{
@@ -2811,13 +2812,13 @@ SfxItemPresentation SvxBlinkItem::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:
@@ -2874,14 +2875,14 @@ SfxItemPresentation SvxEmphasisMarkItem::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 ePres;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -3073,12 +3074,12 @@ bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
SfxItemPresentation SvxTwoLinesItem::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:
@@ -3089,9 +3090,9 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
{
rText = EE_RESSTR( RID_SVXITEMS_TWOLINES );
if( GetStartBracket() )
- rText.Insert( GetStartBracket(), 0 );
+ rText = OUString(GetStartBracket()) + rText;
if( GetEndBracket() )
- rText += GetEndBracket();
+ rText += OUString(GetEndBracket());
}
return ePres;
}
@@ -3165,12 +3166,12 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxCharRotateItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
- String &rText, const IntlWrapper* ) const
+ OUString &rText, const IntlWrapper* ) const
{
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -3180,8 +3181,8 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
else
{
rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE );
- rText.SearchAndReplaceAscii( "$(ARG1)",
- String::CreateFromInt32( GetValue() / 10 ));
+ rText = rText.replaceFirst( "$(ARG1)",
+ OUString::number( GetValue() / 10 ));
if( IsFitToLine() )
rText += EE_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE );
}
@@ -3308,12 +3309,12 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
- String &rText, const IntlWrapper* ) const
+ OUString &rText, const IntlWrapper* ) const
{
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -3323,8 +3324,8 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
else
{
rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE );
- rText.SearchAndReplaceAscii( "$(ARG1)",
- String::CreateFromInt32( GetValue() ));
+ rText = rText.replaceFirst( "$(ARG1)",
+ OUString::number( GetValue() ));
}
return ePres;
}
@@ -3407,14 +3408,14 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper * /*pIntl*/
+ OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
SfxItemPresentation eRet = ePres;
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index a1cc20295939..3cca42722668 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -68,14 +68,14 @@ sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresMetric*/,
- String &rText,
+ OUString &rText,
const IntlWrapper * ) const
{
SfxItemPresentation eRet = ePres;
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 99566fee6704..8f04dc78238e 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -67,7 +67,7 @@ SfxItemPresentation SvXMLAttrContainerItem::GetPresentation(
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString &/*rText*/,
+ OUString & /*rText*/,
const IntlWrapper * /*pIntlWrapper*/ ) const
{
return SFX_ITEM_PRESENTATION_NONE;
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 9b12f085955a..08979c25bd21 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -124,7 +124,7 @@ public:
SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String& rText,
+ OUString& rText,
const IntlWrapper* pIntl = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
@@ -178,7 +178,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper* pIntl = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -234,7 +234,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText,
+ OUString &rText,
const IntlWrapper* pIntl = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -308,7 +308,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String& rText,
+ OUString& rText,
const IntlWrapper* pIntl = 0 ) const;
};
@@ -375,7 +375,7 @@ public:
virtual SfxItemPresentation GetPresentation(
SfxItemPresentation ePresentation,
SfxMapUnit, SfxMapUnit,
- XubString& rText,
+ OUString& rText,
const IntlWrapper* = 0 ) const;
virtual bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const;
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index f187a483c38a..242bb89a2bb2 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -61,7 +61,7 @@ public:
const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
SfxMapUnit ePresentationMetric,
- String& rText,
+ OUString& rText,
const IntlWrapper* pIntl = 0 ) const;
static void InitVersionMaps();
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 8bb813a0a81c..0d855957a9ac 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -332,19 +332,19 @@ SfxItemPresentation ScProtectionAttr::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /* eCoreMetric */,
SfxMapUnit /* ePresMetric */,
- String& rText,
+ OUString& rText,
const IntlWrapper* /* pIntl */
) const
{
- String aStrYes ( ScGlobal::GetRscString(STR_YES) );
- String aStrNo ( ScGlobal::GetRscString(STR_NO) );
- rtl::OUString aStrSep(": ");
- rtl::OUString aStrDelim( ", ");
+ OUString aStrYes ( ScGlobal::GetRscString(STR_YES) );
+ OUString aStrNo ( ScGlobal::GetRscString(STR_NO) );
+ OUString aStrSep(": ");
+ OUString aStrDelim( ", ");
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -352,14 +352,14 @@ SfxItemPresentation ScProtectionAttr::GetPresentation
break;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_PROTECTION); rText += aStrSep;
- rText += (bProtection ? aStrYes : aStrNo); rText += aStrDelim;
- rText += ScGlobal::GetRscString(STR_FORMULAS); rText += aStrSep;
- rText += (!bHideFormula ? aStrYes : aStrNo); rText += aStrDelim;
- rText += ScGlobal::GetRscString(STR_HIDE); rText += aStrSep;
- rText += (bHideCell ? aStrYes : aStrNo); rText += aStrDelim;
- rText += ScGlobal::GetRscString(STR_PRINT); rText += aStrSep;
- rText += (!bHidePrint ? aStrYes : aStrNo);
+ rText = ScGlobal::GetRscString(STR_PROTECTION) + aStrSep +
+ (bProtection ? aStrYes : aStrNo) + aStrDelim +
+ ScGlobal::GetRscString(STR_FORMULAS) + aStrSep +
+ (!bHideFormula ? aStrYes : aStrNo) + aStrDelim +
+ ScGlobal::GetRscString(STR_HIDE) + aStrSep +
+ (bHideCell ? aStrYes : aStrNo) + aStrDelim +
+ ScGlobal::GetRscString(STR_PRINT) + aStrSep +
+ (!bHidePrint ? aStrYes : aStrNo);
break;
default:
@@ -462,17 +462,16 @@ SfxItemPresentation ScRangeItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /* eCoreUnit */,
SfxMapUnit /* ePresUnit */,
- String& rText,
- const IntlWrapper* /* pIntl */
+ OUString& rText,
+ const IntlWrapper* /* pIntl */
) const
{
- rText.Erase();
+ rText = OUString();
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_AREA);
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
+ rText = OUString(ScGlobal::GetRscString(STR_AREA)) + ": ";
/* !!! fall-through !!! */
case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -578,34 +577,32 @@ SfxItemPresentation ScTableListItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /* eCoreUnit */,
SfxMapUnit /* ePresUnit */,
- String& rText,
+ OUString& rText,
const IntlWrapper* /* pIntl */
) const
{
- const sal_Unicode cDelim = ',';
-
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
+ rText = OUString();
return ePres;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- rText = '(';
+ rText = "(";
if ( nCount>0 && pTabArr )
for ( sal_uInt16 i=0; i<nCount; i++ )
{
- rText += String::CreateFromInt32( pTabArr[i] );
+ rText += OUString::number( pTabArr[i] );
if ( i<(nCount-1) )
- rText += cDelim;
+ rText += ",";
}
- rText += ')';
+ rText += ")";
}
return ePres;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
default:
@@ -952,12 +949,12 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /* eCoreUnit */,
SfxMapUnit /* ePresUnit */,
- String& rText,
+ OUString& rText,
const IntlWrapper* /* pIntl */
) const
{
- rtl::OUString aDel(": ");
- rText.Erase();
+ OUString aDel(": ");
+ rText = OUString();
switch ( ePres )
{
@@ -965,18 +962,15 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
switch( Which() )
{
case SID_SCATTR_PAGE_CHARTS:
- rText = ScGlobal::GetRscString(STR_VOBJ_CHART);
- rText += aDel;
+ rText = ScGlobal::GetRscString(STR_VOBJ_CHART) + aDel;
break;
case SID_SCATTR_PAGE_OBJECTS:
- rText = ScGlobal::GetRscString(STR_VOBJ_OBJECT);
- rText += aDel;
+ rText = ScGlobal::GetRscString(STR_VOBJ_OBJECT) + aDel;
break;
case SID_SCATTR_PAGE_DRAWINGS:
- rText = ScGlobal::GetRscString(STR_VOBJ_DRAWINGS);
- rText += aDel;
+ rText = ScGlobal::GetRscString(STR_VOBJ_DRAWINGS) + aDel;
break;
default:
@@ -1144,31 +1138,30 @@ int ScPageScaleToItem::operator==( const SfxPoolItem& rCmp ) const
}
namespace {
-void lclAppendScalePageCount( String& rText, sal_uInt16 nPages )
+void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages )
{
- rText.AppendAscii( ": " );
+ rText += ": ";
if( nPages )
{
- String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
- aPages.SearchAndReplaceAscii( "%1", String::CreateFromInt32( nPages ) );
- rText.Append( aPages );
+ OUString aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
+ rText += aPages.replaceFirst( "%1", OUString::number( nPages ) );
}
else
- rText.Append( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_AUTO ) );
+ rText += ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_AUTO );
}
} // namespace
SfxItemPresentation ScPageScaleToItem::GetPresentation(
- SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, XubString& rText, const IntlWrapper* ) const
+ SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const
{
- rText.Erase();
+ rText = OUString();
if( !IsValid() || (ePres == SFX_ITEM_PRESENTATION_NONE) )
return SFX_ITEM_PRESENTATION_NONE;
- String aName( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETO ) );
- String aValue( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_WIDTH ) );
+ OUString aName( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETO ) );
+ OUString aValue( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_WIDTH ) );
lclAppendScalePageCount( aValue, mnWidth );
- aValue.AppendAscii( ", " ).Append( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_HEIGHT ) );
+ aValue = aValue + ", " + ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_HEIGHT );
lclAppendScalePageCount( aValue, mnHeight );
switch( ePres )
@@ -1185,7 +1178,7 @@ SfxItemPresentation ScPageScaleToItem::GetPresentation(
break;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText.Assign( aName ).AppendAscii( " (" ).Append( aValue ).Append( ')' );
+ rText = aName + " (" + aValue + ")";
break;
default:
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 7e422db10115..63ed640a78f3 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -696,7 +696,7 @@ static SfxItemPresentation lcl_HFPresentation
SfxItemPresentation ePresentation,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresentationMetric,
- String& rText,
+ OUString& rText,
const IntlWrapper* pIntl
)
{
@@ -711,14 +711,14 @@ static SfxItemPresentation lcl_HFPresentation
SfxItemIter aIter( rSet );
pItem = aIter.FirstItem();
- String aText;
- rtl::OUString aDel(" + ");
+ OUString aText;
+ OUString aDel(" + ");
while( pItem )
{
sal_uInt16 nWhich = pItem->Which();
- aText.Erase();
+ aText = "";
switch( nWhich )
{
@@ -742,8 +742,7 @@ static SfxItemPresentation lcl_HFPresentation
aText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
if ( 100 != nPropLeftMargin )
{
- aText += String::CreateFromInt32( nPropLeftMargin );
- aText += '%';
+ aText = aText + OUString::number( nPropLeftMargin ) + "%";
}
else
{
@@ -758,8 +757,7 @@ static SfxItemPresentation lcl_HFPresentation
aText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
{
- aText += String::CreateFromInt32( nPropRightMargin );
- aText += '%';
+ aText = aText + OUString::number( nPropLeftMargin ) + "%";
}
else
{
@@ -777,10 +775,9 @@ static SfxItemPresentation lcl_HFPresentation
}
- if ( aText.Len() )
+ if ( aText.getLength() )
{
- rText += aText;
- rText += aDel;
+ rText = rText + aText + aDel;
}
pItem = aIter.NextItem();
@@ -796,13 +793,13 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
SfxMapUnit ePresentationMetric,
- String& rText,
+ OUString& rText,
const IntlWrapper* pIntl ) const
{
sal_uInt16 nW = rItem.Which();
- String aStrYes ( ScGlobal::GetRscString(STR_YES) );
- String aStrNo ( ScGlobal::GetRscString(STR_NO) );
- rtl::OUString aStrSep(": ");
+ OUString aStrYes ( ScGlobal::GetRscString(STR_YES) );
+ OUString aStrNo ( ScGlobal::GetRscString(STR_NO) );
+ OUString aStrSep(": ");
switch( nW )
{
@@ -810,8 +807,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_PRINTDIR);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_PRINTDIR) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ?
@@ -829,8 +825,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_HEADERS);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_HEADERS) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ;
@@ -846,8 +841,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NULLVALS);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NULLVALS) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ;
@@ -863,8 +857,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FORMULAS);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FORMULAS) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ;
@@ -880,8 +873,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NOTES);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NOTES) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ;
@@ -897,8 +889,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_GRID);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_GRID) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ;
@@ -920,14 +911,14 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
{
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText.Assign( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETOPAGES ) ).Append( aStrSep );
+ rText = ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETOPAGES ) + aStrSep;
}
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
{
String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
aPages.SearchAndReplaceAscii( "%1", String::CreateFromInt32( nPagNo ) );
- rText.Append( aPages );
+ rText += aPages;
}
break;
default:
@@ -952,8 +943,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += String::CreateFromInt32( nPagNo );
@@ -980,12 +970,10 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
switch ( ePresentation )
{
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_SCALE);
- rText += aStrSep;
+ rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_SCALE) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += String::CreateFromInt32( nPercent );
- rText += '%';
+ rText = rText + OUString::number( nPercent ) + "%";
break;
default:
{
@@ -1002,28 +990,22 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
case ATTR_PAGE_HEADERSET:
{
- String aBuffer;
+ OUString aBuffer;
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
- rText = ScGlobal::GetRscString(STR_HEADER);
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " ));
- rText += aBuffer;
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ) " ));
+ rText = OUString(ScGlobal::GetRscString(STR_HEADER)) + " ( " + aBuffer + " ) ";
}
}
break;
case ATTR_PAGE_FOOTERSET:
{
- String aBuffer;
+ OUString aBuffer;
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
- rText = ScGlobal::GetRscString(STR_FOOTER);
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " ));
- rText += aBuffer;
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ) " ));
+ rText = OUString(ScGlobal::GetRscString(STR_FOOTER)) + " ( " + aBuffer + " ) ";
}
}
break;
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 06143e000c61..6e6331a86213 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -88,12 +88,12 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
const SfxEventNamesList& GetEvents() const { return aEventsList;}
void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; }
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index e9027d88f5b8..2c0c178a3795 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -244,7 +244,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- UniString &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 22ef4d0acf01..c2b09fa2470e 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -101,10 +101,10 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
SfxItemPresentation SfxEventNamesItem::GetPresentation( SfxItemPresentation,
SfxMapUnit,
SfxMapUnit,
- XubString &rText,
+ OUString &rText,
const IntlWrapper* ) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index ea19eeba9835..6fb6a10caef6 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -207,11 +207,11 @@ SfxItemPresentation SfxFrameDescriptorItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 47aa96800419..470c6d6f8cc4 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -42,7 +42,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
@@ -142,7 +142,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- UniString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index c57eefcbcdb7..6914dd5b327b 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -50,7 +50,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
@@ -112,7 +112,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
@@ -174,7 +174,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
@@ -236,7 +236,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index eef9c6c61c7b..1a783bca78d8 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -55,7 +55,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString & rText,
const IntlWrapper* pIntlWrapper = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
index 3c1fc0b3894d..bd2964cbc12f 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -56,7 +56,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 42f20b64611d..043502966ffc 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -55,7 +55,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * pIntlWrapper = 0 )
const;
diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index aa59e08cc01c..3a84fea32f67 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -54,7 +54,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString & rText,
const IntlWrapper * = 0 ) const;
sal_uInt16 GetValue() const { return nVal; }
void SetValue( sal_uInt16 nNewVal ) {
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index c9b9a7f79bc3..a9cb341aec10 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -67,7 +67,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index d29243291335..8636c2847c7f 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -154,7 +154,7 @@ public:
virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
SfxMapUnit ePresentationMetric,
- XubString& rText,
+ OUString& rText,
const IntlWrapper * pIntlWrapper
= 0 ) const;
virtual SfxItemPool* Clone() const;
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 712e072a0f15..8433ddb664a5 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -167,7 +167,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 4c899f64f91d..70d4eeacf0cc 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -157,7 +157,6 @@ class SvXMLUnitConverter;
class SfxItemPool;
class SfxItemSet;
-class String;
namespace rtl
{
class OUString;
@@ -209,7 +208,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresentationMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * pIntlWrapper = 0 ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
@@ -351,7 +350,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
// von sich selbst eine Kopie erzeugen
@@ -379,7 +378,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
// von sich selbst eine Kopie erzeugen
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 21827f9be954..6906e24baaf7 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -44,7 +44,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index ba72b98140fb..b9f0f950eb63 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -45,7 +45,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 1f9d23a3e452..698641d51fb1 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -53,7 +53,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
inline NUMTYPE& From() { return nFrom; }
@@ -82,7 +82,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
inline const NUMTYPE* GetRanges() const { return _pRanges; }
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 4369cb6809e5..a374377bfef0 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -57,7 +57,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7504e421a567..739b985278cb 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -89,7 +89,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
+ OUString &rText, const IntlWrapper * = 0 ) const;
// ConfigItem
virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index 6b24620052c5..1a576eced6fd 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -44,7 +44,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString &rText,
+ OUString &rText,
const IntlWrapper * = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index 942b43009f73..a5ad679f8665 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -57,7 +57,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * = 0)
const;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index b2308f455d54..200618e7d206 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -49,10 +49,10 @@ int SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const
// virtual
SfxItemPresentation
SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit,
- SfxMapUnit, XubString & rText,
+ SfxMapUnit, OUString & rText,
const IntlWrapper *) const
{
- rText = XubString::CreateFromInt32(GetEnumValue());
+ rText = OUString::number( GetEnumValue() );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -212,7 +212,7 @@ int CntBoolItem::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- UniString & rText,
+ OUString & rText,
const IntlWrapper *) const
{
rText = GetValueTextByVal(m_bValue);
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index e9d04f838fe0..430bdb3c148f 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -59,11 +59,11 @@ int CntByteItem::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *) const
{
DBG_CHKTHIS(CntByteItem, 0);
- rText = XubString::CreateFromInt32(m_nValue);
+ rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -193,12 +193,12 @@ int CntUInt16Item::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *)
const
{
DBG_CHKTHIS(CntUInt16Item, 0);
- rText = XubString::CreateFromInt32(m_nValue);
+ rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -325,11 +325,11 @@ int CntInt32Item::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *) const
{
DBG_CHKTHIS(CntInt32Item, 0);
- rText = XubString::CreateFromInt32(m_nValue);
+ rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -458,7 +458,7 @@ int CntUInt32Item::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *)
const
{
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 32944b50e0d4..7d3da748c61d 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -134,7 +134,7 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal )
//----------------------------------------------------------------------------
int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const
{
- String aOwnText, aWithText;
+ OUString aOwnText, aWithText;
GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT, aOwnText, &rIntlWrapper );
rWith.GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
@@ -147,7 +147,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- XubString & rText,
+ OUString & rText,
const IntlWrapper * pIntlWrapper) const
{
if (_aPresentation.isEmpty())
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index b179643774d2..2b492e9a8c89 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -86,7 +86,7 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith,
// virtual
SfxItemPresentation
CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
- SfxMapUnit, XubString & rText,
+ SfxMapUnit, OUString & rText,
const IntlWrapper *) const
{
DBG_CHKTHIS(CntUnencodedStringItem, 0);
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index dc7478d5e506..5dc90ada2fbd 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -122,7 +122,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper * pIntlWrapper
) const
{
@@ -130,21 +130,21 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
if (aDateTime.IsValidDate())
if (pIntlWrapper)
{
- rText = pIntlWrapper->getLocaleData()->getDate(aDateTime);
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += pIntlWrapper->getLocaleData()->getTime(aDateTime);
+ rText = pIntlWrapper->getLocaleData()->getDate(aDateTime) +
+ ", " +
+ pIntlWrapper->getLocaleData()->getTime(aDateTime);
}
else
{
DBG_WARNING("SfxDateTimeItem::GetPresentation():"
" Using default en_US IntlWrapper");
const IntlWrapper aIntlWrapper( LanguageTag( LANGUAGE_ENGLISH_US) );
- rText = aIntlWrapper.getLocaleData()->getDate(aDateTime);
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += aIntlWrapper.getLocaleData()->getTime(aDateTime);
+ rText = aIntlWrapper.getLocaleData()->getDate(aDateTime) +
+ ", " +
+ aIntlWrapper.getLocaleData()->getTime(aDateTime);
}
else
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index a1ce84013440..d2c5fbf169cb 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -73,14 +73,14 @@ SfxItemPresentation SfxFlagItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
DBG_CHKTHIS(SfxFlagItem, 0);
- rText.Erase();
+ rText = OUString();
for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
- rText += XubString::CreateFromInt32( (int)GetFlag(nFlag) );
+ rText += GetFlag(nFlag) ? OUString("true") : OUString("false");
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 0afc9e18f2d5..363afb9a9ec1 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -90,7 +90,7 @@ int SfxInt16Item::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *) const
{
DBG_CHKTHIS(SfxInt16Item, 0);
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index cc678ebd0163..13b3b2aaa4be 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -458,7 +458,7 @@ SfxItemPresentation SfxItemPool::GetPresentation
SfxItemPresentation ePresent, /* IN: gew"unschte Art der Darstellung;
siehe <SfxItemPresentation> */
SfxMapUnit eMetric, /* IN: gew"unschte Ma\seinheit der Darstellung */
- XubString& rText, /* OUT: textuelle Darstellung von 'rItem' */
+ OUString& rText, /* OUT: textuelle Darstellung von 'rItem' */
const IntlWrapper * pIntlWrapper
) const
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 5f7714fd3aad..3bed1d719c4a 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -236,7 +236,7 @@ SfxItemPresentation SvxMacroItem::GetPresentation
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
@@ -254,7 +254,7 @@ SfxItemPresentation SvxMacroItem::GetPresentation
rText += cpDelim;
}
*/
- rText.Erase();
+ rText = OUString();
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index ed1bc59d19d4..3ac1e7bebfc3 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -209,7 +209,7 @@ SfxItemPresentation SfxPoolItem::GetPresentation
SfxItemPresentation /*ePresentation*/, // IN: wie formatiert werden soll
SfxMapUnit /*eCoreMetric*/, // IN: Ma\seinheit des SfxPoolItems
SfxMapUnit /*ePresentationMetric*/, // IN: Wunsch-Ma\einheit der Darstellung
- XubString& /*rText*/, // OUT: textuelle Darstellung
+ OUString& /*rText*/, // OUT: textuelle Darstellung
const IntlWrapper *
) const
@@ -294,12 +294,12 @@ SfxItemPresentation SfxVoidItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
DBG_CHKTHIS(SfxVoidItem, 0);
- rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Void"));
+ rText = "Void";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index b70c84345cae..811a3d69e05b 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -70,15 +70,12 @@ SfxItemPresentation SfxPointItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
DBG_CHKTHIS(SfxPointItem, 0);
- rText = OUString::valueOf(aVal.X());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += OUString::valueOf(aVal.Y());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ rText = OUString::valueOf(aVal.X()) + ", " + OUString::valueOf(aVal.Y()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 5c096a1fe3ca..dcd5974056a0 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -67,18 +67,15 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
DBG_CHKTHIS(SfxRectangleItem, 0);
- rText = OUString::valueOf(aVal.Top());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += OUString::valueOf(aVal.Left());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += OUString::valueOf(aVal.Bottom());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += OUString::valueOf(aVal.Right());
+ rText = OUString::number(aVal.Top()) + ", " +
+ OUString::number(aVal.Left()) + ", " +
+ OUString::number(aVal.Bottom()) + ", " +
+ OUString::number(aVal.Right());
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index 5db363d97471..572c89ef5fff 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
@@ -67,7 +67,7 @@ SfxItemPresentation SfxXRangeItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
@@ -172,7 +172,7 @@ int SfxXRangesItem::operator==( const SfxPoolItem &rItem ) const
SfxItemPresentation SfxXRangesItem::GetPresentation( SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresMetric*/,
- XubString &/*rText*/,
+ OUString & /*rText*/,
const IntlWrapper * ) const
{
// not implemented
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index b3601e9920ed..9bc457fcd852 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -81,7 +81,7 @@ SfxItemPresentation SfxSetItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& /*rText*/,
+ OUString& /*rText*/,
const IntlWrapper *
) const
{
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index caa3651bf4e1..004f8a73f958 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -159,11 +159,11 @@ SfxItemPresentation SfxStringListItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
- rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("(List)"));
+ rText = "(List)";
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0f0b8d2b3b5b..ca00d5a4d641 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -261,7 +261,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation
SfxItemPresentation ,
SfxMapUnit ,
SfxMapUnit ,
- XubString& ,
+ OUString& ,
const IntlWrapper *
) const
{
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 9116640e5658..614bee831e68 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -343,16 +343,16 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() );
while ( pItem )
{
- XubString aItemPresentation;
+ OUString aItemPresentation;
if ( !IsInvalidItem( pItem ) &&
pPool->GetPool().GetPresentation(
*pItem, SFX_ITEM_PRESENTATION_COMPLETE,
eMetric, aItemPresentation, &aIntlWrapper ) )
{
- if ( aDesc.Len() && aItemPresentation.Len() )
+ if ( aDesc.Len() && !aItemPresentation.isEmpty() )
aDesc.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" + "));
- if ( aItemPresentation.Len() )
+ if ( !aItemPresentation.isEmpty() )
aDesc += aItemPresentation;
}
pItem = aIter.NextItem();
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 4e6d3d512a84..25060234a578 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -66,15 +66,12 @@ SfxItemPresentation SfxSizeItem::GetPresentation
SfxItemPresentation /*ePresentation*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/,
- XubString& rText,
+ OUString& rText,
const IntlWrapper *
) const
{
DBG_CHKTHIS(SfxSizeItem, 0);
- rText = OUString::valueOf(aVal.Width());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- rText += OUString::valueOf(aVal.Height());
- rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ rText = OUString::valueOf(aVal.Width()) + ", " + OUString::valueOf(aVal.Height()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index dfdda6eee77e..5926d298d5c2 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -65,7 +65,7 @@ int SfxVisibilityItem::Compare(const SfxPoolItem & rWith) const
// virtual
SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
- XubString & rText,
+ OUString & rText,
const IntlWrapper *) const
{
rText = GetValueTextByVal(m_nValue.bVisible);
@@ -126,9 +126,9 @@ sal_uInt16 SfxVisibilityItem::GetValueCount() const
//============================================================================
// virtual
-rtl::OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
+OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
{
- return bTheValue ? rtl::OUString("TRUE") : rtl::OUString("FALSE");
+ return bTheValue ? OUString("TRUE") : OUString("FALSE");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 823335865205..71da0c842659 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -152,9 +152,9 @@ class INetURLHistory_Impl
/** crc32.
*/
- sal_uInt32 crc32 (UniString const & rData) const
+ sal_uInt32 crc32 (OUString const & rData) const
{
- return rtl_crc32 (0, rData.GetBuffer(), rData.Len() * sizeof(sal_Unicode));
+ return rtl_crc32 (0, rData.getStr(), rData.getLength() * sizeof(sal_Unicode));
}
/** find.
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 )
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;
}
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 2aa1a7ee005c..423f32f448e1 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -51,7 +51,7 @@ inline Charset::Charset(rtl_TextEncoding eTheEncoding,
DBG_ASSERT(m_pRanges, "Charset::Charset(): Bad ranges");
}
-void appendISO88591(UniString & rText, sal_Char const * pBegin,
+void appendISO88591(OUString & rText, sal_Char const * pBegin,
sal_Char const * pEnd);
}
@@ -173,14 +173,14 @@ bool Charset::contains(sal_uInt32 nChar) const
namespace unnamed_tools_inetmime {
-void appendISO88591(UniString & rText, sal_Char const * pBegin,
+void appendISO88591(OUString & rText, sal_Char const * pBegin,
sal_Char const * pEnd)
{
xub_StrLen nLength = static_cast< xub_StrLen >(pEnd - pBegin);
sal_Unicode * pBuffer = new sal_Unicode[nLength];
for (sal_Unicode * p = pBuffer; pBegin != pEnd;)
*p++ = sal_uChar(*pBegin++);
- rText.Append(pBuffer, nLength);
+ rText += OUString(pBuffer, nLength);
delete[] pBuffer;
}
@@ -279,7 +279,7 @@ bool parseParameters(ParameterList const & rInput,
+ rInput.m_pList->
m_aCharset.
getLength());
- UniString aValue;
+ OUString aValue;
bool bBadEncoding = false;
Parameter * pNext = p;
do
@@ -311,21 +311,21 @@ bool parseParameters(ParameterList const & rInput,
while (pNext && pNext->m_nSection > 0);
if (bBadEncoding)
{
- aValue.Erase();
+ aValue = OUString();
for (pNext = p;;)
{
if (pNext->m_bExtended)
{
for (sal_Int32 i = 0; i < pNext->m_aValue.getLength(); ++i)
- aValue += sal_Unicode(
+ aValue += OUString(sal_Unicode(
sal_Unicode(
sal_uChar(pNext->m_aValue[i]))
- | 0xF800);
+ | 0xF800));
}
else
{
for (sal_Int32 i = 0; i < pNext->m_aValue.getLength(); ++i)
- aValue += sal_Unicode(sal_uChar(pNext->m_aValue[i]));
+ aValue += OUString( sal_Unicode(sal_uChar(pNext->m_aValue[i])) );
}
pNext = pNext->m_pNext;
if (!pNext || pNext->m_nSection == 0)
@@ -2413,7 +2413,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
const sal_Char * pBegin = rBody.getStr();
const sal_Char * pEnd = pBegin + rBody.getLength();
- UniString sDecoded;
+ OUString sDecoded;
const sal_Char * pCopyBegin = pBegin;
/* bool bStartEncodedWord = true; */
@@ -2666,7 +2666,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
{
appendISO88591(sDecoded, pCopyBegin, pWSPBegin);
if (eType == HEADER_FIELD_TEXT)
- sDecoded.Append(
+ sDecoded += OUString(
pUnicodeBuffer,
static_cast< xub_StrLen >(nUnicodeSize));
else if (nCommentLevel == 0)
@@ -2698,10 +2698,10 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
case '\\':
case '\x0D':
case '=':
- sDecoded += '\\';
+ sDecoded += "\\";
break;
}
- sDecoded += *pTextPtr;
+ sDecoded += OUString(*pTextPtr);
}
}
delete[] pUnicodeBuffer;
@@ -2720,7 +2720,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
{
if (bQuotedEncodedText)
{
- sDecoded += '"';
+ sDecoded += "\"";
const sal_Unicode * pTextPtr = sEncodedText.getStr();
const sal_Unicode * pTextEnd = pTextPtr + sEncodedText.getLength();
for (;pTextPtr != pTextEnd; ++pTextPtr)
@@ -2730,12 +2730,12 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
case '"':
case '\\':
case '\x0D':
- sDecoded += '\\';
+ sDecoded += "\\";
break;
}
- sDecoded += *pTextPtr;
+ sDecoded += OUString(*pTextPtr);
}
- sDecoded += '"';
+ sDecoded += "\"";
}
else
sDecoded += sEncodedText;
@@ -2781,7 +2781,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
sal_Unicode aUTF16Buf[2];
xub_StrLen nUTF16Len = static_cast< xub_StrLen >(
putUTF32Character(aUTF16Buf, nCharacter) - aUTF16Buf);
- sDecoded.Append(aUTF16Buf, nUTF16Len);
+ sDecoded += OUString(aUTF16Buf, nUTF16Len);
p = pUTF8End;
pCopyBegin = p;
}