[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/uibase/sidebar/WrapPropertyPanel.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit a6177673663726039f8e0f51633284c48de31e76
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 18 22:34:06 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Dec 18 23:19:49 2019 +0100

    sw lok: disable Edit Contour button in image sidebar
    
    This can be enabled when the underlying dialog is OK under LOK.
    
    Change-Id: Id74d20de55e77842d707e345b2193ca9113594e8
    Reviewed-on: https://gerrit.libreoffice.org/85436
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index c51d4f7844a1..0cf00345c777 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -36,6 +36,7 @@
 #include <hintids.hxx>
 #include <uitool.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <comphelper/lok.hxx>
 
 const char UNO_WRAPOFF[] = ".uno:WrapOff";
 const char UNO_WRAPLEFT[] = ".uno:WrapLeft";
@@ -148,6 +149,13 @@ void WrapPropertyPanel::Initialize()
 
     Link<Button*,void> EditContourLink = LINK(this, WrapPropertyPanel, EditContourHdl);
     mpEditContour->SetClickHdl(EditContourLink);
+
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        // Disable Edit Contour button for LOK purposes.
+        mpEditContour->Hide();
+    }
+
     Link<Button*, void> EnableContourLink = LINK(this,WrapPropertyPanel, EnableContourHdl);
     mpEnableContour->SetClickHdl(EnableContourLink);
     mpSpacingLB->SetSelectHdl(LINK(this, WrapPropertyPanel, SpacingLBHdl));