sw/source/ui/index/cnttab.cxx | 2 -- sw/source/uibase/inc/swuicnttab.hxx | 1 - sw/uiconfig/swriter/ui/tocindexpage.ui | 20 +++----------------- 3 files changed, 3 insertions(+), 20 deletions(-)
New commits: commit abb42c396d84df49b511b8f3c73783dc56982c14 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 20 15:06:48 2023 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Feb 20 21:15:07 2023 +0000 Related tdf#153090 Move dropdown next to checkbox Avoid extra row just for the dropdown Change-Id: Ic75fec82875576a644ab09e1d6a4af8bed48dba5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147332 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index c7ad5f036a2d..1b21652bcb0b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -782,7 +782,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogContr , m_xDisplayTypeFT(m_xBuilder->weld_label("displayft")) , m_xDisplayTypeLB(m_xBuilder->weld_combo_box("display")) , m_xParaStyleCB(m_xBuilder->weld_check_button("useparastyle")) - , m_xParaStyleFT(m_xBuilder->weld_label("parastyleft")) , m_xParaStyleLB(m_xBuilder->weld_combo_box("parastyle")) , m_xTOXMarksCB(m_xBuilder->weld_check_button("indexmarks")) , m_xIdxOptionsFrame(m_xBuilder->weld_widget("optionsframe")) @@ -1325,7 +1324,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, weld::ComboBox&, rBox, void) m_xDisplayTypeFT->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); m_xDisplayTypeLB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); m_xParaStyleCB->set_visible(0 != (nType & (TO_ILLUSTRATION|TO_TABLE|TO_OBJECT))); - m_xParaStyleFT->set_visible(0 != (nType & (TO_ILLUSTRATION|TO_TABLE|TO_OBJECT))); m_xParaStyleLB->set_visible(0 != (nType & (TO_ILLUSTRATION|TO_TABLE|TO_OBJECT))); m_xAuthorityFrame->set_visible( 0 != (nType & TO_AUTHORITIES) ); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 455800e71307..644810b8c96d 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -162,7 +162,6 @@ class SwTOXSelectTabPage final : public SfxTabPage std::unique_ptr<weld::Label> m_xDisplayTypeFT; std::unique_ptr<weld::ComboBox> m_xDisplayTypeLB; std::unique_ptr<weld::CheckButton> m_xParaStyleCB; - std::unique_ptr<weld::Label> m_xParaStyleFT; std::unique_ptr<weld::ComboBox> m_xParaStyleLB; //all but illustration and table diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index bc06f72f22bb..5568deb0d6c6 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -1237,7 +1237,7 @@ </packing> </child> <child> - <!-- n-columns=2 n-rows=2 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid14"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -1263,27 +1263,13 @@ <packing> <property name="left-attach">0</property> <property name="top-attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="parastyleft"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|parastyleft">Paragraph style:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">display</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="parastyle"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="parastyle-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|parastyle">Select the paragraph style for which you want to create index entries.</property> @@ -1292,7 +1278,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object>
