summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-16 11:35:54 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-16 11:35:54 +0000
commit0aa28d2a8abff9a61d8c15cbe5efb49c2ad4078c (patch)
tree70d8144a752535b4ecd51b615ec6f9f2b442f721 /comphelper
parent6eff64acab4c3fda53ac47bf7e768dc8716b8026 (diff)
INTEGRATION: CWS eforms2 (1.6.146); FILE MERGED
2004/07/12 13:45:32 fs 1.6.146.1: #114856# +disposeAdapter
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/property/propmultiplex.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index cfb17d293338..1d8bc1a03857 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: propmultiplex.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: fs $ $Date: 2001-05-31 13:56:32 $
+ * last change: $Author: obo $ $Date: 2004-11-16 12:35:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -93,6 +93,16 @@ void OPropertyChangeListener::_disposing(const EventObject& _rSource) throw( Run
}
//------------------------------------------------------------------
+void OPropertyChangeListener::disposeAdapter()
+{
+ if ( m_pAdapter )
+ m_pAdapter->dispose();
+
+ // will automatically set a new adapter
+ OSL_ENSURE( !m_pAdapter, "OPropertyChangeListener::disposeAdapter: what did dispose do?" );
+}
+
+//------------------------------------------------------------------
void OPropertyChangeListener::setAdapter(OPropertyChangeMultiplexer* pAdapter)
{
if (m_pAdapter)