1 files changed, 15 insertions, 10 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 784cfc0e383e..76dccb98d8e7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -322,7 +322,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
 
 SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwMultiTOXTabDialog::dispose()
@@ -718,7 +718,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
 
 SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwAddStylesDlg_Impl::dispose()
@@ -902,7 +902,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
 
 SwTOXSelectTabPage::~SwTOXSelectTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTOXSelectTabPage::dispose()
@@ -1538,7 +1538,7 @@ public:
         m_pParent( pTokenWin )
     {
     }
-    virtual ~SwTOXEdit() { dispose(); }
+    virtual ~SwTOXEdit() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); Edit::dispose(); }
 
     virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
@@ -1625,8 +1625,13 @@ public:
         m_pParent(pTokenWin)
     {
     }
+<<<<<<< HEAD
     virtual ~SwTOXButton() { dispose(); }
     virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); PushButton::dispose(); }
+=======
+    virtual ~SwTOXButton() { disposeOnce(); }
+    virtual void dispose() SAL_OVERRIDE { m_pParent.disposeAndClear(); PushButton::dispose(); }
+>>>>>>> 82c89a6... vclwidget: only call dispose() once
 
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
@@ -1749,7 +1754,7 @@ SwIdxTreeListBox::SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle)
 
 SwIdxTreeListBox::~SwIdxTreeListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwIdxTreeListBox::dispose()
@@ -1959,7 +1964,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt
 
 SwTOXEntryTabPage::~SwTOXEntryTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTOXEntryTabPage::dispose()
@@ -2760,7 +2765,7 @@ void SwTokenWindow::setAllocation(const Size &rAllocation)
 
 SwTokenWindow::~SwTokenWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTokenWindow::dispose()
@@ -3652,7 +3657,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& r
 
 SwTOXStylesTabPage::~SwTOXStylesTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTOXStylesTabPage::dispose()
@@ -3913,7 +3918,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB
 
 SwEntryBrowseBox::~SwEntryBrowseBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwEntryBrowseBox::dispose()
@@ -4212,7 +4217,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu
 
 SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwAutoMarkDlg_Impl::dispose()