diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:44:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:44:51 +0000 |
| commit | ec13b074b3ce48d38244950a4a40d260e4127ed4 (patch) | |
| tree | d9e4f7cdf88aa1a7cbe5a48366d0c4f1da5ae2fc /embeddedobj | |
| parent | 6226e53b86db4d2f9d07307140b59efa9f1a15f9 (diff) | |
INTEGRATION: CWS fwk20 (1.19.24); FILE MERGED
2005/08/10 09:46:06 mav 1.19.24.1: #i53144# deregister as terminate listener when requested
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index d0a1634c2f99..4c46c1f1fa52 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docholder.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:37:19 $ + * last change: $Author: hr $ $Date: 2005-09-23 15:44:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -307,15 +307,16 @@ void DocumentHolder::CloseFrame() //--------------------------------------------------------------------------- void DocumentHolder::FreeOffice() { - // the following code is commented out since for now there is still no completely correct way to detect - // whether the office can be terminated, so it is better to have unnecessary process running than - // to loose any data -// const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) ); -// uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); -// if ( xDesktop.is() ) -// { -// xDesktop->removeTerminateListener( this ); -// + const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) ); + uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); + if ( xDesktop.is() ) + { + xDesktop->removeTerminateListener( this ); + + // the following code is commented out since for now there is still no completely correct way to detect + // whether the office can be terminated, so it is better to have unnecessary process running than + // to loose any data + // uno::Reference< frame::XFramesSupplier > xFramesSupplier( xDesktop, uno::UNO_QUERY ); // if ( xFramesSupplier.is() ) // { @@ -330,7 +331,7 @@ void DocumentHolder::FreeOffice() // {} // } // } -// } + } } //--------------------------------------------------------------------------- |