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

[Verne-Lai (via logerrit)]

 sw/source/ui/table/tabledlg.cxx    |    6 ++----
 sw/source/uibase/table/tablepg.hxx |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 457a67a5b692e79db1aea775e0a2eb48bf1dbdfa
Author:     Verne-Lai <verne at ossii.com.tw>
AuthorDate: Fri Oct 8 09:50:05 2021 +0800
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Oct 8 10:22:15 2021 +0200

    tdf#143142 Solve the button cannot be used when table column is 6
    
    Change-Id: I6147c08ec36da59bb93b707fa206f9a8f681af3b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123237
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a797a69f1af2..8b46688ba969 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -742,14 +742,12 @@ SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogControl
                     m_xBuilder->weld_metric_spin_button("width2", FieldUnit::CM),
                     m_xBuilder->weld_metric_spin_button("width3", FieldUnit::CM),
                     m_xBuilder->weld_metric_spin_button("width4", FieldUnit::CM),
-                    m_xBuilder->weld_metric_spin_button("width5", FieldUnit::CM),
-                    m_xBuilder->weld_metric_spin_button("width6", FieldUnit::CM) }
+                    m_xBuilder->weld_metric_spin_button("width5", FieldUnit::CM)}
     , m_aTextArr { m_xBuilder->weld_label("1"),
                    m_xBuilder->weld_label("2"),
                    m_xBuilder->weld_label("3"),
                    m_xBuilder->weld_label("4"),
-                   m_xBuilder->weld_label("5"),
-                   m_xBuilder->weld_label("6") }
+                   m_xBuilder->weld_label("5")}
     , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth"))
     , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns"))
     , m_xSpaceFT(m_xBuilder->weld_label("spaceft"))
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 7c3a4ceea816..4aa1c6d3faf6 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -88,7 +88,7 @@ public:
 };
 
 // TabPage Format/Table/Columns
-#define MET_FIELDS 6 //Number of the used MetricFields
+#define MET_FIELDS 5 //Number of the used MetricFields
 
 class SwTableColumnPage : public SfxTabPage
 {