diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 17:18:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 17:18:35 +0000 |
| commit | 95ec350335fc92a1db3611b80b2568fd69663935 (patch) | |
| tree | 565390be56b44c6f6f734755fac0f7150c940e02 /chart2/source/inc/LifeTime.hxx | |
| parent | 4e776dd6d2e48c9dfa3aa66a07a730009daa762d (diff) | |
INTEGRATION: CWS chart2mst3 (1.2.4); FILE MERGED
2005/10/07 11:41:53 bm 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2005/08/25 16:24:10 bm 1.2.4.2: #124570# CloseVetoException was passed as Exception to function before throw, which discarded the type. This violated the throw specification later that only allows the CloseVetoException
2004/04/26 11:42:14 iha 1.2.4.1: corrected comment
Diffstat (limited to 'chart2/source/inc/LifeTime.hxx')
| -rw-r--r-- | chart2/source/inc/LifeTime.hxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 3b9e355f7188..e40e29a9a04b 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -4,9 +4,9 @@ * * $RCSfile: LifeTime.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 00:42:04 $ + * last change: $Author: vg $ $Date: 2007-05-22 18:18:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,10 +129,9 @@ public: sal_Bool impl_isDisposedOrClosed(); sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) throw ( ::com::sun::star::uno::Exception ); - sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::uno::Exception& ex ) - throw ( ::com::sun::star::uno::Exception ); - void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto, ::com::sun::star::uno::Exception& ex) - throw ( ::com::sun::star::uno::Exception ); + sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) + throw ( ::com::sun::star::util::CloseVetoException ); + void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); void g_close_endTryClose_doClose(); sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) @@ -178,7 +177,7 @@ if it should do so. //mutex is acquired; call is not registered - if(!aGuard.startApiCall()) + if(!aLifeTimeGuard.startApiCall()) return ; //behave as passive as possible, if disposed or closed //mutex is acquired, call is registered |