diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-02-12 14:22:18 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-06-22 15:24:39 +0200 |
| commit | 611f666fb6b4f7efbe5abc3fc835e3ff566fb8a5 (patch) | |
| tree | 9e4feb2da166cda2efd9fa515688d428225aeebe | |
| parent | tdf#45589 offapi,officecfg,sw: add option to toggle bookmark display (diff) | |
| download | core-611f666fb6b4f7efbe5abc3fc835e3ff566fb8a5.tar.gz core-611f666fb6b4f7efbe5abc3fc835e3ff566fb8a5.zip | |
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@cib.de>
(cherry picked from commit 8daffb60dd2863878bb04317ca2849d76df01f4b)
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/optpage.hxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/optformataidspage.ui | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index fe41aa6dae33..88b6740e8a9a 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1204,9 +1204,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_xFillMarginRB(m_xBuilder->weld_radio_button("fillmargin")) @@ -1241,8 +1243,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 955e44c249a5..8de1394b633e 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -226,9 +226,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 fb2fa378c4e2..05083b8dcb08 100644 --- a/sw/uiconfig/swriter/ui/optformataidspage.ui +++ b/sw/uiconfig/swriter/ui/optformataidspage.ui @@ -193,7 +193,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> @@ -215,7 +215,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> |