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 /svx/source/mnuctrls | |
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 'svx/source/mnuctrls')
-rw-r--r-- | svx/source/mnuctrls/SmartTagCtl.cxx | 16 | ||||
-rw-r--r-- | svx/source/mnuctrls/clipboardctl.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 36d43cc01581..4f0f3fe523b8 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -68,8 +68,8 @@ void SvxSmartTagsControl::FillMenu() const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence(); const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps = mpSmartTagItem->GetStringKeyMaps(); const lang::Locale& rLocale = mpSmartTagItem->GetLocale(); - const rtl::OUString aApplicationName = mpSmartTagItem->GetApplicationName(); - const rtl::OUString aRangeText = mpSmartTagItem->GetRangeText(); + const OUString aApplicationName = mpSmartTagItem->GetApplicationName(); + const OUString aRangeText = mpSmartTagItem->GetRangeText(); const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange(); const Reference<frame::XController>& xController = mpSmartTagItem->GetController(); @@ -91,8 +91,8 @@ void SvxSmartTagsControl::FillMenu() continue; const sal_Int32 nSmartTagIndex = rActionIndices[0]; - const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); - const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); + const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); + const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); // no sub-menus if there's only one smart tag type listed: PopupMenu* pSbMenu = mpMenu; @@ -105,7 +105,7 @@ void SvxSmartTagsControl::FillMenu() pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) ); // sub-menu starts with smart tag caption and separator - const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; + const OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; nSubMenuPos = 0; pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++); pSbMenu->InsertSeparator(OString(), nSubMenuPos++); @@ -118,12 +118,12 @@ void SvxSmartTagsControl::FillMenu() for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k ) { const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController ); - rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, + OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, aApplicationName, rLocale, xSmartTagProperties, aRangeText, - rtl::OUString(), + OUString(), xController, xTextRange ); @@ -178,7 +178,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) mpSmartTagItem->GetTextRange(), maInvokeActions[ nMyId ].mxSmartTagProperties, mpSmartTagItem->GetRangeText(), - rtl::OUString(), + OUString(), mpSmartTagItem->GetLocale() ); } diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 218bb7e92afb..ea129a988a87 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup (0), bDisabled( sal_False ) { - addStatusListener( rtl::OUString( ".uno:ClipboardFormatItems" )); + addStatusListener( OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, TIB_DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -95,10 +95,10 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "SelectedFormat" ); + aArgs[0].Name = OUString( "SelectedFormat" ); aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( rtl::OUString( ".uno:ClipboardFormatItems" ), + Dispatch( OUString( ".uno:ClipboardFormatItems" ), aArgs ); } |