diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 13:52:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 14:31:44 +0100 |
commit | cf6a74af5340c2c4fbf270a95bad12479524d9d4 (patch) | |
tree | 5d9bdbbdf54f15d0649c66009d86c08aeef27bb7 /svtools/source | |
parent | 8197518497ce5c538ea5db85168614f6025de2b5 (diff) |
XubString->OUString
Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 14 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox3.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/ctrltool.cxx | 10 |
4 files changed, 17 insertions, 19 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 0fbca4c5d3b8..23f418dad9d0 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -212,7 +212,7 @@ void BrowseBox::DoHideCursor( const char * ) //------------------------------------------------------------------- -void BrowseBox::SetRealRowCount( const String &rRealRowCount ) +void BrowseBox::SetRealRowCount( const OUString &rRealRowCount ) { getDataWindow()->aRealRowCount = rRealRowCount; } @@ -228,7 +228,7 @@ void BrowseBox::SetFont( const Font& rNewFont ) //------------------------------------------------------------------- -sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const +sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const { return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } @@ -250,7 +250,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) } #endif - pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), String(), nWidth, GetZoom() ) ); + pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), OUString(), nWidth, GetZoom() ) ); FreezeColumn( 0 ); // adjust headerbar @@ -267,7 +267,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) //------------------------------------------------------------------- -void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const XubString& rText, +void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -532,7 +532,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) //------------------------------------------------------------------- -void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle ) +void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -856,13 +856,13 @@ void BrowseBox::RemoveColumns() //------------------------------------------------------------------- -String BrowseBox::GetColumnTitle( sal_uInt16 nId ) const +OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); sal_uInt16 nItemPos = GetColumnPos( nId ); if ( nItemPos >= pCols->size() ) - return String(); + return OUString(); return (*pCols)[ nItemPos ]->Title(); } diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 6a3018553a5d..7b511c0e961d 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -386,10 +386,10 @@ void BrowseBox::GrabTableFocus() GrabFocus(); } // ----------------------------------------------------------------------------- -String BrowseBox::GetCellText(long, sal_uInt16 ) const +OUString BrowseBox::GetCellText(long, sal_uInt16 ) const { DBG_ASSERT(0,"This method has to be implemented by the derived classes! BUG!!"); - return String(); + return OUString(); } // ----------------------------------------------------------------------------- @@ -520,7 +520,7 @@ sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) con return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) ); } // ----------------------------------------------------------------------------- -String BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const +OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const { return GetCellText( _nRow, GetColumnId( _nColPos ) ); } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 3c8111f89e7c..053dfa248e32 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -900,9 +900,9 @@ sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const return sal_True; } // ----------------------------------------------------------------------- -String SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const +OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const { - return OUString( GetTabEntryText( _nRow, _nColumnPos ) ); + return GetTabEntryText(_nRow, _nColumnPos); } // ----------------------------------------------------------------------- Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen ) @@ -1272,7 +1272,7 @@ Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_In // ----------------------------------------------------------------------------- sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) { - String sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) ); + OUString sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) ); MetricVector aRects; if ( GetGlyphBoundRects(Point(0,0),sText,0,STRING_LEN,0,aRects) ) { diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 0684d9bf9e8e..a4f2dcf4dfc6 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -503,12 +503,11 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const // ----------------------------------------------------------------------- -XubString FontList::GetFontMapText( const FontInfo& rInfo ) const +OUString FontList::GetFontMapText( const FontInfo& rInfo ) const { if ( !rInfo.GetName().Len() ) { - XubString aEmptryStr; - return aEmptryStr; + return OUString(); } // Search Fontname @@ -516,7 +515,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const if ( !pData ) { if (maMapNotAvailable.isEmpty()) - ((FontList*)this)->maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE); + maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE); return maMapNotAvailable; } @@ -544,8 +543,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const if ( bNoneAvailable ) { - XubString aEmptryStr; - return aEmptryStr; + return OUString(); } else if ( !bNotSynthetic ) { |