10 files changed, 18 insertions, 7 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 2db2bd060fa7..28f5ffcba8ec 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -87,6 +87,7 @@ MenuButton::~MenuButton()
 void MenuButton::dispose()
 {
     delete mpMenuTimer;
+    mpMenu.clear();
     PushButton::dispose();
 }
 
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index c100a625c445..413cb57c6a79 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -49,6 +49,7 @@ void NotebookBar::dispose()
 {
     disposeBuilder();
     m_pEventListener.clear();
+    m_pTabControl.clear();
     Control::dispose();
 }
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index b1bd83ab5662..04d1210ca690 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -208,7 +208,8 @@ void OutputDevice::dispose()
     }
 
     mpAlphaVDev.disposeAndClear();
-
+    mpPrevGraphics.clear();
+    mpNextGraphics.clear();
     VclReferenceBase::dispose();
 }
 
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 38d9a91be4cb..627cb6e6e65d 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -201,11 +201,7 @@ void FloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext)
 FloatingWindow::~FloatingWindow()
 {
     disposeOnce();
-
-    // Unfortunately the vclwidgets clang plug-in says: "OutputDevice
-    // subclass should have nothing in its destructor but a call to
-    // disposeOnce()."
-    // assert (!mnPostId);
+    assert (!mnPostId);
 }
 
 void FloatingWindow::dispose()
@@ -230,6 +226,7 @@ void FloatingWindow::dispose()
 
     mpNextFloat.clear();
     mpFirstPopupModeWin.clear();
+    mxPrevFocusWin.clear();
     SystemWindow::dispose();
 }
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 50232d2e7606..e48a78d7e57b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2055,6 +2055,7 @@ void MessageDialog::dispose()
     m_pGrid.disposeAndClear();
     m_pOwnedActionArea.disposeAndClear();
     m_pOwnedContentArea.disposeAndClear();
+    m_aResponses.clear();
     Dialog::dispose();
 }
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f146be47f48d..b3b2bc1e8fb0 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -182,6 +182,8 @@ void Menu::dispose()
     // Native-support: destroy SalMenu
     ImplSetSalMenu( nullptr );
 
+    pStartedFrom.clear();
+    pWindow.clear();
     VclReferenceBase::dispose();
 }
 
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 906459c420e9..b2a5b808f534 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -170,6 +170,9 @@ void MenuBarWindow::dispose()
     aHideBtn.disposeAndClear();
     aFloatBtn.disposeAndClear();
     aCloseBtn.disposeAndClear();
+    pMenu.clear();
+    pActivePopup.clear();
+    xSaveFocusId.clear();
 
     Window::dispose();
 }
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 21337acc8723..022eac2e4123 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -115,7 +115,9 @@ MenuFloatingWindow::~MenuFloatingWindow()
 void MenuFloatingWindow::dispose()
 {
     doShutdown();
-
+    pMenu.clear();
+    pActivePopup.clear();
+    xSaveFocusId.clear();
     FloatingWindow::dispose();
 }
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e61d164a5e43..f8d51a006293 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -735,6 +735,8 @@ void PrintDialog::dispose()
     mpCancelButton.clear();
     mpHelpButton.clear();
     maPController.reset();
+    maControlToPropertyMap.clear();
+    maControlToNumValMap.clear();
     ModalDialog::dispose();
 }
 
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 54f40accca2f..242b98a1826c 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -112,6 +112,7 @@ void SystemWindow::dispose()
     mpWindowImpl->mbSysWin = false;
     disposeBuilder();
     mpDialogParent.clear();
+    mpMenuBar.clear();
     Window::dispose();
 }