diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-03 15:09:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-03 15:09:14 +0000 |
| commit | f10a96d10deabfd386c5931d3035c0756ba153ec (patch) | |
| tree | c752b09e5566c6ab548fc3e8e76fcf35055947ce /forms/source/component | |
| parent | b020d7e47f6c7c170dd50480be7073635078a4d1 (diff) | |
INTEGRATION: CWS dba202c (1.5.32); FILE MERGED
2005/12/09 14:32:24 fs 1.5.32.1: #i59135# don't access GetImageProducer if we're disposed
Diffstat (limited to 'forms/source/component')
| -rw-r--r-- | forms/source/component/clickableimage.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 911ea7461464..fc70f00a765a 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: clickableimage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2005-12-21 13:22:41 $ + * last change: $Author: kz $ $Date: 2006-01-03 16:09:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -638,18 +638,21 @@ namespace frm //-------------------------------------------------------------------- void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) { + ImageModelMethodGuard aGuard( *this ); GetImageProducer()->addConsumer( _rxConsumer ); } //-------------------------------------------------------------------- void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) { + ImageModelMethodGuard aGuard( *this ); GetImageProducer()->removeConsumer( _rxConsumer ); } //-------------------------------------------------------------------- void SAL_CALL OClickableImageBaseModel::startProduction( ) throw (RuntimeException) { + ImageModelMethodGuard aGuard( *this ); GetImageProducer()->startProduction(); } @@ -689,6 +692,7 @@ namespace frm } m_xProducer = NULL; + m_pProducer = NULL; } //------------------------------------------------------------------------------ |