[Libreoffice-commits] .: 2 commits - avmedia/inc avmedia/source editeng/inc editeng/source sc/inc sc/source sfx2/inc sfx2/source svl/inc svl/source svx/inc svx/source sw/inc sw/source tools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 28 08:38:54 PST 2013
avmedia/inc/avmedia/mediaitem.hxx | 2
avmedia/source/framework/mediaitem.cxx | 4
editeng/inc/editeng/adjitem.hxx | 2
editeng/inc/editeng/akrnitem.hxx | 2
editeng/inc/editeng/blnkitem.hxx | 2
editeng/inc/editeng/bolnitem.hxx | 2
editeng/inc/editeng/boxitem.hxx | 4
editeng/inc/editeng/brkitem.hxx | 2
editeng/inc/editeng/brshitem.hxx | 2
editeng/inc/editeng/bulitem.hxx | 2
editeng/inc/editeng/charhiddenitem.hxx | 2
editeng/inc/editeng/charreliefitem.hxx | 2
editeng/inc/editeng/charrotateitem.hxx | 2
editeng/inc/editeng/charscaleitem.hxx | 2
editeng/inc/editeng/cmapitem.hxx | 2
editeng/inc/editeng/cntritem.hxx | 2
editeng/inc/editeng/colritem.hxx | 2
editeng/inc/editeng/crsditem.hxx | 2
editeng/inc/editeng/cscoitem.hxx | 2
editeng/inc/editeng/emphitem.hxx | 2
editeng/inc/editeng/escpitem.hxx | 2
editeng/inc/editeng/fhgtitem.hxx | 2
editeng/inc/editeng/flstitem.hxx | 2
editeng/inc/editeng/fontitem.hxx | 2
editeng/inc/editeng/forbiddenruleitem.hxx | 2
editeng/inc/editeng/frmdiritem.hxx | 2
editeng/inc/editeng/fwdtitem.hxx | 2
editeng/inc/editeng/hngpnctitem.hxx | 2
editeng/inc/editeng/hyznitem.hxx | 2
editeng/inc/editeng/justifyitem.hxx | 6
editeng/inc/editeng/keepitem.hxx | 2
editeng/inc/editeng/kernitem.hxx | 2
editeng/inc/editeng/langitem.hxx | 2
editeng/inc/editeng/lcolitem.hxx | 2
editeng/inc/editeng/lrspitem.hxx | 2
editeng/inc/editeng/lspcitem.hxx | 2
editeng/inc/editeng/nhypitem.hxx | 2
editeng/inc/editeng/nlbkitem.hxx | 2
editeng/inc/editeng/opaqitem.hxx | 2
editeng/inc/editeng/optitems.hxx | 4
editeng/inc/editeng/orphitem.hxx | 2
editeng/inc/editeng/paravertalignitem.hxx | 2
editeng/inc/editeng/pbinitem.hxx | 2
editeng/inc/editeng/pgrditem.hxx | 2
editeng/inc/editeng/pmdlitem.hxx | 2
editeng/inc/editeng/postitem.hxx | 2
editeng/inc/editeng/prntitem.hxx | 2
editeng/inc/editeng/protitem.hxx | 2
editeng/inc/editeng/prszitem.hxx | 2
editeng/inc/editeng/scriptspaceitem.hxx | 2
editeng/inc/editeng/shaditem.hxx | 2
editeng/inc/editeng/shdditem.hxx | 2
editeng/inc/editeng/sizeitem.hxx | 2
editeng/inc/editeng/spltitem.hxx | 2
editeng/inc/editeng/tstpitem.hxx | 2
editeng/inc/editeng/twolinesitem.hxx | 2
editeng/inc/editeng/udlnitem.hxx | 2
editeng/inc/editeng/ulspitem.hxx | 2
editeng/inc/editeng/wghtitem.hxx | 2
editeng/inc/editeng/widwitem.hxx | 2
editeng/inc/editeng/writingmodeitem.hxx | 2
editeng/inc/editeng/wrlmitem.hxx | 2
editeng/inc/editeng/xmlcnitm.hxx | 2
editeng/source/items/bulitem.cxx | 4
editeng/source/items/charhiddenitem.cxx | 4
editeng/source/items/frmitems.cxx | 303 +++++++++++++++---------------
editeng/source/items/justifyitem.cxx | 12 -
editeng/source/items/optitems.cxx | 19 -
editeng/source/items/paraitem.cxx | 110 +++++-----
editeng/source/items/textitem.cxx | 153 +++++++--------
editeng/source/items/writingmodeitem.cxx | 4
editeng/source/items/xmlcnitm.cxx | 2
sc/inc/attrib.hxx | 10
sc/inc/docpool.hxx | 2
sc/source/core/data/attrib.cxx | 91 ++++-----
sc/source/core/data/docpool.cxx | 72 ++-----
sfx2/inc/sfx2/evntconf.hxx | 4
sfx2/inc/sfx2/frmdescr.hxx | 2
sfx2/source/config/evntconf.cxx | 4
sfx2/source/doc/frmdescr.cxx | 4
svl/inc/svl/cenumitm.hxx | 4
svl/inc/svl/cintitem.hxx | 8
svl/inc/svl/ctypeitm.hxx | 2
svl/inc/svl/custritm.hxx | 2
svl/inc/svl/dateitem.hxx | 2
svl/inc/svl/flagitem.hxx | 2
svl/inc/svl/intitem.hxx | 2
svl/inc/svl/itempool.hxx | 2
svl/inc/svl/macitem.hxx | 2
svl/inc/svl/poolitem.hxx | 7
svl/inc/svl/ptitem.hxx | 2
svl/inc/svl/rectitem.hxx | 2
svl/inc/svl/rngitem.hxx | 4
svl/inc/svl/slstitm.hxx | 2
svl/inc/svl/srchitem.hxx | 2
svl/inc/svl/szitem.hxx | 2
svl/inc/svl/visitem.hxx | 2
svl/source/items/cenumitm.cxx | 6
svl/source/items/cintitem.cxx | 14 -
svl/source/items/ctypeitm.cxx | 4
svl/source/items/custritm.cxx | 2
svl/source/items/dateitem.cxx | 16 -
svl/source/items/flagitem.cxx | 6
svl/source/items/intitem.cxx | 2
svl/source/items/itempool.cxx | 2
svl/source/items/macitem.cxx | 4
svl/source/items/poolitem.cxx | 6
svl/source/items/ptitem.cxx | 7
svl/source/items/rectitem.cxx | 13 -
svl/source/items/rngitem_inc.cxx | 4
svl/source/items/sitem.cxx | 2
svl/source/items/slstitm.cxx | 4
svl/source/items/srchitem.cxx | 2
svl/source/items/style.cxx | 6
svl/source/items/szitem.cxx | 7
svl/source/items/visitem.cxx | 6
svl/source/misc/inethist.cxx | 4
svx/inc/svx/algitem.hxx | 4
svx/inc/svx/chrtitem.hxx | 2
svx/inc/svx/drawitem.hxx | 12 -
svx/inc/svx/grfcrop.hxx | 2
svx/inc/svx/numinf.hxx | 2
svx/inc/svx/optgrid.hxx | 2
svx/inc/svx/pageitem.hxx | 4
svx/inc/svx/postattr.hxx | 9
svx/inc/svx/rotmodit.hxx | 2
svx/inc/svx/rulritem.hxx | 10
svx/inc/svx/sdangitm.hxx | 2
svx/inc/svx/sdasaitm.hxx | 2
svx/inc/svx/sdasitm.hxx | 2
svx/inc/svx/sdgmoitm.hxx | 2
svx/inc/svx/sdmetitm.hxx | 2
svx/inc/svx/sdooitm.hxx | 2
svx/inc/svx/sdprcitm.hxx | 4
svx/inc/svx/sdtaaitm.hxx | 2
svx/inc/svx/sdtaditm.hxx | 2
svx/inc/svx/sdtaitm.hxx | 6
svx/inc/svx/sdtakitm.hxx | 4
svx/inc/svx/sdtayitm.hxx | 2
svx/inc/svx/sdtfchim.hxx | 2
svx/inc/svx/sdtfsitm.hxx | 4
svx/inc/svx/sdynitm.hxx | 2
svx/inc/svx/svdpool.hxx | 4
svx/inc/svx/svdtrans.hxx | 10
svx/inc/svx/sxcecitm.hxx | 4
svx/inc/svx/sxcikitm.hxx | 2
svx/inc/svx/sxctitm.hxx | 4
svx/inc/svx/sxekitm.hxx | 2
svx/inc/svx/sxfiitm.hxx | 2
svx/inc/svx/sxmkitm.hxx | 2
svx/inc/svx/sxmtpitm.hxx | 4
svx/inc/svx/sxmuitm.hxx | 2
svx/inc/svx/sxsiitm.hxx | 2
svx/inc/svx/xbtmpit.hxx | 4
svx/inc/svx/xfillit0.hxx | 2
svx/inc/svx/xflbckit.hxx | 2
svx/inc/svx/xflbmpit.hxx | 2
svx/inc/svx/xflbmsli.hxx | 2
svx/inc/svx/xflbmsxy.hxx | 4
svx/inc/svx/xflbmtit.hxx | 2
svx/inc/svx/xflboxy.hxx | 4
svx/inc/svx/xflbstit.hxx | 2
svx/inc/svx/xflbtoxy.hxx | 4
svx/inc/svx/xflclit.hxx | 2
svx/inc/svx/xflftrit.hxx | 2
svx/inc/svx/xflgrit.hxx | 6
svx/inc/svx/xflhtit.hxx | 2
svx/inc/svx/xfltrit.hxx | 2
svx/inc/svx/xgrscit.hxx | 2
svx/inc/svx/xlineit0.hxx | 2
svx/inc/svx/xlinjoit.hxx | 2
svx/inc/svx/xlncapit.hxx | 2
svx/inc/svx/xlnclit.hxx | 2
svx/inc/svx/xlndsit.hxx | 2
svx/inc/svx/xlnedcit.hxx | 2
svx/inc/svx/xlnedit.hxx | 2
svx/inc/svx/xlnedwit.hxx | 2
svx/inc/svx/xlnstcit.hxx | 2
svx/inc/svx/xlnstit.hxx | 2
svx/inc/svx/xlnstwit.hxx | 2
svx/inc/svx/xlntrit.hxx | 2
svx/inc/svx/xlnwtit.hxx | 2
svx/inc/svx/xsflclit.hxx | 2
svx/source/dialog/optgrid.cxx | 6
svx/source/dialog/rulritem.cxx | 10
svx/source/dialog/srchdlg.cxx | 2
svx/source/items/algitem.cxx | 54 ++---
svx/source/items/chrtitem.cxx | 2
svx/source/items/customshapeitem.cxx | 8
svx/source/items/drawitem.cxx | 24 +-
svx/source/items/grfitem.cxx | 16 -
svx/source/items/numinf.cxx | 4
svx/source/items/pageitem.cxx | 27 +-
svx/source/items/postattr.cxx | 21 --
svx/source/items/rotmodit.cxx | 7
svx/source/svdraw/svdattr.cxx | 246 ++++++++++--------------
svx/source/svdraw/svdibrow.cxx | 21 --
svx/source/svdraw/svdtrans.cxx | 132 ++++++-------
svx/source/xoutdev/xattr.cxx | 86 ++++----
svx/source/xoutdev/xattr2.cxx | 79 +++----
svx/source/xoutdev/xattrbmp.cxx | 10
sw/inc/fchrfmt.hxx | 2
sw/inc/fmtanchr.hxx | 2
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtclds.hxx | 2
sw/inc/fmtcnct.hxx | 2
sw/inc/fmteiro.hxx | 2
sw/inc/fmtfollowtextflow.hxx | 2
sw/inc/fmtfsize.hxx | 2
sw/inc/fmtftntx.hxx | 2
sw/inc/fmthdft.hxx | 4
sw/inc/fmtinfmt.hxx | 2
sw/inc/fmtline.hxx | 2
sw/inc/fmtlsplt.hxx | 2
sw/inc/fmtornt.hxx | 4
sw/inc/fmtpdsc.hxx | 2
sw/inc/fmtrowsplt.hxx | 2
sw/inc/fmtruby.hxx | 2
sw/inc/fmtsrnd.hxx | 2
sw/inc/fmturl.hxx | 2
sw/inc/format.hxx | 2
sw/inc/grfatr.hxx | 18 -
sw/inc/hfspacingitem.hxx | 2
sw/inc/paratr.hxx | 8
sw/inc/swatrset.hxx | 2
sw/inc/swtypes.hxx | 2
sw/inc/tgrditem.hxx | 2
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/ui/app/docstyle.cxx | 12 -
sw/source/ui/inc/uiitems.hxx | 2
sw/source/ui/utlui/attrdesc.cxx | 285 +++++++++++++---------------
sw/source/ui/utlui/uiitems.cxx | 13 -
tools/source/inet/inetmime.cxx | 34 +--
233 files changed, 1187 insertions(+), 1295 deletions(-)
New commits:
commit 98bb5d242ad8360ec02fd0f4dbb4d19dec59dedd
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 28 17:30:38 2013 +0100
fix previous string conversion:
- SdrAngleItem::GetPresentation missing space
- SwFmtFrmSize::GetPresentation spurious s
- crstrvl.cxx build breaker
Change-Id: I4f1ce51943dff002ce250aff6f37f090c727bb00
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index e30f7f9..4ce0137 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -901,6 +901,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
OUString aStr;
SdrItemPool::TakeItemName(Which(), aStr);
+ aText.insert(0, ' ');
aText.insert(0, aStr);
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 040e998..7493815 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1467,7 +1467,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
{
if( !IsInvalidItem( pItem ))
{
- String aStr;
+ OUString aStr;
GetDoc()->GetAttrPool().GetPresentation( *pItem,
SFX_ITEM_PRESENTATION_COMPLETE,
SFX_MAPUNIT_CM, aStr );
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index ee858b4..11d7455 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -380,7 +380,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
{
const sal_uInt16 nId = ATT_FIX_SIZE == eFrmHeightType ?
STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT;
- rText = rText + ", " + SW_RESSTR( nId ) + " s";
+ rText = rText + ", " + SW_RESSTR( nId ) + " ";
if ( GetHeightPercent() )
{
rText = rText + OUString::valueOf(GetHeightPercent()) + "%";
commit 0dc532bffcda35d15a4719c05bb258e470355b98
Author: Jean-Noël Rouvignac <jn.rouvignac at gmail.com>
Date: Wed Jan 23 12:41:52 2013 +0100
fdo#38838 Some removal/replacement of the String/UniString with OUString
Changed SfxItemPool::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const; to use OUString.
Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index ce0a389a..f142819 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 05c29aa..244bb55 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 b4c8742..64eceaf 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 0447cf4..19e089e 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 8573ace..4ef638e 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 5582bec..07ad4da 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 76e511d..c1a6d13 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 42a423a..9aab77c 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 fca5653..c92f406 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 32f8be4..345cf3f 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 ee4c16e..651bdc2 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 a472688..445f7af 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 135d964..7845ab6 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 d8d364a..7d9b3876 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 fc911a6..8e2f0f0 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 98f05f6..079b1d4 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 efc8c34..46d4ea4 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 4aed470..6906d18 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 b36e982..6fc197fb 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 2cecc34..7e9695f 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 51b2a5f..d16adbc 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 5c5c2af..661d76c 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 053fdf9..69b64cb 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 e570bcc..e8a119c 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 2896db2..2d15a3d 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 4f62b7a..6ea04dc 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 981570c..73f897f 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 36ede95..4454faa 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 8d9a6b0..cacaf8c 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 5d03c09..cfbdcff 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 c950e5b..32a9abd 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 7305b46..cfdf916 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 d77dfba..ff78d9d 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 31fa25c..5b97c52 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 5b12bce..af4a207 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 6d30bb2..ebbd3cd 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 f26c1a0..51942c3 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 9a0fa32..209b053 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 930acb7..8174def 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 eb340e2..34970eb 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 686823a..90e4645 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 0480367..ab65b89 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 5fefd2f..38630c7 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 4f40b8b..9c4c47c 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 f1a2697..55fee95 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 be5cd9f..2d9428f 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 548db42..0501319 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 7899699..356ae1f 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 76a6ed5..d89669d 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 581d9e9..f58234b 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 7abe135..acf9f9c 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 c69d8ff..ea198dd 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 e99f6c0..df70d40 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 c203ad2..f4a10f6 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 d3f9d2c..f8eca76 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 0d5babf..b453b8e 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 985da19..4422647 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 dc965e1..c79efa6 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 4168d0d..db74f2b 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 3bf165a..580c652 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 9474a16..c1ad815 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 b2ddc8b..04d21c6 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 0ca6402..f824395 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 0a433ec..6b93d57 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 5fa79fa..4a2d257 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 6e202da..1d6798c 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 c922203..e938426 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 f5b5888..3c51334 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 f430dc9..f9e7c5e 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 d5846a0..a993a15 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:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list