[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-0' - sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/config/optpage.cxx  |    2 ++
 sw/source/uibase/inc/optpage.hxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 24081bf72b20c08563df40e33fd5e549c9d91074
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Jan 18 12:13:26 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Wed Jan 20 12:40:14 2021 +0100

    Resolves tdf#139521 - Hide image anchor option in Writer Web mode
    
    Change-Id: Ic5298069fcabbd2c72eb43fdf270b69c53570298
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109524
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5820f260886e..26ae3fb628bd 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1214,6 +1214,7 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
     , m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff"))
     , m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
     , m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
+    , m_xImageFrame(m_xBuilder->weld_frame("frmImage"))
     , m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
     , m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
     , m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
@@ -1246,6 +1247,7 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
     m_xDirectCursorFillMode->hide();
     m_xCursorProtFrame->hide();
     m_xCursorInProtCB->hide();
+    m_xImageFrame->hide();
 }
 
 SwShdwCursorOptionsTabPage::~SwShdwCursorOptionsTabPage()
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 93a84bbb2758..31be1cc611e9 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -238,6 +238,7 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
 
     std::unique_ptr<weld::ComboBox> m_xDirectCursorFillMode;
     std::unique_ptr<weld::Frame> m_xCursorProtFrame;
+    std::unique_ptr<weld::Frame> m_xImageFrame;
     std::unique_ptr<weld::CheckButton> m_xCursorInProtCB;
 
     std::unique_ptr<weld::ComboBox> m_xDefaultAnchorType;