diff options
author | Noel Grandin <noel@peralex.com> | 2016-06-30 14:09:31 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-06 06:38:30 +0000 |
commit | 716844c6ab7cfc18efd61b0f77e285d453b6cc29 (patch) | |
tree | 868d93c4bfd99a84c339cb8e00202fe07d8affb2 /sfx2 | |
parent | eff871de05c5efdac0d0397b539b3b5e999672c9 (diff) |
restore loplugin:vclwidget checking for calling clear() on VclPtr fields
Change-Id: I85eda1c33016c1461d897fc0a3b70457209a7405
Reviewed-on: https://gerrit.libreoffice.org/26806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/saveastemplatedlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index ef27a2dc02f2..24f3bf0bdf93 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -190,6 +190,7 @@ void BackingWindow::dispose() mxDropTargetListener.clear(); } disposeBuilder(); + maDndWindows.clear(); mpOpenButton.clear(); mpRemoteButton.clear(); mpRecentButton.clear(); diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 3042b4bc9a88..2822e998c402 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -66,6 +66,7 @@ void SfxSaveAsTemplateDialog::dispose() mpLBCategory.clear(); mpTemplateNameEdit.clear(); mpOKButton.clear(); + mpCBXDefault.clear(); ModalDialog::dispose(); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 5973eb02bcff..08a5709adb53 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -286,6 +286,8 @@ void SfxTemplateManagerDlg::dispose() mpActionBar.clear(); mpSearchView.clear(); mpLocalView.clear(); + mpActionMenu.clear(); + mpTemplateDefaultMenu.clear(); ModalDialog::dispose(); } @@ -1314,6 +1316,8 @@ void SfxTemplateCategoryDialog::dispose() mpLBCategory.clear(); mpNewCategoryEdit.clear(); mpOKButton.clear(); + mpSelectLabel.clear(); + mpCreateLabel.clear(); ModalDialog::dispose(); } diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 2276b02ac54f..989c9ae9b94e 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -82,6 +82,7 @@ void Deck::dispose() for (VclPtr<Panel> & rpPanel : aPanels) rpPanel.disposeAndClear(); + maPanels.clear(); // just to keep the loplugin:vclwidgets happy mpTitleBar.disposeAndClear(); mpFiller.disposeAndClear(); mpVerticalScrollBar.disposeAndClear(); |