diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-24 19:38:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-24 22:42:51 +0200 |
commit | 3e5abe71c0f00969425da347e272b49c2624f40b (patch) | |
tree | 2e5dde2de13dc5f5a8a5e363850971a2b04c16a5 /dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | |
parent | 77af4cb9715a00f4f5165fcd912b9640d5ffbca3 (diff) |
drop intermediate TabPage
OColumnControlWindow can be seen used in "use wizard to create table" from base
Change-Id: Ib59b487c6711321550c1b516986ef20df402b171
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx')
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 530dfd6237a3..2e87c0891e44 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -34,7 +34,7 @@ OTableFieldDescWin::OTableFieldDescWin(vcl::Window* pParent, OTableDesignView* p : InterimItemWindow(pParent, "dbaccess/ui/fielddescpanel.ui", "FieldDescPanel") , m_xHelpBar(new OTableDesignHelpBar(m_xBuilder->weld_text_view("textview"))) , m_xBox(m_xBuilder->weld_container("box")) - , m_xFieldControl(VclPtr<OTableFieldControl>::Create(m_xBox.get(), m_xHelpBar.get(), pView)) + , m_xFieldControl(new OTableFieldControl(m_xBox.get(), m_xHelpBar.get(), pView)) , m_xHeader(m_xBuilder->weld_label("header")) , m_eChildFocus(NONE) { @@ -55,7 +55,7 @@ OTableFieldDescWin::~OTableFieldDescWin() void OTableFieldDescWin::dispose() { // destroy children - m_xFieldControl.disposeAndClear(); + m_xFieldControl.reset(); m_xBox.reset(); m_xHeader.reset(); m_xHelpBar.reset(); |