mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#38838 Some removal/replacement of the String/UniString with OUString

Browse Source 
Changed SfxItemPool::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const; to use OUString.

Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66
This commit is contained in:
Jean-Noël Rouvignac 2013-01-23 12:41:52 +01:00 committed by Michael Stahl
parent 7e8e9031c6
commit 0dc532bffc
232 changed files with 1185 additions and 1294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/inc/avmedia/mediaitem.hxx
View File

@ -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 );

4
avmedia/source/framework/mediaitem.cxx
View File

@ -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;
}

2
editeng/inc/editeng/adjitem.hxx
View File

@ -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;

2
editeng/inc/editeng/akrnitem.hxx
View File

@ -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)
{

2
editeng/inc/editeng/blnkitem.hxx
View File

@ -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());

2
editeng/inc/editeng/bolnitem.hxx
View File

@ -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;

4
editeng/inc/editeng/boxitem.hxx
View File

@ -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 );

2
editeng/inc/editeng/brkitem.hxx
View File

@ -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;

2
editeng/inc/editeng/brshitem.hxx
View File

@ -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;

2
editeng/inc/editeng/bulitem.hxx
View File

@ -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 );

2
editeng/inc/editeng/charhiddenitem.hxx
View File

@ -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());

2
editeng/inc/editeng/charreliefitem.hxx
View File

@ -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;

2
editeng/inc/editeng/charrotateitem.hxx
View File

@ -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;

2
editeng/inc/editeng/charscaleitem.hxx
View File

@ -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;

2
editeng/inc/editeng/cmapitem.hxx
View File

@ -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;

2
editeng/inc/editeng/cntritem.hxx
View File

@ -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)
{

2
editeng/inc/editeng/colritem.hxx
View File

@ -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;

2
editeng/inc/editeng/crsditem.hxx
View File

@ -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;

2
editeng/inc/editeng/cscoitem.hxx
View File

@ -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;

2
editeng/inc/editeng/emphitem.hxx
View File

@ -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;

2
editeng/inc/editeng/escpitem.hxx
View File

@ -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 );

2
editeng/inc/editeng/fhgtitem.hxx
View File

@ -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;

2
editeng/inc/editeng/flstitem.hxx
View File

@ -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; }
};

2
editeng/inc/editeng/fontitem.hxx
View File

@ -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; }

2
editeng/inc/editeng/forbiddenruleitem.hxx
View File

@ -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=(

2
editeng/inc/editeng/frmdiritem.hxx
View File

@ -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;

2
editeng/inc/editeng/fwdtitem.hxx
View File

@ -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;

2
editeng/inc/editeng/hngpnctitem.hxx
View File

@ -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=(

2
editeng/inc/editeng/hyznitem.hxx
View File

@ -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;

6
editeng/inc/editeng/justifyitem.hxx
View File

@ -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 );

2
editeng/inc/editeng/keepitem.hxx
View File

@ -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 ) :

2
editeng/inc/editeng/kernitem.hxx
View File

@ -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() );

2
editeng/inc/editeng/langitem.hxx
View File

@ -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;

2
editeng/inc/editeng/lcolitem.hxx
View File

@ -39,7 +39,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
OUString &rText,
const IntlWrapper * pIntlWrapper = 0 )
const;

2
editeng/inc/editeng/lrspitem.hxx
View File

@ -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;

2
editeng/inc/editeng/lspcitem.hxx
View File

@ -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;

2
editeng/inc/editeng/nhypitem.hxx
View File

@ -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)
{

2
editeng/inc/editeng/nlbkitem.hxx
View File

@ -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)
{

2
editeng/inc/editeng/opaqitem.hxx
View File

@ -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 )

4
editeng/inc/editeng/optitems.hxx
View File

@ -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;

2
editeng/inc/editeng/orphitem.hxx
View File

@ -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 )
{

2
editeng/inc/editeng/paravertalignitem.hxx
View File

@ -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;

2
editeng/inc/editeng/pbinitem.hxx
View File

@ -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 )

2
editeng/inc/editeng/pgrditem.hxx
View File

@ -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

2
editeng/inc/editeng/pmdlitem.hxx
View File

@ -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 );

2
editeng/inc/editeng/postitem.hxx
View File

@ -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;

2
editeng/inc/editeng/prntitem.hxx
View File

@ -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 )

2
editeng/inc/editeng/protitem.hxx
View File

@ -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;

2
editeng/inc/editeng/prszitem.hxx
View File

@ -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)
{

2
editeng/inc/editeng/scriptspaceitem.hxx
View File

@ -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 )

2
editeng/inc/editeng/shaditem.hxx
View File

@ -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;

2
editeng/inc/editeng/shdditem.hxx
View File

@ -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());

2
editeng/inc/editeng/sizeitem.hxx
View File

@ -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;

2
editeng/inc/editeng/spltitem.hxx
View File

@ -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 ) :

2
editeng/inc/editeng/tstpitem.hxx
View File

@ -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;

2
editeng/inc/editeng/twolinesitem.hxx
View File

@ -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;

2
editeng/inc/editeng/udlnitem.hxx
View File

@ -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;

2
editeng/inc/editeng/ulspitem.hxx
View File

@ -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;

2
editeng/inc/editeng/wghtitem.hxx
View File

@ -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;

2
editeng/inc/editeng/widwitem.hxx
View File

@ -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 )
{

2
editeng/inc/editeng/writingmodeitem.hxx
View File

@ -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;

2
editeng/inc/editeng/wrlmitem.hxx
View File

@ -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 )
{

2
editeng/inc/editeng/xmlcnitm.hxx
View File

@ -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;

4
editeng/source/items/bulitem.cxx
View File

@ -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;

4
editeng/source/items/charhiddenitem.cxx
View File

@ -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:

303
editeng/source/items/frmitems.cxx
View File

@ -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:

12
editeng/source/items/justifyitem.cxx
View File

@ -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:

19
editeng/source/items/optitems.cxx
View File

@ -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:

110
editeng/source/items/paraitem.cxx
View File

@ -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:

153
editeng/source/items/textitem.cxx
View File

@ -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:

4
editeng/source/items/writingmodeitem.cxx
View File

@ -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:

2
editeng/source/items/xmlcnitm.cxx
View File

@ -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;

10
sc/inc/attrib.hxx
View File

@ -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;

2
sc/inc/docpool.hxx
View File

@ -61,7 +61,7 @@ public:
const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
SfxMapUnit ePresentationMetric,
String& rText,
OUString& rText,
const IntlWrapper* pIntl = 0 ) const;
static void InitVersionMaps();

91
sc/source/core/data/attrib.cxx
View File

@ -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:

72
sc/source/core/data/docpool.cxx
View File

@ -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;

4
sfx2/inc/sfx2/evntconf.hxx
View File

@ -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; }

2
sfx2/inc/sfx2/frmdescr.hxx
View File

@ -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;

4
sfx2/source/config/evntconf.cxx
View File

@ -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;
}

4
sfx2/source/doc/frmdescr.cxx
View File

@ -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;
}

4
svl/inc/svl/cenumitm.hxx
View File

@ -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;

8
svl/inc/svl/cintitem.hxx
View File

@ -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;

2
svl/inc/svl/ctypeitm.hxx
View File

@ -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,

2
svl/inc/svl/custritm.hxx
View File

@ -56,7 +56,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
XubString & rText,
OUString & rText,
const IntlWrapper * = 0)
const;

2
svl/inc/svl/dateitem.hxx
View File

@ -55,7 +55,7 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
XubString &rText,
OUString &rText,
const IntlWrapper * pIntlWrapper = 0 )
const;

2
svl/inc/svl/flagitem.hxx
View File

@ -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 ) {

2
svl/inc/svl/intitem.hxx
View File

@ -67,7 +67,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
XubString & rText,
OUString & rText,
const IntlWrapper * = 0)
const;

2
svl/inc/svl/itempool.hxx
View File

@ -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;

2
svl/inc/svl/macitem.hxx
View File

@ -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;

7
svl/inc/svl/poolitem.hxx
View File

@ -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

2
svl/inc/svl/ptitem.hxx
View File

@ -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;

2
svl/inc/svl/rectitem.hxx
View File

@ -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;

4
svl/inc/svl/rngitem.hxx
View File

@ -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; }

2
svl/inc/svl/slstitm.hxx
View File

@ -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;

2
svl/inc/svl/srchitem.hxx
View File

@ -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 );

2
svl/inc/svl/szitem.hxx
View File

@ -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;

2
svl/inc/svl/visitem.hxx
View File

@ -57,7 +57,7 @@ public:
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
XubString & rText,
OUString & rText,
const IntlWrapper * = 0)
const;

6
svl/source/items/cenumitm.cxx
View File

@ -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);

14
svl/source/items/cintitem.cxx
View File

@ -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
{

4
svl/source/items/ctypeitm.cxx
View File

@ -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())

Some files were not shown because too many files have changed in this diff Show More