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

[Michael Stahl (via logerrit)]

 sw/source/ui/config/optpage.cxx             |    4 ++++
 sw/source/uibase/inc/optpage.hxx            |    2 ++
 sw/uiconfig/swriter/ui/optformataidspage.ui |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8daffb60dd2863878bb04317ca2849d76df01f4b
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Feb 12 14:22:18 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Feb 13 10:25:21 2020 +0100

    tdf#45589 sw: fix Formatting Aids options page for Writer/Web
    
    The pre-existing problem of the lone "tab" label was compounded by the
    new bookmark label.
    
    There is no Insert->Bookmark in Writer/Web so i guess the Bookmark
    checkbox shouldn't be shown.
    
    Change-Id: I5a2348599562bb20d7a8de916d0268a133771a0c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88535
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 637c583db442..91692bb99b01 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1189,9 +1189,11 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
     , m_xSpacesCB(m_xBuilder->weld_check_button("spaces"))
     , m_xHSpacesCB(m_xBuilder->weld_check_button("nonbreak"))
     , m_xTabCB(m_xBuilder->weld_check_button("tabs"))
+    , m_xTabLabel(m_xBuilder->weld_label("tabs_label"))
     , m_xBreakCB(m_xBuilder->weld_check_button("break"))
     , m_xCharHiddenCB(m_xBuilder->weld_check_button("hiddentext"))
     , m_xBookmarkCB(m_xBuilder->weld_check_button("bookmarks"))
+    , m_xBookmarkLabel(m_xBuilder->weld_label("bookmarks_label"))
     , m_xDirectCursorFrame(m_xBuilder->weld_frame("directcrsrframe"))
     , m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff"))
     , m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
@@ -1217,8 +1219,10 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
         return;
 
     m_xTabCB->hide();
+    m_xTabLabel->hide();
     m_xCharHiddenCB->hide();
     m_xBookmarkCB->hide();
+    m_xBookmarkLabel->hide();
 
     m_xDirectCursorFrame->hide();
     m_xOnOffCB->hide();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 8ba45508a06c..afb2a78d4236 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -225,9 +225,11 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xSpacesCB;
     std::unique_ptr<weld::CheckButton> m_xHSpacesCB;
     std::unique_ptr<weld::CheckButton> m_xTabCB;
+    std::unique_ptr<weld::Label> m_xTabLabel;
     std::unique_ptr<weld::CheckButton> m_xBreakCB;
     std::unique_ptr<weld::CheckButton> m_xCharHiddenCB;
     std::unique_ptr<weld::CheckButton> m_xBookmarkCB;
+    std::unique_ptr<weld::Label> m_xBookmarkLabel;
 
     std::unique_ptr<weld::Frame> m_xDirectCursorFrame;
     std::unique_ptr<weld::CheckButton> m_xOnOffCB;
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui
index bba4dae11076..13434e4fee43 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -185,7 +185,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="tabs_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label">→</property>
@@ -207,7 +207,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="bookmarks_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label">| [ ]</property>