From 457a67a5b692e79db1aea775e0a2eb48bf1dbdfa Mon Sep 17 00:00:00 2001 From: Verne-Lai Date: Fri, 8 Oct 2021 09:50:05 +0800 Subject: 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 Reviewed-by: Michael Stahl --- sw/source/ui/table/tabledlg.cxx | 6 ++---- sw/source/uibase/table/tablepg.hxx | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) 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 { -- cgit /cd-5.3-3.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sc/CppunitTest_sc_statistical_functions_test.mk
AgeCommit message (Expand)Author
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
2016-11-30split the functions test in even more categoriesMarkus Mohrhard