upgrade GetValueTextByPos family to rtl::OUString

34 files changed, 135 insertions, 131 deletions

diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index b643387aaf48..b4a73ecfaf84 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -78,14 +78,14 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual sal_uInt16           GetValueCount() const;
-    virtual String           GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16           GetEnumValue() const;
+    virtual sal_uInt16       GetValueCount() const;
+    virtual rtl::OUString    GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16       GetEnumValue() const;
     virtual void             SetEnumValue( sal_uInt16 nNewVal );
     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 nFileVersion ) const;
+    virtual sal_uInt16       GetVersion( sal_uInt16 nFileVersion ) const;
 
     inline void SetOneWord( const SvxAdjust eType )
     {
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 0111185ad671..4e8f6efb5a28 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -67,13 +67,13 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     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 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 sal_uInt16           GetValueCount() const;
+    virtual sal_uInt16       GetValueCount() const;
 
     // MS VC4.0 messes things up
     void             SetValue( sal_uInt16 nNewVal )
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 93813e89f3cc..4a276b26f9c1 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -53,10 +53,10 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) 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 sal_uInt16         GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index da4803e4433a..51d52e9ac2c6 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -64,8 +64,8 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() const;
 
     // MS VC4.0 kommt durcheinander
     void                    SetValue( sal_uInt16 nNewVal )
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index af13f41711d0..ca8bf58dfd9b 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -63,7 +63,7 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) 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 bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 00094cfbc436..de50d7b923f9 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -57,7 +57,7 @@ public:
 
 #define EE_DLL() EditDLL::Get()
 
-#define EE_RESSTR(x) String( EditResId(x) )
+#define EE_RESSTR(x) ResId::toString(EditResId(x))
 
 #endif //_EERDLL_HXX
 
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 070eb8342452..f14f15ce0409 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -105,9 +105,9 @@ public:
             return *this;
         }
 
-    virtual sal_uInt16          GetValueCount() const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetEnumValue() const;
+    virtual sal_uInt16      GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetEnumValue() const;
     virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index ff57b83c468e..056415a5d280 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -111,9 +111,9 @@ public:
     inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
     inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
 
-    virtual sal_uInt16          GetValueCount() const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetEnumValue() const;
+    virtual sal_uInt16      GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetEnumValue() const;
     virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index bdf68461d704..fbea62b702ee 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -64,14 +64,14 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() 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 int             HasBoolValue() const;
-    virtual sal_Bool            GetBoolValue() const;
+    virtual sal_Bool        GetBoolValue() const;
     virtual void            SetBoolValue( sal_Bool bVal );
 
     inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 99c9abaf67d2..c4cf6393ebfd 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -94,9 +94,9 @@ public:
     // Calculate width of the shadow on the page.
     sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const;
 
-    virtual sal_uInt16          GetValueCount() const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetEnumValue() const;
+    virtual sal_uInt16      GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetEnumValue() const;
     virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index 29a7370f9802..cd81d7364dc7 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -63,8 +63,8 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() 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 );
@@ -73,7 +73,7 @@ public:
     void                    SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
     virtual int             HasBoolValue() const;
-    virtual sal_Bool            GetBoolValue() const;
+    virtual sal_Bool        GetBoolValue() const;
     virtual void            SetBoolValue( sal_Bool bVal );
 
     virtual int             operator==( const SfxPoolItem& ) const;
@@ -109,7 +109,7 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) 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 ------------------------------------------------
@@ -126,7 +126,7 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) 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
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 8b9fddad5dd4..f3978f850a68 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -64,14 +64,14 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
-    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
-    virtual sal_uInt16          GetValueCount() const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() 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 int             HasBoolValue() const;
-    virtual sal_Bool            GetBoolValue() const;
+    virtual sal_Bool        GetBoolValue() const;
     virtual void            SetBoolValue( sal_Bool bVal );
 
     inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3410fba77128..3868601bab3d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2472,7 +2472,7 @@ void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
 XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
-    XubString aComment;
+    rtl::OUString aComment;
     switch ( nId )
     {
         case EDITUNDO_REMOVECHARS:
@@ -2481,12 +2481,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_DELCONTENT:
         case EDITUNDO_DELETE:
         case EDITUNDO_CUT:
-            aComment = XubString( EditResId( RID_EDITUNDO_DEL ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_DEL);
         break;
         case EDITUNDO_MOVEPARAGRAPHS:
         case EDITUNDO_MOVEPARAS:
         case EDITUNDO_DRAGANDDROP:
-            aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_MOVE);
         break;
         case EDITUNDO_INSERTFEATURE:
         case EDITUNDO_SPLITPARA:
@@ -2494,29 +2494,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_PASTE:
         case EDITUNDO_INSERT:
         case EDITUNDO_READ:
-            aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_INSERT);
         break;
         case EDITUNDO_SRCHANDREPL:
         case EDITUNDO_REPLACEALL:
-            aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_REPLACE);
         break;
         case EDITUNDO_ATTRIBS:
         case EDITUNDO_PARAATTRIBS:
         case EDITUNDO_STRETCH:
-            aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS);
         break;
         case EDITUNDO_RESETATTRIBS:
-            aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS);
         break;
         case EDITUNDO_STYLESHEET:
-            aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE);
         break;
         case EDITUNDO_TRANSLITERATE:
-            aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE);
         break;
         case EDITUNDO_INDENTBLOCK:
         case EDITUNDO_UNINDENTBLOCK:
-            aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_INDENT);
         break;
     }
     return aComment;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3cca643ea635..efdcadb5a85d 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -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!" );
-    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!" );
-    XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
-    return aStr;
+    return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index b1ab1fde2995..b03ce0d648f1 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -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
-    XubString aText;
+    rtl::OUString aText;
     switch ( nPos )
     {
-        case SVX_LINESPACE_USER                 : aText.AppendAscii( "User" );  break;
-        case SVX_LINESPACE_ONE_LINE             : aText.AppendAscii( "One line" );  break;
-        case SVX_LINESPACE_ONE_POINT_FIVE_LINES : aText.AppendAscii( "1.5 line" );  break;
-        case SVX_LINESPACE_TWO_LINES            : aText.AppendAscii( "Two lines" ); break;
+        case SVX_LINESPACE_USER:
+            aText = "User";
+            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;
 }
@@ -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!" );
     return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
@@ -889,17 +897,17 @@ XubString SvxTabStop::GetValueString() const
     aStr += sal_Unicode( '(' );
     aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos));
     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 += sal_Unicode('[');
-    aStr += XubString( EditResId( RID_SVXITEMS_TAB_DECIMAL_CHAR ) );
+    aStr += EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR);
     aStr += GetDecimal();
     aStr += sal_Unicode(']');
     aStr += cpDelim;
     aStr += cpDelim;
     aStr += sal_Unicode('[');
-    aStr += XubString( EditResId( RID_SVXITEMS_TAB_FILL_CHAR ) );
+    aStr += EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR);
     aStr += cFill;
     aStr += sal_Unicode(']');
     aStr += sal_Unicode(')');
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index fcc8275d1a39..8aeacaecc5ec 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -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!" );
 
-    XubString sTxt;
     FontItalic eItalic = (FontItalic)nPos;
     sal_uInt16 nId = 0;
 
@@ -563,9 +562,7 @@ XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
         default: ;//prevent warning
     }
 
-    if ( nId )
-        sTxt = EditResId( nId );
-    return sTxt;
+    return nId ? EE_RESSTR(nId) : rtl::OUString();
 }
 
 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!" );
-    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
@@ -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");
-    return XubString();
+    return rtl::OUString();
 }
 
 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!" );
-    return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
+    return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
 }
 
 // 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!" );
-    return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
+    return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
 }
 
 // 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!" );
-    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
@@ -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!" );
-    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
@@ -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!" );
     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;
 }
 
-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,
                     "enum overflow" );
-    return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
+    return EE_RESSTR(RID_SVXITEMS_RELIEF_BEGIN + nPos);
 }
 
 sal_uInt16 SvxCharReliefItem::GetValueCount() const
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index b42802b37c3c..5d2f5f616b13 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -137,19 +137,19 @@ XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
     switch( nUndoId )
     {
         case OLUNDO_DEPTH:
-            return XubString( EditResId( RID_OUTLUNDO_DEPTH ));
+            return EE_RESSTR(RID_OUTLUNDO_DEPTH);
 
         case OLUNDO_EXPAND:
-            return XubString( EditResId( RID_OUTLUNDO_EXPAND ));
+            return EE_RESSTR(RID_OUTLUNDO_EXPAND);
 
         case OLUNDO_COLLAPSE:
-            return XubString( EditResId( RID_OUTLUNDO_COLLAPSE ));
+            return EE_RESSTR(RID_OUTLUNDO_COLLAPSE);
 
         case OLUNDO_ATTR:
-            return XubString( EditResId( RID_OUTLUNDO_ATTR ));
+            return EE_RESSTR(RID_OUTLUNDO_ATTR);
 
         case OLUNDO_INSERT:
-            return XubString( EditResId( RID_OUTLUNDO_INSERT ));
+            return EE_RESSTR(RID_OUTLUNDO_INSERT);
 
         default:
             return EditEngine::GetUndoComment( nUndoId );
diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 787811219ee8..d0f8b9f41449 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -53,17 +53,17 @@ public:
                             ~SfxAllEnumItem();
 
     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 );
 
-    sal_uInt16                  GetPosByValue( sal_uInt16 nValue ) const;
+    sal_uInt16              GetPosByValue( sal_uInt16 nValue ) const;
 
-    virtual sal_uInt16          GetValueCount() const;
-    virtual sal_uInt16          GetValueByPos( sal_uInt16 nPos ) const;
-    virtual XubString       GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() const;
+    virtual sal_uInt16      GetValueByPos( sal_uInt16 nPos ) const;
+    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) 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 );
 };
 
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 0b710b90854d..e2ff0e27330a 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -61,7 +61,7 @@ public:
 
     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;
 
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 66886545dbc5..5f66cbfab93e 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -43,7 +43,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
 struct SfxAllEnumValue_Impl
 {
     sal_uInt16 nValue;
-    XubString aText;
+    rtl::OUString aText;
 };
 
 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_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);
     SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
@@ -242,7 +242,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
     DBG_CHKTHIS(SfxAllEnumItem, 0);
     SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
     pVal->nValue = nValue;
-    pVal->aText = XubString::CreateFromInt32( nValue );
+    pVal->aText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue));
     const SfxAllEnumValue_Impl *pTemp = pVal;
     if ( !pValues )
         pValues = new SfxAllEnumValueArr;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 9d91e03a8c4c..802f81dccc05 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -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");
-    return XubString();
+    return rtl::OUString();
 }
 
 //============================================================================
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index eeb2834125f8..62a122882de9 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -52,7 +52,7 @@ public:
     virtual sal_uInt16          GetValueCount() const;
     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,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 1fa7e5b452c3..da7c0ac010c4 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -54,7 +54,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index a0b9dc388d96..32dde1497251 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -55,7 +55,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
@@ -82,7 +82,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index a2b42df76027..99fef77fba7d 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -97,7 +97,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 9af3cf6197dc..6ab9ce9f4c58 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -64,7 +64,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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 int              HasBoolValue() const;
     virtual sal_Bool             GetBoolValue() const;
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index 870b700e3727..3cdce60db43d 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -49,7 +49,7 @@ public:
     virtual sal_uInt16           GetValueCount() const; // { return 3; }
     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;
 };
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index 1d7ab20db22d..989fa203239e 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -49,7 +49,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index ae59c320a2fb..fa154c26d5d9 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -46,7 +46,7 @@ public:
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual sal_uInt16          GetValueCount() const; // { return 4; }
             SdrCaptionType  GetValue() const      { return (SdrCaptionType)SfxEnumItem::GetValue(); }
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index c570f628d333..0503bf1d922e 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -52,7 +52,7 @@ public:
             SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
     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 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;
 };
 
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index b26fde1cbb31..2d8564df264b 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -49,7 +49,7 @@ public:
     virtual bool           QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool           PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index 83b145d780b2..0482f88bed8a 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -51,7 +51,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
@@ -71,7 +71,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index 5988d6e211fb..64517440d134 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -48,7 +48,7 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual 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;
 };
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index d2728f557ad1..200b60d80f8a 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -995,7 +995,7 @@ SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 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);
 }
@@ -1022,7 +1022,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
 
 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);
 }
@@ -1054,7 +1054,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/
 
 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);
 }
@@ -1112,7 +1112,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
 
 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);
 }
@@ -1162,7 +1162,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
 
 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);
 }
@@ -1212,7 +1212,7 @@ SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 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);
 }
@@ -1261,7 +1261,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
 
 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);
 }
@@ -1617,7 +1617,7 @@ SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 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);
 }
@@ -1807,7 +1807,7 @@ SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 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);
 }
@@ -1856,7 +1856,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
 
 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);
 }
@@ -1905,7 +1905,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
 
 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);
 }
@@ -1954,12 +1954,12 @@ SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
 
-XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     XubString aRetval;
 
     if((FieldUnit)nPos == FUNIT_NONE)
-        aRetval += UniString(RTL_CONSTASCII_USTRINGPARAM("default"));
+        aRetval = rtl::OUString("default");
     else
         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; }
 
-XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
 }
@@ -2250,30 +2250,30 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const
     return 4;
 }
 
-XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
-    XubString aStr;
+    rtl::OUString aStr;
 
     switch(nPos)
     {
         case 1:
         {
-            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Greys"));
+            aStr = "Greys";
             break;
         }
         case 2:
         {
-            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Black/White"));
+            aStr = "Black/White";
             break;
         }
         case 3:
         {
-            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Watermark"));
+            aStr = "Watermark";
             break;
         }
         default:
         {
-            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
+            aStr = "Standard";
             break;
         }
     }