Notebookbar: Separated paragraph spacing controls

One big paragraph spacing control was splitted
to separated widgets. It will be possible to
reuse that in the sidebar. Also layout is better
because explicit size setting is no longer needed.

Change-Id: Ieb200af4a9a6120ae03b22b27da56256aa816193
Reviewed-on: https://gerrit.libreoffice.org/35801
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

6 files changed, 317 insertions, 117 deletions

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 5cd64b4fb6e6..3356f768c946 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5195,6 +5195,66 @@ SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE
 ]
 
 
+SfxVoidItem LeftParaMargin SID_ATTR_PARA_LEFTSPACE
+
+[
+    AutoUpdate = FALSE,
+    FastCall = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+    SlotType = SvxLRSpaceItem
+
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+
+SfxVoidItem FirstLineParaMargin SID_ATTR_PARA_FIRSTLINESPACE
+
+[
+    AutoUpdate = FALSE,
+    FastCall = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+    SlotType = SvxLRSpaceItem
+
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+
+SfxVoidItem RightParaMargin SID_ATTR_PARA_RIGHTSPACE
+
+[
+    AutoUpdate = FALSE,
+    FastCall = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+    SlotType = SvxLRSpaceItem
+
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+
 SfxVoidItem LeftRightParaMargin_Vertical SID_ATTR_PARA_LRSPACE_VERTICAL
 (SvxLRSpaceItem LRSpace SID_ATTR_PARA_LRSPACE_VERTICAL)
 [
@@ -5506,6 +5566,44 @@ SvxULSpaceItem ULSpacing SID_ATTR_PARA_ULSPACE
 ]
 
 
+SvxULSpaceItem AboveSpacing SID_ATTR_PARA_ABOVESPACE
+
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+
+SvxULSpaceItem BelowSpacing SID_ATTR_PARA_BELOWSPACE
+
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+
 SvxLineItem LineStyle SID_FRAME_LINESTYLE
 
 [
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index b966cd9fbc13..eea13fb4d039 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -30,8 +30,12 @@
 
 using namespace svx;
 
-SFX_IMPL_TOOLBOX_CONTROL(ParaULSpacingControl, SvxULSpaceItem);
-SFX_IMPL_TOOLBOX_CONTROL(ParaLRSpacingControl, SvxLRSpaceItem);
+SFX_IMPL_TOOLBOX_CONTROL(ParaAboveSpacingControl, SvxULSpaceItem);
+SFX_IMPL_TOOLBOX_CONTROL(ParaBelowSpacingControl, SvxULSpaceItem);
+
+SFX_IMPL_TOOLBOX_CONTROL(ParaLeftSpacingControl, SvxLRSpaceItem);
+SFX_IMPL_TOOLBOX_CONTROL(ParaRightSpacingControl, SvxLRSpaceItem);
+SFX_IMPL_TOOLBOX_CONTROL(ParaFirstLineSpacingControl, SvxLRSpaceItem);
 
 ParaULSpacingControl::ParaULSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
     : SfxToolBoxControl(nSlotId, nId, rTbx)
@@ -64,13 +68,38 @@ void ParaULSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
         const SfxUInt16Item* pMetricItem = static_cast<const SfxUInt16Item*>(pState);
         pWindow->SetUnit((FieldUnit)pMetricItem->GetValue());
     }
-    else if(nSID == SID_ATTR_PARA_ULSPACE && pState && eState >= SfxItemState::DEFAULT)
+    else if((nSID == SID_ATTR_PARA_ULSPACE
+        || nSID == SID_ATTR_PARA_ABOVESPACE
+        || nSID == SID_ATTR_PARA_BELOWSPACE )
+        && pState && eState >= SfxItemState::DEFAULT)
         pWindow->SetValue(static_cast<const SvxULSpaceItem*>(pState));
 }
 
-VclPtr<vcl::Window> ParaULSpacingControl::CreateItemWindow(vcl::Window* pParent)
+// ParaAboveSpacingControl
+
+ParaAboveSpacingControl::ParaAboveSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+    : ParaULSpacingControl(nSlotId, nId, rTbx)
+{
+}
+
+VclPtr<vcl::Window> ParaAboveSpacingControl::CreateItemWindow(vcl::Window* pParent)
+{
+    VclPtr<ParaAboveSpacingWindow> pWindow = VclPtr<ParaAboveSpacingWindow>::Create(pParent, m_xFrame);
+    pWindow->Show();
+
+    return pWindow;
+}
+
+// ParaBelowSpacingControl
+
+ParaBelowSpacingControl::ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+    : ParaULSpacingControl(nSlotId, nId, rTbx)
+{
+}
+
+VclPtr<vcl::Window> ParaBelowSpacingControl::CreateItemWindow(vcl::Window* pParent)
 {
-    VclPtr<ParaULSpacingWindow> pWindow = VclPtr<ParaULSpacingWindow>::Create(pParent, m_xFrame);
+    VclPtr<ParaBelowSpacingWindow> pWindow = VclPtr<ParaBelowSpacingWindow>::Create(pParent, m_xFrame);
     pWindow->Show();
 
     return pWindow;
@@ -113,13 +142,12 @@ void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
     else
         pWindow->Enable();
 
-    if(!m_xMultiplexer.is())
+    if(!m_xMultiplexer.is() && m_xFrame.is())
     {
         m_xMultiplexer = css::ui::ContextChangeEventMultiplexer::get(
                                     ::comphelper::getProcessComponentContext());
 
-        if(m_xFrame.is())
-            m_xMultiplexer->addContextChangeEventListener(this, m_xFrame->getController());
+        m_xMultiplexer->addContextChangeEventListener(this, m_xFrame->getController());
     }
 
     if(nSID == SID_ATTR_METRIC && pState && eState >= SfxItemState::DEFAULT)
@@ -127,7 +155,11 @@ void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
         const SfxUInt16Item* pMetricItem = static_cast<const SfxUInt16Item*>(pState);
         pWindow->SetUnit((FieldUnit)pMetricItem->GetValue());
     }
-    else if(nSID == SID_ATTR_PARA_LRSPACE)
+    else if(nSID == SID_ATTR_PARA_LRSPACE
+         || nSID == SID_ATTR_PARA_LEFTSPACE
+         || nSID == SID_ATTR_PARA_RIGHTSPACE
+         || nSID == SID_ATTR_PARA_FIRSTLINESPACE
+    )
     {
         pWindow->SetValue(eState, pState);
     }
@@ -172,9 +204,46 @@ void SAL_CALL ParaLRSpacingControl::release() throw ()
     SfxToolBoxControl::release();
 }
 
-VclPtr<vcl::Window> ParaLRSpacingControl::CreateItemWindow(vcl::Window* pParent)
+// ParaLeftSpacingControl
+
+ParaLeftSpacingControl::ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+: ParaLRSpacingControl(nSlotId, nId, rTbx)
+{
+}
+
+VclPtr<vcl::Window> ParaLeftSpacingControl::CreateItemWindow(vcl::Window* pParent)
+{
+    VclPtr<ParaLeftSpacingWindow> pWindow = VclPtr<ParaLeftSpacingWindow>::Create(pParent, m_xFrame);
+    pWindow->Show();
+
+    return pWindow;
+}
+
+// ParaRightSpacingControl
+
+ParaRightSpacingControl::ParaRightSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+: ParaLRSpacingControl(nSlotId, nId, rTbx)
+{
+}
+
+VclPtr<vcl::Window> ParaRightSpacingControl::CreateItemWindow(vcl::Window* pParent)
+{
+    VclPtr<ParaRightSpacingWindow> pWindow = VclPtr<ParaRightSpacingWindow>::Create(pParent, m_xFrame);
+    pWindow->Show();
+
+    return pWindow;
+}
+
+// ParaFirstLineSpacingControl
+
+ParaFirstLineSpacingControl::ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+: ParaLRSpacingControl(nSlotId, nId, rTbx)
+{
+}
+
+VclPtr<vcl::Window> ParaFirstLineSpacingControl::CreateItemWindow(vcl::Window* pParent)
 {
-    VclPtr<ParaLRSpacingWindow> pWindow = VclPtr<ParaLRSpacingWindow>::Create(pParent, m_xFrame);
+    VclPtr<ParaFirstLineSpacingWindow> pWindow = VclPtr<ParaFirstLineSpacingWindow>::Create(pParent, m_xFrame);
     pWindow->Show();
 
     return pWindow;
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 8225df98ebf2..542fcfe034dd 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -45,6 +45,8 @@ ParaULSpacingWindow::ParaULSpacingWindow(vcl::Window* pParent, css::uno::Referen
 
     get(m_pAboveSpacing, "aboveparaspacing");
     get(m_pBelowSpacing, "belowparaspacing");
+    get(m_pAboveContainer, "above");
+    get(m_pBelowContainer, "below");
 
     Link<Edit&,void> aLink = LINK(this, ParaULSpacingWindow, ModifySpacingHdl);
     m_pAboveSpacing->SetModifyHdl(aLink);
@@ -60,6 +62,8 @@ void ParaULSpacingWindow::dispose()
 {
     m_pAboveSpacing.clear();
     m_pBelowSpacing.clear();
+    m_pAboveContainer.clear();
+    m_pBelowContainer.clear();
 
     disposeBuilder();
     VclVBox::dispose();
@@ -101,6 +105,24 @@ IMPL_LINK_NOARG(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void)
     }
 }
 
+// ParaAboveSpacingWindow
+
+ParaAboveSpacingWindow::ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
+    : ParaULSpacingWindow(pParent, xFrame)
+{
+    m_pAboveContainer->Show();
+    m_pBelowContainer->Hide();
+}
+
+// ParaBelowSpacingWindow
+
+ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
+    : ParaULSpacingWindow(pParent, xFrame)
+{
+    m_pAboveContainer->Hide();
+    m_pBelowContainer->Show();
+}
+
 // ParaLRSpacingWindow
 
 ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
@@ -115,6 +137,9 @@ ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Referen
     get(m_pBeforeSpacing, "beforetextindent");
     get(m_pAfterSpacing, "aftertextindent");
     get(m_pFLSpacing, "firstlineindent");
+    get(m_pBeforeContainer, "before");
+    get(m_pAfterContainer, "after");
+    get(m_pFirstLineContainer, "firstline");
 
     Link<Edit&,void> aLink = LINK(this, ParaLRSpacingWindow, ModifySpacingHdl);
     m_pBeforeSpacing->SetModifyHdl(aLink);
@@ -132,6 +157,9 @@ void ParaLRSpacingWindow::dispose()
     m_pBeforeSpacing.clear();
     m_pAfterSpacing.clear();
     m_pFLSpacing.clear();
+    m_pBeforeContainer.clear();
+    m_pAfterContainer.clear();
+    m_pFirstLineContainer.clear();
 
     disposeBuilder();
     VclVBox::dispose();
@@ -264,4 +292,34 @@ IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, Edit&, void)
     }
 }
 
+// ParaLeftSpacingWindow
+
+ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
+    : ParaLRSpacingWindow(pParent, xFrame)
+{
+    m_pBeforeContainer->Show();
+    m_pAfterContainer->Hide();
+    m_pFirstLineContainer->Hide();
+}
+
+// ParaRightSpacingWindow
+
+ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
+    : ParaLRSpacingWindow(pParent, xFrame)
+{
+    m_pBeforeContainer->Hide();
+    m_pAfterContainer->Show();
+    m_pFirstLineContainer->Hide();
+}
+
+// ParaFirstLineSpacingWindow
+
+ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame)
+    : ParaLRSpacingWindow(pParent, xFrame)
+{
+    m_pBeforeContainer->Hide();
+    m_pAfterContainer->Hide();
+    m_pFirstLineContainer->Show();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index b0fbcea4d4ec..ecce558671f6 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -38,27 +38,40 @@ class ParaULSpacingWindow : public VclVBox,
 
 {
 public:
-    explicit ParaULSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
     virtual ~ParaULSpacingWindow() override;
     virtual void dispose() override;
 
     void SetValue(const SvxULSpaceItem* pItem);
     void SetUnit(FieldUnit eUnit);
 
-private:
+protected:
+    ParaULSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
     VclPtr<SvxRelativeField> m_pAboveSpacing;
     VclPtr<SvxRelativeField> m_pBelowSpacing;
+    VclPtr<VclHBox> m_pAboveContainer;
+    VclPtr<VclHBox> m_pBelowContainer;
 
     MapUnit m_eUnit;
 
     DECL_LINK(ModifySpacingHdl, Edit&, void);
 };
 
+class ParaAboveSpacingWindow : public ParaULSpacingWindow
+{
+public:
+    explicit ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+};
+
+class ParaBelowSpacingWindow : public ParaULSpacingWindow
+{
+public:
+    explicit ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+};
+
 class ParaLRSpacingWindow : public VclVBox,
                             public VclBuilderContainer
 {
 public:
-    explicit ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
     virtual ~ParaLRSpacingWindow() override;
     virtual void dispose() override;
 
@@ -66,10 +79,15 @@ public:
     void SetUnit(FieldUnit eUnit);
     void SetContext(const vcl::EnumContext& eContext);
 
-private:
+protected:
+    ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+
     VclPtr<SvxRelativeField> m_pBeforeSpacing;
     VclPtr<SvxRelativeField> m_pAfterSpacing;
     VclPtr<SvxRelativeField> m_pFLSpacing;
+    VclPtr<VclHBox> m_pBeforeContainer;
+    VclPtr<VclHBox> m_pAfterContainer;
+    VclPtr<VclHBox> m_pFirstLineContainer;
 
     MapUnit m_eUnit;
 
@@ -78,6 +96,24 @@ private:
     DECL_LINK(ModifySpacingHdl, Edit&, void);
 };
 
+class ParaLeftSpacingWindow : public ParaLRSpacingWindow
+{
+public:
+    explicit ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+};
+
+class ParaRightSpacingWindow : public ParaLRSpacingWindow
+{
+public:
+    explicit ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+};
+
+class ParaFirstLineSpacingWindow : public ParaLRSpacingWindow
+{
+public:
+    explicit ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame);
+};
+
 }
 
 #endif
diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index a8da5617d745..0e0cd5b45929 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -11,10 +11,8 @@
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="row_spacing">1</property>
-        <property name="column_spacing">6</property>
         <child>
-          <object class="GtkBox" id="box67">
+          <object class="GtkBox" id="before">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -24,7 +22,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/Indent4.png</property>
+                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -33,15 +31,18 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label11">
+              <object class="svxlo-SvxRelativeField" id="beforetextindent">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Before</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">Before Text Indent</property>
+                <property name="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="progress_fraction">0.10000000000000001</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -51,21 +52,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxRelativeField" id="beforetextindent">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Before Text Indent</property>
-            <property name="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="progress_fraction">0.10000000000000001</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box66">
+          <object class="GtkBox" id="after">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -75,7 +62,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/Indent3.png</property>
+                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -84,15 +71,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label12">
+              <object class="svxlo-SvxRelativeField" id="aftertextindent">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">After</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">After Text Indent</property>
+                <property name="invisible_char">•</property>
+                <property name="text">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -102,20 +91,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxRelativeField" id="aftertextindent">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">After Text Indent</property>
-            <property name="invisible_char">•</property>
-            <property name="text">0</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box30">
+          <object class="GtkBox" id="firstline">
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
@@ -133,18 +109,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">First line</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
               <object class="svxlo-SvxRelativeField" id="firstlineindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -160,13 +124,10 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/paraulspacing.ui b/svx/uiconfig/ui/paraulspacing.ui
index c81bb6a8b377..db62128f1a4f 100644
--- a/svx/uiconfig/ui/paraulspacing.ui
+++ b/svx/uiconfig/ui/paraulspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -19,7 +19,7 @@
         <property name="row_spacing">1</property>
         <property name="column_spacing">6</property>
         <child>
-          <object class="GtkBox" id="box27">
+          <object class="GtkBox" id="above">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -29,7 +29,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/spacing1.png</property>
+                <property name="pixbuf">svx/res/symphony/spacing2.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,15 +38,19 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Above</property>
+                <property name="can_focus">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
+                <property name="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="adjustment">adjustment1</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -56,7 +60,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box28">
+          <object class="GtkBox" id="below">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -75,15 +79,19 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label10">
+              <object class="svxlo-SvxRelativeField" id="belowparaspacing">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Below</property>
+                <property name="can_focus">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
+                <property name="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="adjustment">adjustment1</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -92,36 +100,6 @@
             <property name="top_attach">1</property>
           </packing>
         </child>
-        <child>
-          <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
-            <property name="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="adjustment">adjustment1</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="svxlo-SvxRelativeField" id="belowparaspacing">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
-            <property name="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="adjustment">adjustment1</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>