diff options
author | Andreas Schlüns <as@openoffice.org> | 2000-10-16 10:54:42 +0000 |
---|---|---|
committer | Andreas Schlüns <as@openoffice.org> | 2000-10-16 10:54:42 +0000 |
commit | a8dbd1aa8b6cfe7456472b5259430fec5c589ff6 (patch) | |
tree | 648e83713484789e260424c329ec22b25616bbed | |
parent | b9e4d925df9bbc8a4b91187b55b0cc2c3d79fb1b (diff) |
move AsyncQuit implementation to own file
-rw-r--r-- | framework/inc/helper/oframes.hxx | 7 | ||||
-rw-r--r-- | framework/source/helper/oframes.cxx | 34 |
2 files changed, 5 insertions, 36 deletions
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index dd7587eda0fe..111e4e9c1b73 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -2,9 +2,9 @@ * * $RCSfile: oframes.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:29:22 $ + * last change: $Author: as $ $Date: 2000-10-16 11:54:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,6 @@ namespace framework{ XFrames XIndexAccess XElementAccess - [ XDebugging if TEST_TREE is defined! ] @base OWeakObject @ATTENTION Don't use this class as direct member - use it dynamicly. Do not derive from this class. @@ -157,7 +156,6 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ -//class OFrames : DERIVE_FROM_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! class OFrames : public XFRAMES , //=> XIndexAccess => XElementAccess public OWEAKOBJECT { @@ -197,7 +195,6 @@ class OFrames : public XFRAMES , //=> XIndexAccess => //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE -// DECLARE_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! //--------------------------------------------------------------------------------------------------------- // XFrames diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 6f42ee5d0a2a..54e6195cde3d 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: oframes.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mba $ $Date: 2000-10-13 12:01:04 $ + * last change: $Author: as $ $Date: 2000-10-16 11:54:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,6 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#include <vos/timer.hxx> - //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -103,6 +101,7 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; using namespace ::std ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ // non exported const @@ -115,26 +114,6 @@ using namespace ::std ; //_________________________________________________________________________________________________________________ // declarations //_________________________________________________________________________________________________________________ -class AsyncQuit_Impl : public ::vos::OTimer -{ - Reference < XDesktop > xDesktop; -public: - AsyncQuit_Impl::AsyncQuit_Impl( const Reference < XDesktop >& rDesktop ); - virtual void SAL_CALL onShot(); -}; - -AsyncQuit_Impl::AsyncQuit_Impl( const Reference < XDesktop >& rDesktop ) - : xDesktop( rDesktop ) -{ - setAbsoluteTime( 5000 ); - start(); -} - -void AsyncQuit_Impl::onShot() -{ - if ( xDesktop.is() ) - xDesktop->terminate(); -} //***************************************************************************************************************** // constructor @@ -224,13 +203,6 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim // Don't reset owner-property of removed frame! // This must do the caller of this method himself. // See documentation of interface XFrames for further informations. - - if ( !m_pFrameContainer->getCount() ) - { - Reference < XDesktop > xDesktop ( xOwner, UNO_QUERY ); - if ( xDesktop.is() ) - new AsyncQuit_Impl( xDesktop ); - } } // Else; Do nothing! Ouer owner is dead. LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::remove()\nOuer owner is dead - you can't remove any frames ...!\n" ) |