diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-23 20:45:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-24 08:55:25 +0100 |
| commit | fc67191ba272607655a9167b23054a7821cdd808 (patch) | |
| tree | 48649afba01fbaef555d1f526fcc6f2790753077 /vcl | |
| parent | 570fe620e9d573cfc9fc260e6518563c6a6c1a3c (diff) | |
XubString->OUString
Change-Id: Ie6b44d1f4abe1826254ab5bb178d73606bd1283c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menu.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/status.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index dfbbd93a811f..ae45891b33ad 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1978,7 +1978,7 @@ sal_Bool Menu::GetItemImageMirrorMode( sal_uInt16 nItemId ) const return sal_False; } -void Menu::SetItemCommand( sal_uInt16 nItemId, const String& rCommand ) +void Menu::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); @@ -1987,14 +1987,14 @@ void Menu::SetItemCommand( sal_uInt16 nItemId, const String& rCommand ) pData->aCommandStr = rCommand; } -const XubString& Menu::GetItemCommand( sal_uInt16 nItemId ) const +const OUString Menu::GetItemCommand( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); - if ( pData ) + if (pData) return pData->aCommandStr; - else - return ImplGetSVEmptyStr(); + + return OUString(); } void Menu::SetHelpCommand( sal_uInt16 nItemId, const XubString& rStr ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 1d08e8444e6c..2336cc336ae1 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1308,7 +1308,7 @@ const XubString& StatusBar::GetItemText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void StatusBar::SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ) +void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1323,14 +1323,14 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ) // ----------------------------------------------------------------------- -const XubString& StatusBar::GetItemCommand( sal_uInt16 nItemId ) +const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); if ( nPos != STATUSBAR_ITEM_NOTFOUND ) return (*mpItemList)[ nPos ]->maCommand; - return ImplGetSVEmptyStr(); + return OUString(); } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 05afd1a33bd3..1da3f821df8d 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1795,24 +1795,24 @@ sal_Bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ) +void ToolBox::SetItemCommand(sal_uInt16 nItemId, const OUString& rCommand) { ImplToolItem* pItem = ImplGetItem( nItemId ); - if ( pItem ) + if (pItem) pItem->maCommandStr = rCommand; } // ----------------------------------------------------------------------- -const XubString& ToolBox::GetItemCommand( sal_uInt16 nItemId ) const +const OUString ToolBox::GetItemCommand( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); - if ( pItem ) + if (pItem) return pItem->maCommandStr; - else - return ImplGetSVEmptyStr(); + + return OUString(); } // ----------------------------------------------------------------------- |