summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-09-24 12:59:00 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-09-24 12:59:00 +0200
commit9f53948432632063c71dbaf009b00d519a044428 (patch)
tree6e6603203d070963f8e966d8704ee7448f3b1f02 /svx
parent25a615465e3a2ecfaa371fc1357f75b86fe78902 (diff)
dba34a: #i114606# ~FmXFormView: do not only assert when our adapter list is not empty upon destruction, but properly clean it up
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmvwimp.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8681f00803..c593cdf0ef 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -490,6 +490,16 @@ void FmXFormView::notifyViewDying( )
FmXFormView::~FmXFormView()
{
DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" );
+ if ( !m_aPageWindowAdapters.empty() )
+ {
+ for ( PageWindowAdapterList::const_iterator loop = m_aPageWindowAdapters.begin();
+ loop != m_aPageWindowAdapters.end();
+ ++loop
+ )
+ {
+ (*loop)->dispose();
+ }
+ }
cancelEvents();