diff options
Diffstat (limited to 'framework/inc/dispatch')
-rw-r--r-- | framework/inc/dispatch/closedispatcher.hxx | 26 | ||||
-rw-r--r-- | framework/inc/dispatch/dispatchinformationprovider.hxx | 2 | ||||
-rw-r--r-- | framework/inc/dispatch/interceptionhelper.hxx | 18 | ||||
-rw-r--r-- | framework/inc/dispatch/mailtodispatcher.hxx | 1 | ||||
-rw-r--r-- | framework/inc/dispatch/menudispatcher.hxx | 17 | ||||
-rw-r--r-- | framework/inc/dispatch/oxt_handler.hxx | 8 | ||||
-rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 2 | ||||
-rw-r--r-- | framework/inc/dispatch/startmoduledispatcher.hxx | 19 |
8 files changed, 0 insertions, 93 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 97235519173c..0ac4621f8da7 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -39,12 +39,10 @@ #include <cppuhelper/implbase2.hxx> #include <vcl/evntpost.hxx> - class SystemWindow; namespace framework{ - /** @short helper to dispatch the URLs ".uno:CloseDoc"/".uno:CloseWin"/".uno:CloseFrame" to close a frame/document or the whole application implicitly in case it was the last frame @@ -64,7 +62,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< private: - /** @short describe, which request must be done here. @descr The incoming URLs {.uno:CloseDoc/CloseWin and CloseFrame can be classified so and checked later performant.}*/ @@ -75,54 +72,44 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< E_CLOSE_WIN }; - // member private: - /** @short reference to an uno service manager, which can be used to create own needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short reference to the target frame, which should be closed by this dispatch. */ css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame; - /** @short used for asynchronous callbacks within the main thread. @descr Internally we work asynchronous. Because our callis are not aware, that her request can kill its own environment ... */ ::vcl::EventPoster m_aAsyncCallback; - /** @short used inside asyncronous callback to decide, which operation must be executed. */ EOperation m_eOperation; - /** @short for asynchronous operations we must hold us self alive! */ css::uno::Reference< css::uno::XInterface > m_xSelfHold; - /** @short list of registered status listener */ osl::Mutex m_mutex; ListenerHash m_lStatusListener; - /** @short holded alive for internally asynchronous operations! */ css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener; SystemWindow* m_pSysWindow; - // native interface public: - /** @short connect a new CloseDispatcher instance to its frame. @descr One CloseDispatcher instance is bound to onw frame only. That makes an implementation (e.g. of listener support) @@ -142,22 +129,18 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget); - /** @short does nothing real. */ virtual ~CloseDispatcher(); - // uno interface public: - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -166,17 +149,14 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchInformationProvider virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // internal helper private: - /** @short a callback for asynchronous started operations. @descr As already mentione, we make internally all operations @@ -185,7 +165,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ DECL_LINK( impl_asyncCallback, void* ); - /** @short prepare m_xCloseFrame so it should be closeable without problems. @descr Thats needed to be shure, that the document cant disagree @@ -211,7 +190,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< sal_Bool bCloseAllOtherViewsToo, sal_Bool& bControllerSuspended ); - /** @short close the member m_xCloseFrame. @descr This method does not look for any document @@ -228,7 +206,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_closeFrame(); - /** @short set the special BackingComponent (now StartModule) as new component of our m_xCloseFrame. @@ -237,7 +214,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_establishBackingMode(); - /** @short calls XDesktop->terminate(). @descr No office code has to be called @@ -251,7 +227,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_terminateApplication(); - /** @short notify a DispatchResultListener. @descr We check the listener reference before we use it. @@ -271,7 +246,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< sal_Int16 nState , const css::uno::Any& aResult ); - /** @short try to find the right target frame where this close request must be really done. diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index b6e0db104d5b..0dd129a2e1be 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -47,7 +47,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame: css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::WeakReference< css::frame::XFrame > m_xFrame; - // interface public: @@ -62,7 +61,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame: virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 16f1c6078c3b..06a7c79c9123 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -70,8 +70,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< css::uno::Sequence< OUString > lURLPattern; }; - - /** @short implements a list of items of type InterceptorInfo, and provides some special functions on it. @@ -82,8 +80,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< { public: - - /** @short search for an interceptor inside this list using it's reference. @param xInterceptor @@ -104,8 +100,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< return end(); } - - /** @short search for an interceptor inside this list using it's reference. @param xInterceptor @@ -133,7 +127,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< } }; - // member private: @@ -154,13 +147,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< The last or the first registered one. */ static sal_Bool m_bPreferrFirstInterceptor; - // native interface public: - - /** @short creates a new interception helper instance. @param xOwner @@ -174,8 +164,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< protected: - - /** @short standard destructor. @descr This method destruct an instance of this class and clear some member. @@ -184,12 +172,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< */ virtual ~InterceptionHelper(); - // uno interface public: - // XDispatchProvider /** @short query for a dispatch, which implements the requested feature. @@ -217,7 +203,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProvider /** @short implements an optimized queryDispatch() for remote. @@ -234,7 +219,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProviderInterception /** @short register an interceptor. @@ -253,7 +237,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProviderInterception /** @short release an interceptor. @@ -268,7 +251,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< */ virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener /** @short Is called from our owner frame, in case he will be disposed. diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 888613c572ab..000011ae9ec7 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -37,7 +37,6 @@ #include <cppuhelper/implbase3.hxx> - namespace framework{ /** diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 344a653759b2..5460f5f63cc1 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -55,7 +55,6 @@ namespace framework{ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , OUStringHash > IMPL_ListenerHashContainer; - /*-************************************************************************************************************ @short helper for desktop only(!) to create new tasks on demand for dispatches @descr Use this class as member only! Never use it as baseclass. @@ -77,13 +76,10 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -100,10 +96,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< MenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xOwner ); - // XDispatch - /*-**************************************************************************************************** @short dispatch URL with arguments @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly! @@ -154,17 +148,12 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // XFrameActionListener - virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - /*-**************************************************************************************************** @short dispose current instance @descr If service helper isn't required any longer call this method to release all used resources. @@ -179,10 +168,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // protected methods - protected: /*-**************************************************************************************************** @@ -201,10 +188,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< virtual ~MenuDispatcher(); - // private methods - private: /*-**************************************************************************************************** @@ -235,11 +220,9 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ); - // variables // (should be private everyway!) - private: css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak ; /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!) diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index aa9ceb2a45e6..505097c91446 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -38,7 +38,6 @@ #include <cppuhelper/implbase3.hxx> - namespace framework{ /*-************************************************************************************************************ @@ -62,25 +61,21 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< public: - // constructor / destructor Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~Oxt_Handler( ); - // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , @@ -91,7 +86,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // XExtendedFilterDetection virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -99,12 +93,10 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< protected: - // private methods private: - // variables // (should be private everyway!) diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 4d388a8627d6..71d2d45ab9e4 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -57,7 +57,6 @@ namespace framework{ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , OUStringHash > IMPL_ListenerHashContainer; - /*-************************************************************************************************************ @short helper for desktop only(!) to create new tasks on demand for dispatches @descr Use this class as member only! Never use it as baseclass. @@ -114,7 +113,6 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper5< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFrameActionListener virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 6f054d6d5586..5bbc3d0e01c7 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -40,10 +40,8 @@ #include <cppuhelper/implbase2.hxx> #include <vcl/evntpost.hxx> - namespace framework{ - /** @short helper to handle all URLs related to the StartModule */ @@ -56,31 +54,25 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< private: - /** @short reference to an uno service manager, which can be used to create own needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short our "context" frame. */ css::uno::WeakReference< css::frame::XFrame > m_xOwner; - /** @short the original queryDispatch() target. */ OUString m_sDispatchTarget; - /** @short list of registered status listener */ osl::Mutex m_mutex; ListenerHash m_lStatusListener; - // native interface public: - /** @short connect a new StartModuleDispatcher instance to its "owner frame". @descr Such "owner frame" is used as context for all related operations. @@ -99,24 +91,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget); - /** @short does nothing real. */ virtual ~StartModuleDispatcher(); - // uno interface public: - - - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -125,22 +111,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchInformationProvider virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // internal helper private: - /** @short check if StartModule can be shown. */ sal_Bool implts_isBackingModePossible(); - /** @short open the special BackingComponent (now StartModule) @return [bool] @@ -148,7 +130,6 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_establishBackingMode(); - /** @short notify a DispatchResultListener. @descr We check the listener reference before we use it. |