From a2756bf71a304f2bb1bf49753dfd37a3402bc463 Mon Sep 17 00:00:00 2001 From: Heiko Tietze Date: Fri, 28 Apr 2023 13:18:25 +0200 Subject: [PATCH] Resolves tdf#153499 - Hide newly introduced frame label Frame content is not shown for existing entries Follow-up to 4ec75d22eb916e3809e9e92f77fd25e33f6b21ee Change-Id: Ic2b40b19424245ede326a5ef5b53f684ca8a3f94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151166 Reviewed-by: Seth Chaiklin Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze --- sw/source/ui/index/swuiidxmrk.cxx | 2 ++ sw/source/uibase/inc/swuiidxmrk.hxx | 1 + sw/uiconfig/swriter/ui/indexentry.ui | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7bab5d5728af..22c1bc7409c8 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -168,6 +168,7 @@ SwIndexMarkPane::SwIndexMarkPane(std::shared_ptr xDialog, weld::Bu , m_xNextSameBT(rBuilder.weld_button("last")) , m_xPrevBT(rBuilder.weld_button("previous")) , m_xNextBT(rBuilder.weld_button("next")) + , m_xForSelectedEntry(rBuilder.weld_label("selectedentrytitle")) { m_xSyncED->show(); @@ -345,6 +346,7 @@ void SwIndexMarkPane::InitControls() //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists const FrameTypeFlags nFrameType = m_pSh->GetFrameType(nullptr,true); + m_xForSelectedEntry->show(); m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 2500548c1582..7f5460a8be45 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -87,6 +87,7 @@ class SwIndexMarkPane std::unique_ptr m_xNextSameBT; std::unique_ptr m_xPrevBT; std::unique_ptr m_xNextBT; + std::unique_ptr m_xForSelectedEntry; void Apply(); void InitControls(); diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index ca3f1f5da8fc..5a70ad727db6 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -582,8 +582,8 @@ - True False + True For Selected Entry