[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/control/FieldDescControl.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0f85a718dc0d241a8aa1b2d27accb575367691fe
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Sep 15 16:55:40 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Sep 15 18:41:52 2019 +0200

    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 at redhat.com>
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

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);