diff options
Diffstat (limited to 'framework/inc/services')
-rw-r--r-- | framework/inc/services/contenthandlerfactory.hxx | 42 | ||||
-rw-r--r-- | framework/inc/services/desktop.hxx | 42 | ||||
-rw-r--r-- | framework/inc/services/dispatchhelper.hxx | 14 | ||||
-rw-r--r-- | framework/inc/services/layoutmanager.hxx | 42 | ||||
-rw-r--r-- | framework/inc/services/mediatypedetectionhelper.hxx | 32 |
5 files changed, 81 insertions, 91 deletions
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 47a08754c36c..af94e0b83b86 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -45,7 +45,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short factory to create handler-objects @descr These class can be used to create new handler for specified contents. We use cached values of our configuration to lay down, which handler match @@ -81,37 +81,37 @@ class ContentHandlerFactory : // interfaces private TransactionBase , public ::cppu::OWeakObject { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- + ContentHandlerFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~ContentHandlerFactory( ); - //--------------------------------------------------------------------------------------------------------- + // XInterface, XTypeProvider, XServiceInfo - //--------------------------------------------------------------------------------------------------------- + DECLARE_XINTERFACE DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO - //--------------------------------------------------------------------------------------------------------- + // XMultiServiceFactory - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const OUString& sTypeName ) throw( css::uno::Exception , css::uno::RuntimeException ); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& sTypeName , const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception, css::uno::RuntimeException ); virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames ( ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XNameContainer - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL insertByName( const OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , css::container::ElementExistException , @@ -121,41 +121,41 @@ class ContentHandlerFactory : // interfaces css::lang::WrappedTargetException , css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XNameReplace - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL replaceByName( const OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , css::container::NoSuchElementException , css::lang::WrappedTargetException , css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XNameAccess - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Any SAL_CALL getByName ( const OUString& sName ) throw( css::container::NoSuchElementException , css::lang::WrappedTargetException , css::uno::RuntimeException ); virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasByName ( const OUString& sName ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XElementAccess - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements () throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XFlushable - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL flush ( ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL addFlushListener ( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------------------------------- + // private variables // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 6cb114662f74..505f5fbddca2 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -63,7 +63,7 @@ enum ELoadState E_INTERACTION }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short implement the topframe of frame tree @descr This is the root of the frame tree. The desktop has no window, is not visible but he is the logical "masternode" to build the hierarchy. @@ -105,7 +105,7 @@ class Desktop : private osl::Mutex, // internal used types, const etcpp. private: - //--------------------------------------------------------------------- + /** used temporary to know which listener was already called or not. */ typedef ::std::vector< css::uno::Reference< css::frame::XTerminateListener > > TTerminateListenerList; @@ -138,7 +138,7 @@ class Desktop : private osl::Mutex, // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - //--------------------------------------------------------------------- + /** @interface XDesktop @@ -170,7 +170,7 @@ class Desktop : private osl::Mutex, virtual ::sal_Bool SAL_CALL terminate() throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------- + /** @interface XDesktop @@ -193,7 +193,7 @@ class Desktop : private osl::Mutex, virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------- + /** @interface XDesktop @@ -305,9 +305,9 @@ class Desktop : private osl::Mutex, // non-virtual and non-UNO for now bool SAL_CALL terminateQuickstarterToo() throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------------------------------- + // protected methods - //------------------------------------------------------------------------------------------------------------- + protected: // OPropertySetHelper @@ -323,15 +323,15 @@ class Desktop : private osl::Mutex, virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper ( ); virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (css::uno::RuntimeException, std::exception); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: css::uno::Reference< css::lang::XComponent > impl_getFrameComponent ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor( ); - //--------------------------------------------------------------------- + /** calls queryTermination() on every registered termination listener. * * Note: Only normal termination listener (registered in list m_aListenerContainer @@ -352,7 +352,7 @@ class Desktop : private osl::Mutex, void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener, ::sal_Bool& bVeto ); - //--------------------------------------------------------------------- + /** calls cancelTermination() on every termination listener * where queryTermination() was called before. * @@ -368,7 +368,7 @@ class Desktop : private osl::Mutex, */ void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener); - //--------------------------------------------------------------------- + /** calls notifyTermination() on every registered termination listener. * * Note: Only normal termination listener (registered in list m_aListenerContainer @@ -377,7 +377,7 @@ class Desktop : private osl::Mutex, */ void impl_sendNotifyTerminationEvent(); - //--------------------------------------------------------------------- + /** try to close all open frames. * * Iterates over all child frames and try to close them. @@ -395,10 +395,10 @@ class Desktop : private osl::Mutex, */ ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI); - //------------------------------------------------------------------------------------------------------------- + // debug methods // (should be private everytime!) - //------------------------------------------------------------------------------------------------------------- + private: static sal_Bool implcp_addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ); @@ -407,10 +407,10 @@ class Desktop : private osl::Mutex, sal_Bool m_bIsTerminated ; /// check flag to protect us against dispose before terminate! /// see dispose() for further information! - //------------------------------------------------------------------------------------------------------------- + // variables // (should be private everytime!) - //------------------------------------------------------------------------------------------------------------- + private: css::uno::Reference< css::uno::XComponentContext > m_xContext ; /// reference to factory, which has create this instance @@ -427,13 +427,13 @@ class Desktop : private osl::Mutex, OUString m_sTitle ; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ; - //--------------------------------------------------------------------- + /** special terminate listener to close pipe and block external requests * during/after termination process is/was running */ css::uno::Reference< css::frame::XTerminateListener > m_xPipeTerminator; - //--------------------------------------------------------------------- + /** special terminate listener shown inside system tray (quick starter) * Will hinder the office on shutdown ... but wish to allow closing * of open documents. And because thats different to a normal terminate listener @@ -441,7 +441,7 @@ class Desktop : private osl::Mutex, */ css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher; - //--------------------------------------------------------------------- + /** special terminate listener which loads images asynchronous for current open documents. * Because internally it uses blocking system APIs ... it cant be guaranteed that * running jobs can be cancelled successfully if the corressponding document will be closed ... @@ -451,7 +451,7 @@ class Desktop : private osl::Mutex, */ css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager; - //--------------------------------------------------------------------- + /** special terminate listener shuting down the SfxApplication. * Because these desktop instance closes documents and informs listener * only ... it does not really shutdown the whole application. diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 0aab05c12351..922848c3af1e 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -50,7 +50,7 @@ class DispatchHelper : public ThreadHelpBase // must be the ,public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener > { - //------------------------------------------- + // member private: @@ -66,23 +66,23 @@ class DispatchHelper : public ThreadHelpBase // must be the css::uno::Reference< css::uno::XInterface > m_xBroadcaster; - //------------------------------------------- + // interface public: - //--------------------------------------- + // ctor/dtor DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~DispatchHelper( ); - //--------------------------------------- + // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO - //--------------------------------------- + // XDispatchHelper virtual css::uno::Any SAL_CALL executeDispatch( const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider , @@ -92,13 +92,13 @@ class DispatchHelper : public ThreadHelpBase // must be the const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XDispatchResultListener virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aResult ) throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 08932cbf0dc5..db8be46e50f9 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -112,9 +112,8 @@ namespace framework return aSeq; } - //--------------------------------------------------------------------------------------------------------- + // XLayoutManager - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -147,51 +146,42 @@ namespace framework virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException, std::exception); - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor - //--------------------------------------------------------------------------------------------------------- + virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMergedMenuBar( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //--------------------------------------------------------------------------------------------------------- + // XWindowListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- // XFrameActionListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- // XEventListener - //--------------------------------------------------------------------------------------------------------- using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- + // XUIConfigurationListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //--------------------------------------------------------------------------------------------------------- // XLayoutManagerEventBroadcaster - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LINK(MenuBarClose, void *); DECL_LINK( WindowEventListener, VclSimpleEvent* ); - //--------------------------------------------------------------------------------------------------------- + // ILayoutNotifications - //--------------------------------------------------------------------------------------------------------- + virtual void requestLayout( Hint eHint ); /// Reading of settings - shared with ToolbarLayoutManager. @@ -204,27 +194,27 @@ namespace framework DECL_LINK(AsyncLayoutHdl, void *); private: - //--------------------------------------------------------------------------------------------------------- + // helper - //--------------------------------------------------------------------------------------------------------- - //--------------------------------------------------------------------------------------------------------- + + // menu bar - //--------------------------------------------------------------------------------------------------------- + void impl_clearUpMenuBar(); void implts_reset( sal_Bool bAttach ); void implts_updateMenuBarClose(); sal_Bool implts_resetMenuBar(); - //--------------------------------------------------------------------------------------------------------- + // locking - //--------------------------------------------------------------------------------------------------------- + void implts_lock(); sal_Bool implts_unlock(); - //--------------------------------------------------------------------------------------------------------- + // query - //--------------------------------------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName ); void implts_writeNewStateData( const OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow ); @@ -281,9 +271,9 @@ namespace framework DECL_LINK( OptionsChanged, void* ); DECL_LINK( SettingsChanged, void* ); - //--------------------------------------------------------------------------------------------------------- + // OPropertySetHelper - //--------------------------------------------------------------------------------------------------------- + virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index dbb2819ea73e..6af692938147 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -29,13 +29,13 @@ #include <com/sun/star/util/XStringMapping.hpp> #include <cppuhelper/implbase2.hxx> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short - @descr - @@ -50,17 +50,17 @@ namespace framework{ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo> { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard ctor @descr These initialize a new instance of this class with all needed information for work. @@ -74,7 +74,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: MediaTypeDetectionHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard destructor @descr This method destruct an instance of this class and clear some member. @@ -88,17 +88,17 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: virtual ~MediaTypeDetectionHelper(); - //--------------------------------------------------------------------------------------------------------- + // XInterface, XTypeProvider, XServiceInfo - //--------------------------------------------------------------------------------------------------------- + DECLARE_XSERVICEINFO - //--------------------------------------------------------------------------------------------------------- + // XStringMapping - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short - @descr - @@ -113,10 +113,10 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter) throw (css::uno::RuntimeException, std::exception); - //------------------------------------------------------------------------------------------------------------- + // variables // should be private every time - //------------------------------------------------------------------------------------------------------------- + private: |