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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jul 30 17:00:23 UTC 2018


 cui/source/dialogs/hltpbase.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit e130c53ceda7947b01b7d3b23ccea1a6260f6754
Author:     George Wood <gwoodcode at gmail.com>
AuthorDate: Mon Jul 30 14:54:47 2018 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Jul 30 17:51:15 2018 +0100

    Hide macro selector button in kit mode.
    
    Change-Id: If068d23a5aeb9be6d8e1736543c002bf2e68dacb
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2d41c1b664f5..c89cb91dd375 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <sal/config.h>
 
+#include <comphelper/lok.hxx>
 #include <osl/file.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/frame.hxx>
@@ -271,10 +272,17 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH
     mpEdText->SetText ( pHyperlinkItem->GetIntName() );
 
     // Script-button
-    if ( pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE )
-        mpBtScript->Disable();
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        if ( pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE )
+            mpBtScript->Disable();
+        else
+            mpBtScript->Enable();
+    }
     else
-        mpBtScript->Enable();
+    {
+        mpBtScript->Hide();
+    }
 }
 
 // Any action to do after apply-button is pressed


More information about the Libreoffice-commits mailing list