diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/source/window/toolbox2.cxx | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl/source/window/toolbox2.cxx')
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 85f7ca9c8830..c90b075c3c79 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -42,7 +42,6 @@ using namespace vcl; -using ::rtl::OUString; // ======================================================================= @@ -353,9 +352,9 @@ sal_Bool ImplToolItem::IsClipped() const // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -const rtl::OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) +const OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) { - rtl::OUString aCvtStr( rStr ); + OUString aCvtStr( rStr ); if ( mbMenuStrings ) aCvtStr = comphelper::string::stripEnd(aCvtStr, '.'); aCvtStr = MnemonicGenerator::EraseAllMnemonicChars( aCvtStr ); @@ -1693,7 +1692,7 @@ const XubString& ToolBox::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1703,9 +1702,9 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) // ----------------------------------------------------------------------- -rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const +OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const { - rtl::OString aRet; + OString aRet; ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1714,7 +1713,7 @@ rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const if ( !pItem->maHelpId.isEmpty() ) aRet = pItem->maHelpId; else - aRet = ::rtl::OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); } return aRet; |