diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-09-15 16:55:40 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2019-09-15 18:41:52 +0200 |
| commit | 0f85a718dc0d241a8aa1b2d27accb575367691fe (patch) | |
| tree | 4d545ad7bb1ca96956a33135be86ca4fc98231f6 | |
| parent | aee628a37af1a5e54c23a70d2dee2ec1edbd56f2 (diff) | |
tdf#127548: Assertion when creating table in Design
+ fix segfault by resetting m_xContainer and m_xBuilder when disposing
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8c66efa030e98cfdf5da20be368566d64e43c5d1
Change-Id: Ib80dc035b9fbddcf9665d534376a4dc36ec2e9e5
Reviewed-on: https://gerrit.libreoffice.org/78942
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index e04ac5500a08..86a1ed6eb6c0 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -147,6 +147,8 @@ void OFieldDescControl::dispose() m_xType.reset(); m_xAutoIncrementValue.reset(); m_xFormat.reset(); + m_xContainer.reset(); + m_xBuilder.reset(); TabPage::dispose(); } @@ -421,7 +423,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) m_xDefaultText = m_xBuilder->weld_label("DefaultValueText"); m_xDefaultText->show(); m_xDefault = std::make_unique<OPropEditCtrl>( - m_xBuilder->weld_spin_button("DefaultValue"), STR_HELP_DEFAULT_VALUE, FIELD_PROPERTY_DEFAULT); + m_xBuilder->weld_entry("DefaultValue"), STR_HELP_DEFAULT_VALUE, FIELD_PROPERTY_DEFAULT); InitializeControl(m_xDefault->GetWidget(),HID_TAB_ENT_DEFAULT); m_xDefault->show(); break; @@ -581,7 +583,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) m_xFormatText->show(); m_xFormatSample = std::make_unique<OPropEditCtrl>( - m_xBuilder->weld_spin_button("FormatText"), STR_HELP_FORMAT_CODE, -1); + m_xBuilder->weld_entry("FormatText"), STR_HELP_FORMAT_CODE, -1); m_xFormatSample->set_editable(false); m_xFormatSample->set_sensitive(false); InitializeControl(m_xFormatSample->GetWidget(),HID_TAB_ENT_FORMAT_SAMPLE); |