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

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

Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66

37 files changed, 78 insertions, 88 deletions

diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 47aa96800419..470c6d6f8cc4 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -42,7 +42,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
@@ -142,7 +142,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                UniString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index c57eefcbcdb7..6914dd5b327b 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -50,7 +50,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
@@ -112,7 +112,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
@@ -174,7 +174,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
@@ -236,7 +236,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index eef9c6c61c7b..1a783bca78d8 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -55,7 +55,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
-                                                 XubString &rText,
+                                                 OUString & rText,
                                                  const IntlWrapper* pIntlWrapper = 0 ) const;
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal,
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
index 3c1fc0b3894d..bd2964cbc12f 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -56,7 +56,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 42f20b64611d..043502966ffc 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -55,7 +55,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * pIntlWrapper = 0 )
         const;
 
diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index aa59e08cc01c..3a84fea32f67 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -54,7 +54,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString & rText,
                                     const IntlWrapper * = 0 ) const;
             sal_uInt16           GetValue() const { return nVal; }
             void             SetValue( sal_uInt16 nNewVal ) {
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index c9b9a7f79bc3..a9cb341aec10 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -67,7 +67,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index d29243291335..8636c2847c7f 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -154,7 +154,7 @@ public:
     virtual SfxItemPresentation     GetPresentation( const SfxPoolItem& rItem,
                                         SfxItemPresentation ePresentation,
                                         SfxMapUnit          ePresentationMetric,
-                                        XubString&              rText,
+                                        OUString&           rText,
                                         const IntlWrapper * pIntlWrapper
                                          = 0 ) const;
     virtual SfxItemPool*            Clone() const;
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 712e072a0f15..8433ddb664a5 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -167,7 +167,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 4c899f64f91d..70d4eeacf0cc 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -157,7 +157,6 @@ class SvXMLUnitConverter;
 class SfxItemPool;
 class SfxItemSet;
 
-class String;
 namespace rtl
 {
     class OUString;
@@ -209,7 +208,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresentationMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * pIntlWrapper = 0 ) const;
 
     virtual sal_uInt16           GetVersion( sal_uInt16 nFileFormatVersion ) const;
@@ -351,7 +350,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
 
     // von sich selbst eine Kopie erzeugen
@@ -379,7 +378,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
 
     // von sich selbst eine Kopie erzeugen
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 21827f9be954..6906e24baaf7 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -44,7 +44,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
 
     virtual int              operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index ba72b98140fb..b9f0f950eb63 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -45,7 +45,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
 
     virtual int              operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 1f9d23a3e452..698641d51fb1 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -53,7 +53,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
     inline NUMTYPE&             From() { return nFrom; }
@@ -82,7 +82,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
     inline const NUMTYPE*       GetRanges() const { return _pRanges; }
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 4369cb6809e5..a374377bfef0 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -57,7 +57,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const;
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7504e421a567..739b985278cb 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -89,7 +89,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    String &rText, const IntlWrapper * = 0 ) const;
+                                    OUString &rText, const IntlWrapper * = 0 ) const;
 
     // ConfigItem
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index 6b24620052c5..1a576eced6fd 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -44,7 +44,7 @@ public:
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    XubString &rText,
+                                    OUString &rText,
                                     const IntlWrapper * = 0 ) const;
 
     virtual int              operator==( const SfxPoolItem& ) const;
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index 942b43009f73..a5ad679f8665 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -57,7 +57,7 @@ public:
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
-                                                XubString & rText,
+                                                OUString & rText,
                                                 const IntlWrapper * = 0)
         const;
 
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index b2308f455d54..200618e7d206 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -49,10 +49,10 @@ int SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const
 // virtual
 SfxItemPresentation
 SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit,
-                                      SfxMapUnit, XubString & rText,
+                                      SfxMapUnit, OUString & rText,
                                       const IntlWrapper *) const
 {
-    rText = XubString::CreateFromInt32(GetEnumValue());
+    rText = OUString::number( GetEnumValue() );
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
@@ -212,7 +212,7 @@ int CntBoolItem::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation,
                                                  SfxMapUnit, SfxMapUnit,
-                                                 UniString & rText,
+                                                 OUString & rText,
                                                  const IntlWrapper *) const
 {
     rText = GetValueTextByVal(m_bValue);
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index e9d04f838fe0..430bdb3c148f 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -59,11 +59,11 @@ int CntByteItem::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
                                                  SfxMapUnit, SfxMapUnit,
-                                                 XubString & rText,
+                                                 OUString & rText,
                                                  const IntlWrapper *) const
 {
     DBG_CHKTHIS(CntByteItem, 0);
-    rText = XubString::CreateFromInt32(m_nValue);
+    rText = OUString::number( m_nValue );
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
@@ -193,12 +193,12 @@ int CntUInt16Item::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
                                                    SfxMapUnit, SfxMapUnit,
-                                                   XubString & rText,
+                                                   OUString & rText,
                                                    const IntlWrapper *)
     const
 {
     DBG_CHKTHIS(CntUInt16Item, 0);
-    rText = XubString::CreateFromInt32(m_nValue);
+    rText = OUString::number( m_nValue );
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
@@ -325,11 +325,11 @@ int CntInt32Item::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
                                                   SfxMapUnit, SfxMapUnit,
-                                                  XubString & rText,
+                                                  OUString & rText,
                                                   const IntlWrapper *) const
 {
     DBG_CHKTHIS(CntInt32Item, 0);
-    rText = XubString::CreateFromInt32(m_nValue);
+    rText = OUString::number( m_nValue );
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
@@ -458,7 +458,7 @@ int CntUInt32Item::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
                                                    SfxMapUnit, SfxMapUnit,
-                                                   XubString & rText,
+                                                   OUString & rText,
                                                    const IntlWrapper *)
     const
 {
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 32944b50e0d4..7d3da748c61d 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -134,7 +134,7 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal )
 //----------------------------------------------------------------------------
 int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const
 {
-    String aOwnText, aWithText;
+    OUString aOwnText, aWithText;
     GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
                      SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT, aOwnText, &rIntlWrapper );
     rWith.GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
@@ -147,7 +147,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation(
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreMetric,
     SfxMapUnit          ePresMetric,
-    XubString         & rText,
+    OUString          & rText,
     const IntlWrapper * pIntlWrapper) const
 {
     if (_aPresentation.isEmpty())
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index b179643774d2..2b492e9a8c89 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -86,7 +86,7 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith,
 // virtual
 SfxItemPresentation
 CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
-                                        SfxMapUnit, XubString & rText,
+                                        SfxMapUnit, OUString & rText,
                                         const IntlWrapper *) const
 {
     DBG_CHKTHIS(CntUnencodedStringItem, 0);
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index dc7478d5e506..5dc90ada2fbd 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -122,7 +122,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *   pIntlWrapper
 )   const
 {
@@ -130,21 +130,21 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
     if (aDateTime.IsValidDate())
         if (pIntlWrapper)
         {
-            rText = pIntlWrapper->getLocaleData()->getDate(aDateTime);
-            rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-            rText += pIntlWrapper->getLocaleData()->getTime(aDateTime);
+            rText = pIntlWrapper->getLocaleData()->getDate(aDateTime) +
+                    ", " +
+                    pIntlWrapper->getLocaleData()->getTime(aDateTime);
         }
         else
         {
             DBG_WARNING("SfxDateTimeItem::GetPresentation():"
                          " Using default en_US IntlWrapper");
             const IntlWrapper aIntlWrapper( LanguageTag( LANGUAGE_ENGLISH_US) );
-            rText = aIntlWrapper.getLocaleData()->getDate(aDateTime);
-            rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-            rText += aIntlWrapper.getLocaleData()->getTime(aDateTime);
+            rText = aIntlWrapper.getLocaleData()->getDate(aDateTime) +
+                    ", " +
+                    aIntlWrapper.getLocaleData()->getTime(aDateTime);
         }
     else
-        rText.Erase();
+        rText = OUString();
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index a1ce84013440..d2c5fbf169cb 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -73,14 +73,14 @@ SfxItemPresentation SfxFlagItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
     DBG_CHKTHIS(SfxFlagItem, 0);
-    rText.Erase();
+    rText = OUString();
     for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
-        rText += XubString::CreateFromInt32( (int)GetFlag(nFlag) );
+        rText += GetFlag(nFlag) ? OUString("true") : OUString("false");
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 0afc9e18f2d5..363afb9a9ec1 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -90,7 +90,7 @@ int SfxInt16Item::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
                                                   SfxMapUnit, SfxMapUnit,
-                                                  XubString & rText,
+                                                  OUString & rText,
                                                   const IntlWrapper *) const
 {
     DBG_CHKTHIS(SfxInt16Item, 0);
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index cc678ebd0163..13b3b2aaa4be 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -458,7 +458,7 @@ SfxItemPresentation SfxItemPool::GetPresentation
     SfxItemPresentation ePresent,   /*  IN: gew"unschte Art der Darstellung;
                                             siehe <SfxItemPresentation> */
     SfxMapUnit          eMetric,    /*  IN: gew"unschte Ma\seinheit der Darstellung */
-    XubString&           rText,      /*  OUT: textuelle Darstellung von 'rItem' */
+    OUString&           rText,      /*  OUT: textuelle Darstellung von 'rItem' */
     const IntlWrapper * pIntlWrapper
 )   const
 
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 5f7714fd3aad..3bed1d719c4a 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -236,7 +236,7 @@ SfxItemPresentation SvxMacroItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
-    XubString&          rText,
+    OUString&           rText,
     const IntlWrapper *
 )   const
 {
@@ -254,7 +254,7 @@ SfxItemPresentation SvxMacroItem::GetPresentation
             rText += cpDelim;
     }
 */
-    rText.Erase();
+    rText = OUString();
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index ed1bc59d19d4..3ac1e7bebfc3 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -209,7 +209,7 @@ SfxItemPresentation SfxPoolItem::GetPresentation
     SfxItemPresentation /*ePresentation*/,       // IN:  wie formatiert werden soll
     SfxMapUnit          /*eCoreMetric*/,         // IN:  Ma\seinheit des SfxPoolItems
     SfxMapUnit          /*ePresentationMetric*/, // IN:  Wunsch-Ma\einheit der Darstellung
-    XubString&          /*rText*/,               // OUT: textuelle Darstellung
+    OUString&           /*rText*/,               // OUT: textuelle Darstellung
     const IntlWrapper *
 )   const
 
@@ -294,12 +294,12 @@ SfxItemPresentation SfxVoidItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
     DBG_CHKTHIS(SfxVoidItem, 0);
-    rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Void"));
+    rText = "Void";
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index b70c84345cae..811a3d69e05b 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -70,15 +70,12 @@ SfxItemPresentation SfxPointItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
     DBG_CHKTHIS(SfxPointItem, 0);
-    rText = OUString::valueOf(aVal.X());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += OUString::valueOf(aVal.Y());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+    rText = OUString::valueOf(aVal.X()) + ", " + OUString::valueOf(aVal.Y()) + ", ";
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 5c096a1fe3ca..dcd5974056a0 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -67,18 +67,15 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
     DBG_CHKTHIS(SfxRectangleItem, 0);
-    rText = OUString::valueOf(aVal.Top());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += OUString::valueOf(aVal.Left());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += OUString::valueOf(aVal.Bottom());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += OUString::valueOf(aVal.Right());
+    rText = OUString::number(aVal.Top())    + ", " +
+            OUString::number(aVal.Left())   + ", " +
+            OUString::number(aVal.Bottom()) + ", " +
+            OUString::number(aVal.Right());
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index 5db363d97471..572c89ef5fff 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
@@ -67,7 +67,7 @@ SfxItemPresentation SfxXRangeItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
@@ -172,7 +172,7 @@ int SfxXRangesItem::operator==( const SfxPoolItem &rItem ) const
 SfxItemPresentation SfxXRangesItem::GetPresentation( SfxItemPresentation /*ePres*/,
                                     SfxMapUnit /*eCoreMetric*/,
                                     SfxMapUnit /*ePresMetric*/,
-                                    XubString &/*rText*/,
+                                    OUString & /*rText*/,
                                     const IntlWrapper * ) const
 {
     // not implemented
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index b3601e9920ed..9bc457fcd852 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -81,7 +81,7 @@ SfxItemPresentation SfxSetItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              /*rText*/,
+    OUString&              /*rText*/,
     const IntlWrapper *
 )   const
 {
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index caa3651bf4e1..004f8a73f958 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -159,11 +159,11 @@ SfxItemPresentation SfxStringListItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
-    rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("(List)"));
+    rText = "(List)";
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0f0b8d2b3b5b..ca00d5a4d641 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -261,7 +261,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation
     SfxItemPresentation ,
     SfxMapUnit          ,
     SfxMapUnit          ,
-    XubString&          ,
+    OUString&           ,
     const IntlWrapper *
 )   const
 {
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 9116640e5658..614bee831e68 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -343,16 +343,16 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
     IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() );
     while ( pItem )
     {
-        XubString aItemPresentation;
+        OUString aItemPresentation;
 
         if ( !IsInvalidItem( pItem ) &&
              pPool->GetPool().GetPresentation(
                 *pItem, SFX_ITEM_PRESENTATION_COMPLETE,
                 eMetric, aItemPresentation, &aIntlWrapper ) )
         {
-            if ( aDesc.Len() && aItemPresentation.Len() )
+            if ( aDesc.Len() && !aItemPresentation.isEmpty() )
                 aDesc.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" + "));
-            if ( aItemPresentation.Len() )
+            if ( !aItemPresentation.isEmpty() )
                 aDesc += aItemPresentation;
         }
         pItem = aIter.NextItem();
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 4e6d3d512a84..25060234a578 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -66,15 +66,12 @@ SfxItemPresentation SfxSizeItem::GetPresentation
     SfxItemPresentation     /*ePresentation*/,
     SfxMapUnit              /*eCoreMetric*/,
     SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    OUString&               rText,
     const IntlWrapper *
 )   const
 {
     DBG_CHKTHIS(SfxSizeItem, 0);
-    rText = OUString::valueOf(aVal.Width());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += OUString::valueOf(aVal.Height());
-    rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+    rText = OUString::valueOf(aVal.Width()) + ", " + OUString::valueOf(aVal.Height()) + ", ";
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index dfdda6eee77e..5926d298d5c2 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -65,7 +65,7 @@ int SfxVisibilityItem::Compare(const SfxPoolItem & rWith) const
 // virtual
 SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation,
                                                   SfxMapUnit, SfxMapUnit,
-                                                  XubString & rText,
+                                                  OUString & rText,
                                                   const IntlWrapper *) const
 {
     rText = GetValueTextByVal(m_nValue.bVisible);
@@ -126,9 +126,9 @@ sal_uInt16 SfxVisibilityItem::GetValueCount() const
 
 //============================================================================
 // virtual
-rtl::OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
+OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
 {
-    return bTheValue ?  rtl::OUString("TRUE") : rtl::OUString("FALSE");
+    return bTheValue ? OUString("TRUE") : OUString("FALSE");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 823335865205..71da0c842659 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -152,9 +152,9 @@ class INetURLHistory_Impl
 
     /** crc32.
     */
-    sal_uInt32 crc32 (UniString const & rData) const
+    sal_uInt32 crc32 (OUString const & rData) const
     {
-        return rtl_crc32 (0, rData.GetBuffer(), rData.Len() * sizeof(sal_Unicode));
+        return rtl_crc32 (0, rData.getStr(), rData.getLength() * sizeof(sal_Unicode));
     }
 
     /** find.