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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuihyperdlg.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 52a615a5b6c0b783b1222d6e605ca6c2533e2c18
Author:     George Wood <gwoodcode at gmail.com>
AuthorDate: Wed Jul 25 15:47:54 2018 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jul 26 08:07:52 2018 +0200

    It doesn't make sense to have document links in the online version.
    
    Change-Id: I893845570e4bd2961797fa1c2dd3e5316c9d262d
    Reviewed-on: https://gerrit.libreoffice.org/57986
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index cc301e5b47c2..7a1ceb74a5b5 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <comphelper/lok.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
@@ -107,12 +108,15 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
     aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
     pEntry = AddTabPage ( HyperLinkPageType::MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
     pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
-    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
-    pEntry = AddTabPage ( HyperLinkPageType::DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
-    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
-    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
-    pEntry = AddTabPage ( HyperLinkPageType::NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
-    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
+        pEntry = AddTabPage ( HyperLinkPageType::DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
+        pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+        aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+        pEntry = AddTabPage ( HyperLinkPageType::NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
+        pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+    }
 
     // set OK/Cancel - button
     GetCancelButton().SetText ( CuiResId(RID_SVXSTR_HYPDLG_CLOSEBUT) );