diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:02:21 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:02:21 +0000 |
| commit | 5e1f26b63cd0ea9c64ff6ea7e743dbe91ec76b1c (patch) | |
| tree | bbd3414a34909c3277d9b2edd9de5b99392835cd /chart2/source/model/main/Title.cxx | |
| parent | 105fc74ed56ae47a7321ae662c17a67080e40bc7 (diff) | |
INTEGRATION: CWS chart15 (1.12.10); FILE MERGED
2007/12/03 15:50:06 bm 1.12.10.2: #151172# crash due to shared mutex between model objects and event notifier classes fixed
2007/11/30 17:28:30 bm 1.12.10.1: #151172# remove as listener from formatted strings in DTOR
Diffstat (limited to 'chart2/source/model/main/Title.cxx')
| -rw-r--r-- | chart2/source/model/main/Title.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 96c3ac0a1771..c44bf71a70b0 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Title.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2007-09-18 15:03:14 $ + * last change: $Author: ihi $ $Date: 2008-01-14 14:02:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -251,14 +251,14 @@ namespace chart Title::Title( uno::Reference< uno::XComponentContext > const & /* xContext */ ) : ::property::OPropertySet( m_aMutex ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder( m_aMutex )) + m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) {} Title::Title( const Title & rOther ) : MutexContainer(), impl::Title_Base(), ::property::OPropertySet( rOther, m_aMutex ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder( m_aMutex )) + m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) { CloneHelper::CloneRefSequence< uno::Reference< chart2::XFormattedString > >( rOther.m_aStrings, m_aStrings ); @@ -267,7 +267,10 @@ Title::Title( const Title & rOther ) : } Title::~Title() -{} +{ + ModifyListenerHelper::removeListenerFromAllElements( + ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder ); +} // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() |