XubString->OUString

Change-Id: I9e61476f833d409fabe5ae4452c7fff1fbbd74d2

2 files changed, 16 insertions, 17 deletions

diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 8eb23c0d4a28..ff032fd3baa4 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -251,7 +251,7 @@ private:
     SVT_DLLPRIVATE void         ImplInitScrollBar();
     SVT_DLLPRIVATE void         ImplDeleteItems();
     SVT_DLLPRIVATE void         ImplFormatItem( ValueSetItem* pItem, Rectangle aRect );
-    SVT_DLLPRIVATE void         ImplDrawItemText( const XubString& rStr );
+    SVT_DLLPRIVATE void         ImplDrawItemText(const OUString& rStr);
     SVT_DLLPRIVATE void         ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel );
     SVT_DLLPRIVATE void         ImplDrawSelect();
     SVT_DLLPRIVATE void         ImplHideSelect( sal_uInt16 nItemId );
@@ -315,10 +315,10 @@ public:
     void            InsertItem( sal_uInt16 nItemId, const Color& rColor,
                                 size_t nPos = VALUESET_APPEND );
     void            InsertItem( sal_uInt16 nItemId,
-                                const Image& rImage, const XubString& rStr,
+                                const Image& rImage, const OUString& rStr,
                                 size_t nPos = VALUESET_APPEND );
     void            InsertItem( sal_uInt16 nItemId,
-                                const Color& rColor, const XubString& rStr,
+                                const Color& rColor, const OUString& rStr,
                                 size_t nPos = VALUESET_APPEND );
     void            InsertItem( sal_uInt16 nItemId,
                                 size_t nPos = VALUESET_APPEND );
@@ -357,8 +357,8 @@ public:
     Color           GetItemColor( sal_uInt16 nItemId ) const;
     void            SetItemData( sal_uInt16 nItemId, void* pData );
     void*           GetItemData( sal_uInt16 nItemId ) const;
-    void            SetItemText( sal_uInt16 nItemId, const XubString& rStr );
-    XubString       GetItemText( sal_uInt16 nItemId ) const;
+    void            SetItemText( sal_uInt16 nItemId, const OUString& rStr );
+    OUString        GetItemText( sal_uInt16 nItemId ) const;
     void            SetColor( const Color& rColor );
     void            SetColor() { SetColor( Color( COL_TRANSPARENT ) ); }
     Color           GetColor() const { return maColor; }
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 7f62b89d55cb..c0afffd44508 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -678,13 +678,13 @@ void ValueSet::Format()
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplDrawItemText( const XubString& rText )
+void ValueSet::ImplDrawItemText(const OUString& rText)
 {
     if ( !(GetStyle() & WB_NAMEFIELD) )
         return;
 
     Size    aWinSize = GetOutputSizePixel();
-    long    nTxtWidth = GetTextWidth( rText );
+    long    nTxtWidth = GetTextWidth(rText);
     long    nTxtOffset = mnTextOffset;
 
     // delete rectangle and show text
@@ -716,8 +716,7 @@ void ValueSet::ImplDrawSelect()
 
     if ( !bFocus && !bDrawSel )
     {
-        XubString aEmptyStr;
-        ImplDrawItemText( aEmptyStr );
+        ImplDrawItemText(OUString());
         return;
     }
 
@@ -885,7 +884,7 @@ void ValueSet::ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool
                 ShowFocus( aRect2 );
         }
 
-        ImplDrawItemText( pItem->maText );
+        ImplDrawItemText(pItem->maText);
     }
 }
 
@@ -1669,7 +1668,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos
 // -----------------------------------------------------------------------
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
-                           const XubString& rText, size_t nPos )
+                           const OUString& rText, size_t nPos )
 {
     ValueSetItem* pItem = new ValueSetItem( *this );
     pItem->mnId     = nItemId;
@@ -1682,7 +1681,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
 // -----------------------------------------------------------------------
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor,
-                           const XubString& rText, size_t nPos )
+                           const OUString& rText, size_t nPos )
 {
     ValueSetItem* pItem = new ValueSetItem( *this );
     pItem->mnId     = nItemId;
@@ -2151,7 +2150,7 @@ void* ValueSet::GetItemData( sal_uInt16 nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemText( sal_uInt16 nItemId, const XubString& rText )
+void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText)
 {
     size_t nPos = GetItemPos( nItemId );
 
@@ -2178,7 +2177,7 @@ void ValueSet::SetItemText( sal_uInt16 nItemId, const XubString& rText )
             nTempId = mnHighItemId;
 
         if ( nTempId == nItemId )
-            ImplDrawItemText( pItem->maText );
+            ImplDrawItemText(pItem->maText);
     }
 
     if (ImplHasAccessibleListeners())
@@ -2194,14 +2193,14 @@ void ValueSet::SetItemText( sal_uInt16 nItemId, const XubString& rText )
 
 // -----------------------------------------------------------------------
 
-XubString ValueSet::GetItemText( sal_uInt16 nItemId ) const
+OUString ValueSet::GetItemText( sal_uInt16 nItemId ) const
 {
     size_t nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mItemList[nPos]->maText;
-    else
-        return XubString();
+
+    return OUString();
 }
 
 // -----------------------------------------------------------------------