tdf#134930 remaining space is for display only purposes

use a label instead, keep spinbutton (but invisible) to format the label

Change-Id: I36660566df34891e8e813dee24375eacf55e09d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100127
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 34 insertions, 6 deletions

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index 1d7ca6b084b7..b0c581ee1cf8 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -222,6 +222,7 @@ sw/uiconfig/swriter/ui/tocindexpage.ui://GtkButton[@id='styles'] missing-label-f
 sw/uiconfig/swriter/ui/tocstylespage.ui://GtkButton[@id='assign'] button-no-label
 sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkButton[@id='back'] button-no-label
 sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkButton[@id='next'] button-no-label
+sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkSpinButton[@id='spacefmt'] no-labelled-by
 sw/uiconfig/swriter/ui/tablepreviewdialog.ui://GtkLabel[@id='description'] orphan-label
 sw/uiconfig/swriter/ui/tabletextflowpage.ui://GtkSpinButton[@id='pagenonf'] missing-label-for
 sw/uiconfig/swriter/ui/tabletextflowpage.ui://GtkLabel[@id='label39'] orphan-label
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1705533500dd..c8f466728e80 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -732,7 +732,8 @@ SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogControl
     , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth"))
     , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns"))
     , m_xSpaceFT(m_xBuilder->weld_label("spaceft"))
-    , m_xSpaceED(m_xBuilder->weld_metric_spin_button("space", FieldUnit::CM))
+    , m_xSpaceSFT(m_xBuilder->weld_label("space"))
+    , m_xSpaceED(m_xBuilder->weld_metric_spin_button("spacefmt", FieldUnit::CM))
     , m_xUpBtn(m_xBuilder->weld_button("next"))
     , m_xDownBtn(m_xBuilder->weld_button("back"))
 {
@@ -1047,8 +1048,13 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos )
         m_nTableWidth += nAdd;
     }
 
-    if(!m_bPercentMode)
+    if (!m_bPercentMode)
+    {
         m_xSpaceED->set_value(m_xSpaceED->normalize(m_xTableData->GetSpace() - m_nTableWidth), FieldUnit::TWIP);
+        m_xSpaceSFT->set_label(m_xSpaceED->get_text());
+    }
+    else
+        m_xSpaceSFT->set_label(OUString());
 
     for( sal_uInt16 i = 0; ( i < m_nNoOfVisibleCols ) && ( i < m_nMetFields ); i++)
     {
@@ -1091,12 +1097,13 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& )
         m_xModifyTableCB->set_active(false);
     }
     m_xSpaceFT->set_sensitive(!m_bPercentMode);
-    m_xSpaceED->set_sensitive(!m_bPercentMode);
+    m_xSpaceSFT->set_sensitive(!m_bPercentMode);
     m_xModifyTableCB->set_sensitive( !m_bPercentMode && m_bModifyTable );
     m_xProportionalCB->set_sensitive(!m_bPercentMode && m_bModifyTable );
 
     m_xSpaceED->set_value(m_xSpaceED->normalize(
                 m_xTableData->GetSpace() - m_nTableWidth), FieldUnit::TWIP);
+    m_xSpaceSFT->set_label(m_xSpaceED->get_text());
 
 }
 
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 0643bfdf6c8a..c00f7dafb547 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -103,6 +103,7 @@ class SwTableColumnPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xModifyTableCB;
     std::unique_ptr<weld::CheckButton> m_xProportionalCB;
     std::unique_ptr<weld::Label> m_xSpaceFT;
+    std::unique_ptr<weld::Label> m_xSpaceSFT;
     std::unique_ptr<weld::MetricSpinButton> m_xSpaceED;
     std::unique_ptr<weld::Button> m_xUpBtn;
     std::unique_ptr<weld::Button> m_xDownBtn;
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 00050c4e2a81..f0850b6c4c66 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -110,14 +110,33 @@
           </packing>
         </child>
         <child>
-          <object class="GtkSpinButton" id="space">
-            <property name="visible">True</property>
+          <object class="GtkSpinButton" id="spacefmt">
             <property name="can_focus">True</property>
+            <property name="no_show_all">True</property>
             <property name="activates_default">True</property>
             <property name="adjustment">adjustment1</property>
             <property name="digits">2</property>
           </object>
           <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="space">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="use_underline">True</property>
+            <property name="selectable">True</property>
+            <property name="xalign">0</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="space-atkobject">
+                <property name="AtkObject::accessible-role" translatable="no">static</property>
+              </object>
+            </child>
+          </object>
+          <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
           </packing>