From 139bb786bb4fe5cf2554f6016095ff1588f3994f Mon Sep 17 00:00:00 2001
From: Heiko Tietze <tietze.heiko@gmail.com>
Date: Thu, 5 Dec 2024 09:25:22 +0100
Subject: [PATCH] Resolves tdf#164034 - Rename Non-breaking Spaces

The option also affects hyphen and the label should reflect this

Change-Id: I5e092f8c5d67c1c039de709d024c89481b40a82d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177841
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
---
 sw/uiconfig/swriter/ui/optformataidspage.ui | 30 +++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui
index c461544ca92e..f9d0cce2b0b8 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -88,7 +88,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="nonbreak">
-                    <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces</property>
+                    <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces and hyphen</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
@@ -102,7 +102,8 @@
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
+                    <property name="top-attach">7</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -121,7 +122,7 @@
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">4</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
@@ -140,7 +141,7 @@
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">5</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
@@ -160,6 +161,7 @@
                   <packing>
                     <property name="left-attach">1</property>
                     <property name="top-attach">6</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -178,13 +180,14 @@
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">7</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label">¶</property>
                   </object>
                   <packing>
@@ -196,6 +199,7 @@
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label">-</property>
                   </object>
                   <packing>
@@ -207,6 +211,7 @@
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label">·</property>
                   </object>
                   <packing>
@@ -218,22 +223,24 @@
                   <object class="GtkLabel" id="tabs_label">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label">→</property>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">4</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label">↵</property>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">5</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
@@ -242,11 +249,12 @@
                     <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" context="optformataidspage|bookmarks_label|tooltip_text">⌶ indicates a point bookmark,
 [ and ] indicate the start and end of a bookmark on a text range</property>
+                    <property name="halign">start</property>
                     <property name="label">⌶ […]</property>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">7</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
@@ -393,12 +401,6 @@
                     <property name="top-attach">7</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
             <child type="label">