diff options
Diffstat (limited to 'framework/source/dispatch')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 17 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchinformationprovider.cxx | 6 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 25 | ||||
| -rw-r--r-- | framework/source/dispatch/interceptionhelper.cxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/mailtodispatcher.cxx | 19 | ||||
| -rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 11 | ||||
| -rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 2 | ||||
| -rw-r--r-- | framework/source/dispatch/servicehandler.cxx | 19 | ||||
| -rw-r--r-- | framework/source/dispatch/startmoduledispatcher.cxx | 14 | ||||
| -rw-r--r-- | framework/source/dispatch/systemexec.cxx | 19 | ||||
| -rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 7 |
11 files changed, 0 insertions, 143 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 7c228ec8d595..a4b888a2f5ec 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -40,7 +40,6 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/processfactory.hxx> - using namespace com::sun::star; namespace framework{ @@ -54,8 +53,6 @@ const char URL_CLOSEDOC[] = ".uno:CloseDoc"; const char URL_CLOSEWIN[] = ".uno:CloseWin"; const char URL_CLOSEFRAME[] = ".uno:CloseFrame"; - - CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -78,12 +75,10 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent } } - CloseDispatcher::~CloseDispatcher() { } - void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -91,7 +86,6 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException, std::exception) { @@ -101,7 +95,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro return lGroups; } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException, std::exception) { @@ -126,21 +119,18 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: return css::uno::Sequence< css::frame::DispatchInformation >(); } - void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -228,7 +218,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& m_aAsyncCallback.Post(0); } - /** @short asynchronous callback @descr We start all actions inside this object asnychronoue. @@ -426,7 +415,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) return 0; } - sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , sal_Bool bAllowSuspend , sal_Bool bCloseAllOtherViewsToo, @@ -479,7 +467,6 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc return sal_True; } - sal_Bool CloseDispatcher::implts_closeFrame() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -506,7 +493,6 @@ sal_Bool CloseDispatcher::implts_closeFrame() return sal_True; } - sal_Bool CloseDispatcher::implts_establishBackingMode() { css::uno::Reference< css::uno::XComponentContext > xContext; @@ -538,7 +524,6 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() return sal_True; } - sal_Bool CloseDispatcher::implts_terminateApplication() { css::uno::Reference< css::uno::XComponentContext > xContext; @@ -552,7 +537,6 @@ sal_Bool CloseDispatcher::implts_terminateApplication() return xDesktop->terminate(); } - void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , const css::uno::Any& aResult ) @@ -568,7 +552,6 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css xListener->dispatchFinished(aEvent); } - css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) { diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index dbb45dda40a9..febf48b9cf6b 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -25,12 +25,10 @@ #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/AppDispatchProvider.hpp> - #include <comphelper/sequenceasvector.hxx> namespace framework{ - DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : m_xContext (xContext ) @@ -38,12 +36,10 @@ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Referen { } - DispatchInformationProvider::~DispatchInformationProvider() { } - css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) { @@ -75,7 +71,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport return lGroups.getAsConstList(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception) { @@ -125,7 +120,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati return lReturn; } - css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > DispatchInformationProvider::implts_getAllSubProvider() { css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame); diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 472f6e661e99..80c9026049e1 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -176,11 +176,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return NULL; } - // I) handle special cases which not right for using findFrame() first - - // I.I) "_blank" // It's not the right place to create a new task here - because we are queried for a dispatch object // only, which can handle such request. Such dispatcher should create the required task on demand. @@ -193,7 +190,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop ); } - // I.II) "_default" // This is a combination of search an empty task for recycling - or create a new one. @@ -206,7 +202,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop ); } - // I.III) "_self", "", "_top" // The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ... // Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous @@ -221,7 +216,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_searchProtocolHandler(aURL); } - // I.IV) no further special targets exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. @@ -248,8 +242,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return xDispatcher; } - - css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , const OUString& sTargetFrameName , @@ -257,18 +249,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatch > xDispatcher; - // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "". // But they are specified to use her own fix target. Detect such URLs here and use the correct target. - OUString sTargetName = sTargetFrameName; - // I) handle special cases which not right for using findFrame() first - - // I.I) "_blank", "_default" // It's not the right place to create a new task here. Only the desktop can do that. // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly @@ -284,7 +271,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags } - // I.II) "_menubar" // Special mode on frame or task to receive the local menu. Not supported by findFrame() @@ -293,7 +279,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame ); } - // I.IV) "_beamer" // Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI. // Only the sfx (means the controller) can create it it. @@ -315,7 +300,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.V) "_parent" // Our parent frame (if it exist) should handle this URL. @@ -327,7 +311,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0); } - // I.VI) "_top" // This request must be forwarded to any parent frame, till we reach a top frame. // If no parent exist, we can handle itself. @@ -351,7 +334,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.VII) "_self", "" // Our owner frame should handle this URL. But we can't do it for all of them. // So we ask the internal setted controller first. If he disagree we try to find a registered @@ -412,7 +394,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.VI) no further special handlings exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. @@ -458,8 +439,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame return xDispatcher; } - - /** @short search for a registered protocol handler and ask him for a dispatch object @descr Wes earch a suitable handler inside our cfg package org.openoffice.Office.ProtocolHandler. @@ -524,8 +503,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt return xDispatcher; } - - /** @short get or create new dispatch helper @descr Sometimes we need some helper implementations to support dispatching of special URLs or commands. @@ -626,8 +603,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat return xDispatchHelper; } - - /** @short check URL for support by our used loader or handler @descr If we must return our own dispatch helper implementations (self, blank, create dispatcher!) diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index cec5a555281e..8d23fc2ceb3c 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -23,14 +23,10 @@ #include <vcl/svapp.hxx> - namespace framework{ - sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; - - InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, const css::uno::Reference< css::frame::XDispatchProvider >& xSlave) : m_xOwnerWeak (xOwner ) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 1d008a658173..409970392ae6 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -29,7 +29,6 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher , @@ -47,8 +46,6 @@ DEFINE_INIT_SERVICE(MailToDispatcher, } ) - - /** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -61,8 +58,6 @@ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XCompon { } - - /** @short standard dtor @descr - @@ -71,8 +66,6 @@ MailToDispatcher::~MailToDispatcher() { } - - /** @short decide if this dispatch implementation can be used for requested URL or not @descr A protocol handler is registerd for an URL pattern inside configuration and will @@ -92,8 +85,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis return xDispatcher; } - - /** @short do the same like dispatch() but for multiple requests at the same time @descr - @@ -112,8 +103,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail return lDispatcher; } - - /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. @@ -135,8 +124,6 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& // No notification for status listener! } - - /** @short dispatch with guaranteed notifications about success @descr We use threadsafe internal method to do so. Return state of this function will be used @@ -172,8 +159,6 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& } } - - /** @short threadsafe helper for dispatch calls @descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal @@ -215,8 +200,6 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& return bSuccess; } - - /** @short add/remove listener for state events @descr Because we use an external process to forward such mail URLs, and this process doesn't @@ -234,8 +217,6 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs // not supported yet } - - void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 85b1c6c53c3e..e87fbcf2e38e 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -84,7 +84,6 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); } - // destructor MenuDispatcher::~MenuDispatcher() @@ -94,7 +93,6 @@ MenuDispatcher::~MenuDispatcher() // and a dtor isn't the best place to do that! } - // XDispatch void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , @@ -102,7 +100,6 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& / { } - // XDispatch void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -116,7 +113,6 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat m_aListenerContainer.addInterface( aURL.Complete, xControl ); } - // XDispatch void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -130,10 +126,8 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X m_aListenerContainer.removeInterface( aURL.Complete, xControl ); } - // XFrameActionListener - void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexResettableGuard aGuard; @@ -169,7 +163,6 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro } } - // XEventListener void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { @@ -206,7 +199,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce } } - // private method void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ) @@ -226,7 +218,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce } } - // private method sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource ) @@ -306,7 +297,6 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< return xContext.is() && xOwner.is(); } - // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -327,7 +317,6 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference return bOK ; } - // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 488f6b4af290..eac9f2daf027 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -31,10 +31,8 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo - DEFINE_XSERVICEINFO_MULTISERVICE ( Oxt_Handler , ::cppu::OWeakObject , SERVICENAME_CONTENTHANDLER , diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 17145248ace4..d59089974ac0 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -31,7 +31,6 @@ namespace framework{ #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler , @@ -49,8 +48,6 @@ DEFINE_INIT_SERVICE(ServiceHandler, } ) - - /** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -63,8 +60,6 @@ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServ { } - - /** @short standard dtor @descr - @@ -73,8 +68,6 @@ ServiceHandler::~ServiceHandler() { } - - /** @short decide if this dispatch implementation can be used for requested URL or not @descr A protocol handler is registerd for an URL pattern inside configuration and will @@ -94,8 +87,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa return xDispatcher; } - - /** @short do the same like dispatch() but for multiple requests at the same time @descr - @@ -114,8 +105,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv return lDispatcher; } - - /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. @@ -136,8 +125,6 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& // No notification for status listener! } - - /** @short dispatch with guaranteed notifications about success @descr We use threadsafe internal method to do so. Return state of this function will be used @@ -174,8 +161,6 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& } } - - /** @short threadsafe helper for dispatch calls @descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal @@ -245,8 +230,6 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con return xService; } - - /** @short add/remove listener for state events @descr We use an internal container to hold such registered listener. This container lives if we live. @@ -264,8 +247,6 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css: // not supported yet } - - void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 9611dfe29fab..c6e188cf795b 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <dispatch/startmoduledispatcher.hxx> #include <pattern/frame.hxx> @@ -42,7 +41,6 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/processfactory.hxx> - namespace framework{ #ifdef fpf @@ -50,8 +48,6 @@ namespace framework{ #endif namespace fpf = ::framework::pattern::frame; - - StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -62,12 +58,10 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno { } - StartModuleDispatcher::~StartModuleDispatcher() { } - void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -75,7 +69,6 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -95,35 +88,30 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U implts_notifyResultListener(xListener, nResult, css::uno::Any()); } - css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< ::sal_Int16 >(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/) throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::frame::DispatchInformation >(); } - void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - sal_Bool StartModuleDispatcher::implts_isBackingModePossible () { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) @@ -151,7 +139,6 @@ sal_Bool StartModuleDispatcher::implts_isBackingModePossible () return bIsPossible; } - sal_Bool StartModuleDispatcher::implts_establishBackingMode() { css::uno::Reference< css::frame::XDesktop2> xDesktop = css::frame::Desktop::create( m_xContext ); @@ -167,7 +154,6 @@ sal_Bool StartModuleDispatcher::implts_establishBackingMode() return sal_True; } - void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, ::sal_Int16 nState , const css::uno::Any& aResult ) diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 6a5f8263d609..97975a1f4b96 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -35,7 +35,6 @@ namespace framework{ #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec , @@ -53,21 +52,15 @@ DEFINE_INIT_SERVICE(SystemExec, } ) - - SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext ( rxContext ) { } - - SystemExec::~SystemExec() { } - - css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , const OUString&, sal_Int32 ) throw( css::uno::RuntimeException, std::exception ) @@ -78,8 +71,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( return xDispatcher; } - - css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); @@ -94,16 +85,12 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst return lDispatcher; } - - void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - - void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) @@ -136,24 +123,18 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& } } - - void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not supported yet } - - void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not supported yet } - - void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, const sal_Int16 nState ) { diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index cb47da8e2d7f..725151cceba5 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -33,10 +33,8 @@ #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> - namespace framework{ - WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : m_xContext (xContext ) @@ -46,14 +44,12 @@ WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno impl_startListening(); } - WindowCommandDispatch::~WindowCommandDispatch() { impl_stopListening(); m_xContext.clear(); } - void WindowCommandDispatch::impl_startListening() { osl::ClearableMutexGuard aReadLock(m_mutex); @@ -96,8 +92,6 @@ void WindowCommandDispatch::impl_stopListening() } } - - IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) { if ( ! pParam) @@ -142,7 +136,6 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; } - void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) { // ignore all errors here. It's clicking a menu entry only ... |