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

17 files changed, 24 insertions, 25 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;