diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-13 17:03:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-13 17:04:25 +0000 |
| commit | 7cce1a450c4dd818e7b050313552d722a17f6c36 (patch) | |
| tree | 1a78aef015b38e4b13ed80a27ef7e7b30048cd8f /svtools/source | |
| parent | c60c9d7de6f3cb89fc7e582d0ca173985ccc1a8a (diff) | |
XubString->OUString
Change-Id: I9e61476f833d409fabe5ae4452c7fff1fbbd74d2
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/control/valueset.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
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(); } // ----------------------------------------------------------------------- |