diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 9 | ||||
| -rw-r--r-- | cui/source/inc/cuitabarea.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tppattern.cxx | 2 |
4 files changed, 1 insertions, 14 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 360f6c19c19b..7d03d02f8d77 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -45,8 +45,7 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, const SfxItemSet* pItemSet ) : TabPage ( pParent, rID, rUIXMLDescription ), pSet ( pItemSet ), - bHasExchangeSupport ( false ), - pDialog ( nullptr ) + bHasExchangeSupport ( false ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); } @@ -57,12 +56,6 @@ IconChoicePage::~IconChoicePage() disposeOnce(); } -void IconChoicePage::dispose() -{ - pDialog.clear(); - TabPage::dispose(); -} - /********************************************************************** | | Activate / Deaktivate diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 6e45726d80e5..2e692005f7b5 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -606,7 +606,6 @@ class SvxPatternTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - VclPtr<VclBox> m_pBxPixelEditor; VclPtr<SvxPixelCtl> m_pCtlPixel; VclPtr<SvxColorListBox> m_pLbColor; VclPtr<SvxColorListBox> m_pLbBackgroundColor; @@ -614,7 +613,6 @@ private: VclPtr<SvxXRectPreview> m_pCtlPreview; VclPtr<PushButton> m_pBtnAdd; VclPtr<PushButton> m_pBtnModify; - VclPtr<PushButton> m_pBtnDelete; SvxBitmapCtl* m_pBitmapCtl; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index adfdf0941a06..21fe5c49fcea 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -63,7 +63,6 @@ private: const SfxItemSet* pSet; OUString aUserString; bool bHasExchangeSupport; - VclPtr<IconChoiceDialog> pDialog; void ImplInitSettings(); @@ -75,7 +74,6 @@ protected: public: virtual ~IconChoicePage() override; - virtual void dispose() override; const SfxItemSet& GetItemSet() const { return *pSet; } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 1995c2779085..5bed8420105b 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -151,9 +151,7 @@ void SvxPatternTabPage::dispose() m_pCtlPreview.clear(); m_pBtnAdd.clear(); m_pBtnModify.clear(); - m_pBxPixelEditor.clear(); m_pPatternLB.clear(); - m_pBtnDelete.clear(); SvxTabPage::dispose(); } |