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

[Caolán McNamara (via logerrit)]

 sw/source/ui/table/tabledlg.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 63c5a1e2aa9e39633c3e644df0d8d9f8cedfc10e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Nov 12 15:32:15 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 12 18:33:45 2019 +0100

    Resolves: tdf#128746 crash in table properties dialog
    
    Change-Id: I3d7d49cc225afc0dee542205690d56643a0c2e64
    Reviewed-on: https://gerrit.libreoffice.org/82532
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index d9039f42176c..4d126dcdfc81 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -736,6 +736,10 @@ SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogControl
     // the pages are instantiated and the dialog preferred size is that of the
     // all the pages that currently exist and the rest to come after this one
     m_pSizeHdlEvent = Application::PostUserEvent(LINK(this, SwTableColumnPage, SizeHdl));
+
+    const SfxPoolItem* pItem;
+    Init(SfxItemState::SET == GetItemSet().GetItemState(SID_HTML_MODE, false, &pItem)
+         && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON);
 }
 
 IMPL_LINK_NOARG(SwTableColumnPage, SizeHdl, void*, void)
@@ -759,10 +763,6 @@ IMPL_LINK_NOARG(SwTableColumnPage, SizeHdl, void*, void)
             break;
         }
     }
-
-    const SfxPoolItem* pItem;
-    Init(SfxItemState::SET == GetItemSet().GetItemState(SID_HTML_MODE, false, &pItem)
-         && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON);
 }
 
 SwTableColumnPage::~SwTableColumnPage()
@@ -829,7 +829,7 @@ void  SwTableColumnPage::Init(bool bWeb)
 {
     FieldUnit aMetric = ::GetDfltMetric(bWeb);
     Link<weld::MetricSpinButton&,void> aLk = LINK(this, SwTableColumnPage, ValueChangedHdl);
-    for (sal_uInt16 i = 0; i < m_nMetFields; ++i)
+    for (sal_uInt16 i = 0; i < MET_FIELDS; ++i)
     {
         m_aValueTable[i] = i;
         m_aFieldArr[i].SetMetric(aMetric);