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

upgrade GetValueTextByPos family to rtl::OUString

Browse Source
This commit is contained in:
Caolán McNamara
2012-04-16 07:50:35 +01:00
parent 2c676c03f3
commit 437c4984db
34 changed files with 135 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,14 +78,14 @@ public:
SfxMapUnit eCoreMetric, SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric, SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const; String &rText, const IntlWrapper * = 0 ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const; virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal ); virtual void SetEnumValue( sal_uInt16 nNewVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
inline void SetOneWord( const SvxAdjust eType ) inline void SetOneWord( const SvxAdjust eType )
{ {

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

@@ -67,13 +67,13 @@ public:
SfxMapUnit eCoreMetric, SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric, SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const; String &rText, const IntlWrapper * = 0 ) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
// MS VC4.0 messes things up // MS VC4.0 messes things up
void SetValue( sal_uInt16 nNewVal ) void SetValue( sal_uInt16 nNewVal )

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

@@ -53,10 +53,10 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit eCoreMetric,

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

@@ -64,8 +64,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
// MS VC4.0 kommt durcheinander // MS VC4.0 kommt durcheinander
void SetValue( sal_uInt16 nNewVal ) void SetValue( sal_uInt16 nNewVal )

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

@@ -63,7 +63,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );

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

@@ -57,7 +57,7 @@ public:
#define EE_DLL() EditDLL::Get() #define EE_DLL() EditDLL::Get()
#define EE_RESSTR(x) String( EditResId(x) ) #define EE_RESSTR(x) ResId::toString(EditResId(x))
#endif //_EERDLL_HXX #endif //_EERDLL_HXX

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

@@ -105,9 +105,9 @@ public:
return *this; return *this;
} }
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const; virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal ); virtual void SetEnumValue( sal_uInt16 nNewVal );
}; };

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

@@ -111,9 +111,9 @@ public:
inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; } inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const; virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal ); virtual void SetEnumValue( sal_uInt16 nNewVal );
}; };

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

@@ -64,14 +64,14 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual int HasBoolValue() const; virtual int HasBoolValue() const;
virtual sal_Bool GetBoolValue() const; virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal ); virtual void SetBoolValue( sal_Bool bVal );
inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {

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

@@ -94,9 +94,9 @@ public:
// Calculate width of the shadow on the page. // Calculate width of the shadow on the page.
sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const; sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const; virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal ); virtual void SetEnumValue( sal_uInt16 nNewVal );
}; };

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

@@ -63,8 +63,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
@@ -73,7 +73,7 @@ public:
void SetValue( sal_uInt16 nNewVal ) void SetValue( sal_uInt16 nNewVal )
{SfxEnumItem::SetValue(nNewVal); } {SfxEnumItem::SetValue(nNewVal); }
virtual int HasBoolValue() const; virtual int HasBoolValue() const;
virtual sal_Bool GetBoolValue() const; virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal ); virtual void SetBoolValue( sal_Bool bVal );
virtual int operator==( const SfxPoolItem& ) const; virtual int operator==( const SfxPoolItem& ) const;
@@ -109,7 +109,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
}; };
// class SvxOverlineItem ------------------------------------------------ // class SvxOverlineItem ------------------------------------------------
@@ -126,7 +126,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
}; };
#endif // #ifndef _SVX_UDLNITEM_HXX #endif // #ifndef _SVX_UDLNITEM_HXX

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

@@ -64,14 +64,14 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual int HasBoolValue() const; virtual int HasBoolValue() const;
virtual sal_Bool GetBoolValue() const; virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal ); virtual void SetBoolValue( sal_Bool bVal );
inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {

20
editeng/source/editeng/editeng.cxx
View File

@@ -2472,7 +2472,7 @@ void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
{ {
DBG_CHKTHIS( EditEngine, 0 ); DBG_CHKTHIS( EditEngine, 0 );
XubString aComment; rtl::OUString aComment;
switch ( nId ) switch ( nId )
{ {
case EDITUNDO_REMOVECHARS: case EDITUNDO_REMOVECHARS:
@@ -2481,12 +2481,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_DELCONTENT: case EDITUNDO_DELCONTENT:
case EDITUNDO_DELETE: case EDITUNDO_DELETE:
case EDITUNDO_CUT: case EDITUNDO_CUT:
aComment = XubString( EditResId( RID_EDITUNDO_DEL ) ); aComment = EE_RESSTR(RID_EDITUNDO_DEL);
break; break;
case EDITUNDO_MOVEPARAGRAPHS: case EDITUNDO_MOVEPARAGRAPHS:
case EDITUNDO_MOVEPARAS: case EDITUNDO_MOVEPARAS:
case EDITUNDO_DRAGANDDROP: case EDITUNDO_DRAGANDDROP:
aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) ); aComment = EE_RESSTR(RID_EDITUNDO_MOVE);
break; break;
case EDITUNDO_INSERTFEATURE: case EDITUNDO_INSERTFEATURE:
case EDITUNDO_SPLITPARA: case EDITUNDO_SPLITPARA:
@@ -2494,29 +2494,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_PASTE: case EDITUNDO_PASTE:
case EDITUNDO_INSERT: case EDITUNDO_INSERT:
case EDITUNDO_READ: case EDITUNDO_READ:
aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) ); aComment = EE_RESSTR(RID_EDITUNDO_INSERT);
break; break;
case EDITUNDO_SRCHANDREPL: case EDITUNDO_SRCHANDREPL:
case EDITUNDO_REPLACEALL: case EDITUNDO_REPLACEALL:
aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) ); aComment = EE_RESSTR(RID_EDITUNDO_REPLACE);
break; break;
case EDITUNDO_ATTRIBS: case EDITUNDO_ATTRIBS:
case EDITUNDO_PARAATTRIBS: case EDITUNDO_PARAATTRIBS:
case EDITUNDO_STRETCH: case EDITUNDO_STRETCH:
aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) ); aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS);
break; break;
case EDITUNDO_RESETATTRIBS: case EDITUNDO_RESETATTRIBS:
aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) ); aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS);
break; break;
case EDITUNDO_STYLESHEET: case EDITUNDO_STYLESHEET:
aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) ); aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE);
break; break;
case EDITUNDO_TRANSLITERATE: case EDITUNDO_TRANSLITERATE:
aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) ); aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE);
break; break;
case EDITUNDO_INDENTBLOCK: case EDITUNDO_INDENTBLOCK:
case EDITUNDO_UNINDENTBLOCK: case EDITUNDO_UNINDENTBLOCK:
aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) ); aComment = EE_RESSTR(RID_EDITUNDO_INDENT);
break; break;
} }
return aComment; return aComment;

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

@@ -1527,10 +1527,10 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
return XubString( EditResId( RID_SVXITEMS_SHADOW_BEGIN + nPos ) ); return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -2926,11 +2926,10 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) ); return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
return aStr;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

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

@@ -316,16 +316,24 @@ sal_uInt16 SvxLineSpacingItem::GetValueCount() const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
//! load strings from resource //! load strings from resource
XubString aText; rtl::OUString aText;
switch ( nPos ) switch ( nPos )
{ {
case SVX_LINESPACE_USER : aText.AppendAscii( "User" ); break; case SVX_LINESPACE_USER:
case SVX_LINESPACE_ONE_LINE : aText.AppendAscii( "One line" ); break; aText = "User";
case SVX_LINESPACE_ONE_POINT_FIVE_LINES : aText.AppendAscii( "1.5 line" ); break; break;
case SVX_LINESPACE_TWO_LINES : aText.AppendAscii( "Two lines" ); break; case SVX_LINESPACE_ONE_LINE:
aText = "One line";
break;
case SVX_LINESPACE_ONE_POINT_FIVE_LINES:
aText = "1.5 line";
break;
case SVX_LINESPACE_TWO_LINES:
aText = "Two lines";
break;
} }
return aText; return aText;
} }
@@ -472,7 +480,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos); return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
@@ -889,17 +897,17 @@ XubString SvxTabStop::GetValueString() const
aStr += sal_Unicode( '(' ); aStr += sal_Unicode( '(' );
aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos)); aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos));
aStr += cpDelim; aStr += cpDelim;
aStr += XubString( EditResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment ) ); aStr += EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment);
aStr += cpDelim; aStr += cpDelim;
aStr += sal_Unicode('['); aStr += sal_Unicode('[');
aStr += XubString( EditResId( RID_SVXITEMS_TAB_DECIMAL_CHAR ) ); aStr += EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR);
aStr += GetDecimal(); aStr += GetDecimal();
aStr += sal_Unicode(']'); aStr += sal_Unicode(']');
aStr += cpDelim; aStr += cpDelim;
aStr += cpDelim; aStr += cpDelim;
aStr += sal_Unicode('['); aStr += sal_Unicode('[');
aStr += XubString( EditResId( RID_SVXITEMS_TAB_FILL_CHAR ) ); aStr += EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR);
aStr += cFill; aStr += cFill;
aStr += sal_Unicode(']'); aStr += sal_Unicode(']');
aStr += sal_Unicode(')'); aStr += sal_Unicode(')');

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

@@ -547,11 +547,10 @@ SfxItemPresentation SvxPostureItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
XubString sTxt;
FontItalic eItalic = (FontItalic)nPos; FontItalic eItalic = (FontItalic)nPos;
sal_uInt16 nId = 0; sal_uInt16 nId = 0;
@@ -563,9 +562,7 @@ XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
default: ;//prevent warning default: ;//prevent warning
} }
if ( nId ) return nId ? EE_RESSTR(nId) : rtl::OUString();
sTxt = EditResId( nId );
return sTxt;
} }
bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -715,10 +712,10 @@ SfxItemPresentation SvxWeightItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos ); return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos);
} }
bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1376,10 +1373,10 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const rtl::OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
{ {
OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method"); OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
return XubString(); return rtl::OUString();
} }
bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1478,10 +1475,10 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos ); return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
} }
// class SvxOverlineItem ------------------------------------------------ // class SvxOverlineItem ------------------------------------------------
@@ -1511,10 +1508,10 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos ); return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
} }
// class SvxCrossedOutItem ----------------------------------------------- // class SvxCrossedOutItem -----------------------------------------------
@@ -1602,10 +1599,10 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos ); return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos);
} }
bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -2298,10 +2295,10 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" ); DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos ); return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos);
} }
bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
@@ -2456,7 +2453,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
@@ -3407,11 +3404,11 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
} }
String SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE, DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
"enum overflow" ); "enum overflow" );
return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos )); return EE_RESSTR(RID_SVXITEMS_RELIEF_BEGIN + nPos);
} }
sal_uInt16 SvxCharReliefItem::GetValueCount() const sal_uInt16 SvxCharReliefItem::GetValueCount() const

10
editeng/source/outliner/outleeng.cxx
View File

@@ -137,19 +137,19 @@ XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
switch( nUndoId ) switch( nUndoId )
{ {
case OLUNDO_DEPTH: case OLUNDO_DEPTH:
return XubString( EditResId( RID_OUTLUNDO_DEPTH )); return EE_RESSTR(RID_OUTLUNDO_DEPTH);
case OLUNDO_EXPAND: case OLUNDO_EXPAND:
return XubString( EditResId( RID_OUTLUNDO_EXPAND )); return EE_RESSTR(RID_OUTLUNDO_EXPAND);
case OLUNDO_COLLAPSE: case OLUNDO_COLLAPSE:
return XubString( EditResId( RID_OUTLUNDO_COLLAPSE )); return EE_RESSTR(RID_OUTLUNDO_COLLAPSE);
case OLUNDO_ATTR: case OLUNDO_ATTR:
return XubString( EditResId( RID_OUTLUNDO_ATTR )); return EE_RESSTR(RID_OUTLUNDO_ATTR);
case OLUNDO_INSERT: case OLUNDO_INSERT:
return XubString( EditResId( RID_OUTLUNDO_INSERT )); return EE_RESSTR(RID_OUTLUNDO_INSERT);
default: default:
return EditEngine::GetUndoComment( nUndoId ); return EditEngine::GetUndoComment( nUndoId );

12
svl/inc/svl/aeitem.hxx
View File

@@ -53,17 +53,17 @@ public:
~SfxAllEnumItem(); ~SfxAllEnumItem();
void InsertValue( sal_uInt16 nValue ); void InsertValue( sal_uInt16 nValue );
void InsertValue( sal_uInt16 nValue, const XubString &rText ); void InsertValue( sal_uInt16 nValue, const rtl::OUString &rText );
void RemoveValue( sal_uInt16 nValue ); void RemoveValue( sal_uInt16 nValue );
sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const;
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const;
virtual XubString GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
virtual sal_Bool IsEnabled( sal_uInt16 ) const; virtual sal_Bool IsEnabled( sal_uInt16 ) const;
void DisableValue( sal_uInt16 ); void DisableValue( sal_uInt16 );
}; };

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

@@ -61,7 +61,7 @@ public:
virtual sal_uInt16 GetValueCount() const = 0; virtual sal_uInt16 GetValueCount() const = 0;
virtual XubString GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const; virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const;

8
svl/source/items/aeitem.cxx
View File

@@ -43,7 +43,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
struct SfxAllEnumValue_Impl struct SfxAllEnumValue_Impl
{ {
sal_uInt16 nValue; sal_uInt16 nValue;
XubString aText; rtl::OUString aText;
}; };
SV_DECL_PTRARR_DEL(SfxAllEnumValueArr, SfxAllEnumValue_Impl*, 0) SV_DECL_PTRARR_DEL(SfxAllEnumValueArr, SfxAllEnumValue_Impl*, 0)
@@ -139,7 +139,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const rtl::OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
{ {
DBG_CHKTHIS(SfxAllEnumItem, 0); DBG_CHKTHIS(SfxAllEnumItem, 0);
DBG_ASSERT( pValues && nPos < pValues->Count(), "enum overflow" ); DBG_ASSERT( pValues && nPos < pValues->Count(), "enum overflow" );
@@ -219,7 +219,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const XubString &rValue ) void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const rtl::OUString &rValue )
{ {
DBG_CHKTHIS(SfxAllEnumItem, 0); DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl; SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
@@ -242,7 +242,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
DBG_CHKTHIS(SfxAllEnumItem, 0); DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl; SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
pVal->nValue = nValue; pVal->nValue = nValue;
pVal->aText = XubString::CreateFromInt32( nValue ); pVal->aText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue));
const SfxAllEnumValue_Impl *pTemp = pVal; const SfxAllEnumValue_Impl *pTemp = pVal;
if ( !pValues ) if ( !pValues )
pValues = new SfxAllEnumValueArr; pValues = new SfxAllEnumValueArr;

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

@@ -91,10 +91,10 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
} }
//============================================================================ //============================================================================
XubString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const rtl::OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
{ {
DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual");
return XubString(); return rtl::OUString();
} }
//============================================================================ //============================================================================

2
svx/inc/svx/sdgmoitm.hxx
View File

@@ -52,7 +52,7 @@ public:
virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueCount() const;
GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric, SfxMapUnit ePresMetric,

2
svx/inc/svx/sdtaditm.hxx
View File

@@ -54,7 +54,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

4
svx/inc/svx/sdtaitm.hxx
View File

@@ -55,7 +55,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };
@@ -82,7 +82,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sdtakitm.hxx
View File

@@ -97,7 +97,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sdtfsitm.hxx
View File

@@ -64,7 +64,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
virtual int HasBoolValue() const; virtual int HasBoolValue() const;
virtual sal_Bool GetBoolValue() const; virtual sal_Bool GetBoolValue() const;

2
svx/inc/svx/sxcecitm.hxx
View File

@@ -49,7 +49,7 @@ public:
virtual sal_uInt16 GetValueCount() const; // { return 3; } virtual sal_uInt16 GetValueCount() const; // { return 3; }
SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sxcikitm.hxx
View File

@@ -49,7 +49,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sxctitm.hxx
View File

@@ -46,7 +46,7 @@ public:
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual sal_uInt16 GetValueCount() const; // { return 4; } virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); }
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sxekitm.hxx
View File

@@ -52,7 +52,7 @@ public:
SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sxmkitm.hxx
View File

@@ -49,7 +49,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

4
svx/inc/svx/sxmtpitm.hxx
View File

@@ -51,7 +51,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };
@@ -71,7 +71,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

2
svx/inc/svx/sxmuitm.hxx
View File

@@ -48,7 +48,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 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 ); virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
}; };

40
svx/source/svdraw/svdattr.cxx
View File

@@ -995,7 +995,7 @@ SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; }
XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
} }
@@ -1022,7 +1022,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; }
XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
} }
@@ -1054,7 +1054,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/
sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
} }
@@ -1112,7 +1112,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; }
XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
} }
@@ -1162,7 +1162,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
} }
@@ -1212,7 +1212,7 @@ SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; }
XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
} }
@@ -1261,7 +1261,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; }
XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
} }
@@ -1617,7 +1617,7 @@ SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; }
XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
} }
@@ -1807,7 +1807,7 @@ SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; }
XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
} }
@@ -1856,7 +1856,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
} }
@@ -1905,7 +1905,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
} }
@@ -1954,12 +1954,12 @@ SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
XubString aRetval; XubString aRetval;
if((FieldUnit)nPos == FUNIT_NONE) if((FieldUnit)nPos == FUNIT_NONE)
aRetval += UniString(RTL_CONSTASCII_USTRINGPARAM("default")); aRetval = rtl::OUString("default");
else else
SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval); SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval);
@@ -2008,7 +2008,7 @@ SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const {
sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; }
XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
} }
@@ -2250,30 +2250,30 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const
return 4; return 4;
} }
XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
{ {
XubString aStr; rtl::OUString aStr;
switch(nPos) switch(nPos)
{ {
case 1: case 1:
{ {
aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Greys")); aStr = "Greys";
break; break;
} }
case 2: case 2:
{ {
aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Black/White")); aStr = "Black/White";
break; break;
} }
case 3: case 3:
{ {
aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Watermark")); aStr = "Watermark";
break; break;
} }
default: default:
{ {
aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Standard")); aStr = "Standard";
break; break;
} }
} }