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

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 27 07:34:59 UTC 2020


 sw/source/ui/frmdlg/frmdlg.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 51d192a3bfa24dc979f7ad6178803d3262290b46
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Sun Apr 26 23:25:47 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Apr 27 09:34:24 2020 +0200

    remove macro tab for image dialog in online
    
    Change-Id: I02de19e8048fd045a6ef6bdcc655c9911f0f9f01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92958
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 2deb04142e7e..ca59c421b394 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -42,6 +42,7 @@
 #include <svx/drawitem.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
+#include <comphelper/lok.hxx>
 
 // the dialog's carrier
 SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
@@ -112,6 +113,9 @@ SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
         }
     }
 
+    if(comphelper::LibreOfficeKit::isActive())
+        RemoveTabPage("macro");
+
     if (m_bNew)
         SetCurPageId("type");
 


More information about the Libreoffice-commits mailing list