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 /framework/source/dispatch | |
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 'framework/source/dispatch')
-rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 8 | ||||
-rw-r--r-- | framework/source/dispatch/dispatchinformationprovider.cxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 10 | ||||
-rw-r--r-- | framework/source/dispatch/interceptionhelper.cxx | 4 | ||||
-rw-r--r-- | framework/source/dispatch/loaddispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/mailtodispatcher.cxx | 4 | ||||
-rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 1 | ||||
-rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 12 | ||||
-rw-r--r-- | framework/source/dispatch/servicehandler.cxx | 8 | ||||
-rw-r--r-- | framework/source/dispatch/startmoduledispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/systemexec.cxx | 8 | ||||
-rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 8 |
12 files changed, 34 insertions, 35 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index c4f49c570293..1fa0c575eafc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -74,7 +74,7 @@ DEFINE_XTYPEPROVIDER_4(CloseDispatcher , //----------------------------------------------- CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) : ThreadHelpBase (&Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xSMGR (xSMGR ) @@ -128,14 +128,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); - lViewInfos[0].Command = rtl::OUString(URL_CLOSEWIN); + lViewInfos[0].Command = OUString(URL_CLOSEWIN); lViewInfos[0].GroupId = css::frame::CommandGroup::VIEW; return lViewInfos; } else if (nCommandGroup == css::frame::CommandGroup::DOCUMENT) { css::uno::Sequence< css::frame::DispatchInformation > lDocInfos(1); - lDocInfos[0].Command = rtl::OUString(URL_CLOSEDOC); + lDocInfos[0].Command = OUString(URL_CLOSEDOC); lDocInfos[0].GroupId = css::frame::CommandGroup::DOCUMENT; return lDocInfos; } @@ -591,7 +591,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css //----------------------------------------------- css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) { if (sTarget.equalsIgnoreAsciiCase("_self")) return xFrame; diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index b0c6db53d2a4..5e2435a6366e 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 90f39948d327..10b382b64610 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -116,7 +116,7 @@ DispatchProvider::~DispatchProvider() @threadsafe yes */ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -184,7 +184,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp */ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDesktopDispatch( const css::uno::Reference< css::frame::XFrame > xDesktop , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -276,7 +276,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -286,7 +286,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame // But they are specified to use her own fix target. Detect such URLs here and use the correct target. //----------------------------------------------------------------------------------------------------- - ::rtl::OUString sTargetName = sTargetFrameName; + OUString sTargetName = sTargetFrameName; //----------------------------------------------------------------------------------------------------- // I) handle special cases which not right for using findFrame() first @@ -576,7 +576,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt */ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper eHelper , const css::uno::Reference< css::frame::XFrame >& xOwner , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nSearchFlags) { css::uno::Reference< css::frame::XDispatch > xDispatchHelper; diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index e3cacde821e7..eedfcabf26ad 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -53,7 +53,7 @@ InterceptionHelper::~InterceptionHelper() } css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException) { @@ -127,7 +127,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: else { aInfo.lURLPattern.realloc(1); - aInfo.lURLPattern[0] = ::rtl::OUString("*"); + aInfo.lURLPattern[0] = OUString("*"); } // SAFE { diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 4d0a12b7c85e..d84d8221629b 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -27,7 +27,7 @@ namespace framework{ LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , - const ::rtl::OUString sTargetName , + const OUString sTargetName , sal_Int32 nSearchFlags) : ThreadHelpBase( ) , m_xSMGR (xSMGR ) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 40f6a9102360..c2c15e776fcf 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -104,7 +104,7 @@ MailToDispatcher::~MailToDispatcher() at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& /*sTarget*/ , + const OUString& /*sTarget*/ , sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -229,7 +229,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& // start mail client // Because there is no notofocation about success - we use case of // no detected exception as SUCCESS - FAILED otherwise. - xSystemShellExecute->execute( aURL.Complete, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( aURL.Complete, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); bSuccess = sal_True; } catch (const css::lang::IllegalArgumentException&) diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 956a403327b9..6518d5fed2e4 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::util ; using namespace ::cppu ; - using ::rtl::OUString; const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610; diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 27ac34dc82cb..e4951efacf19 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -139,7 +139,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, // SAFE { ResetableGuard aLock( m_aLock ); - rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; + OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; css::uno::Sequence< css::uno::Any > lParams(1); lParams[0] <<= aURL.Main; @@ -148,7 +148,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, xService = m_xFactory->createInstanceWithArguments( sServiceName, lParams ); css::uno::Reference< css::task::XJobExecutor > xExecuteable( xService, css::uno::UNO_QUERY ); if ( xExecuteable.is() ) - xExecuteable->trigger( rtl::OUString() ); + xExecuteable->trigger( OUString() ); if ( xListener.is() ) { @@ -192,15 +192,15 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @onerror We return nothing. @threadsafe yes *//*-*************************************************************************************************************/ -::rtl::OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) +OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. - ::rtl::OUString sTypeName; + OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... ::comphelper::MediaDescriptor aDescriptor( lDescriptor ); - ::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); + OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() ); long nLength = sURL.getLength(); if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) ) @@ -210,7 +210,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString("oxt_OpenOffice_Extension"); + sTypeName = OUString("oxt_OpenOffice_Extension"); aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index ddd6c681cf39..4abf60aaf0e3 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -106,7 +106,7 @@ ServiceHandler::~ServiceHandler() at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& /*sTarget*/ , + const OUString& /*sTarget*/ , sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -226,9 +226,9 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con // extract service name and may optional given parameters from given URL // and use it to create and start the component - ::rtl::OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); - ::rtl::OUString sServiceName; - ::rtl::OUString sArguments ; + OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); + OUString sServiceName; + OUString sArguments ; sal_Int32 nArgStart = sServiceAndArguments.indexOf('?',0); if (nArgStart!=-1) diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index d5a3d93d697a..56f87f8d498c 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -70,7 +70,7 @@ DEFINE_XTYPEPROVIDER_4(StartModuleDispatcher , //----------------------------------------------- StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) : ThreadHelpBase (&Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xContext (rxContext ) diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index b06b76498ccf..4d36a0a6ac7b 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -90,7 +90,7 @@ SystemExec::~SystemExec() //_________________________________________________________________________________________________________________ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString&, + const OUString&, sal_Int32 ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -136,7 +136,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& impl_notifyResultListener(xListener, css::frame::DispatchResultState::FAILURE); return; } - ::rtl::OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c); + OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -150,11 +150,11 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& { css::uno::Reference< css::util::XStringSubstitution > xPathSubst( css::util::PathSubstitution::create(xContext) ); - ::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists ! + OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists ! css::uno::Reference< css::system::XSystemShellExecute > xShell = css::system::SystemShellExecute::create( xContext ); - xShell->execute(sSystemURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); + xShell->execute(sSystemURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); impl_notifyResultListener(xListener, css::frame::DispatchResultState::SUCCESS); } catch(const css::uno::Exception&) diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 620f5449153a..3edef48cd889 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -125,16 +125,16 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; const int nCommand = pData->GetDialogId(); - ::rtl::OUString sCommand; + OUString sCommand; switch (nCommand) { case SHOWDIALOG_ID_PREFERENCES : - sCommand = rtl::OUString(".uno:OptionsTreeDialog"); + sCommand = OUString(".uno:OptionsTreeDialog"); break; case SHOWDIALOG_ID_ABOUT : - sCommand = rtl::OUString(".uno:About"); + sCommand = OUString(".uno:About"); break; default : @@ -147,7 +147,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) } //----------------------------------------------- -void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand) +void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) { // ignore all errors here. It's clicking a menu entry only ... // The user will try it again, in case nothing happens .-) |