upgrade GetValueTextByPos family to rtl::OUString

4 files changed, 13 insertions, 13 deletions

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();
 }
 
 //============================================================================