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

[Henry Castro (via logerrit)]

 sw/source/ui/misc/num.cxx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 8a3770f1d521ebb3a6e323dd3ba80b53ee442d92
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Feb 7 09:21:20 2019 -0400
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Sep 29 20:39:44 2019 +0200

    lok: Bullets and Numbering → disable Graphic selection in Customize
    
    Change-Id: If0f7b953a40ca1d5f469087cb8f362a949c39b37
    Reviewed-on: https://gerrit.libreoffice.org/67499
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/79810
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index eb4c03c4d523..0506198c021e 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -47,6 +47,7 @@
 #include <svl/stritem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/slstitm.hxx>
+#include <comphelper/lok.hxx>
 
 static bool bLastRelative = false;
 
@@ -890,7 +891,16 @@ 
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(weld::Window* pParent,
     AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
     AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
     AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
-    AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        RemoveTabPage("customize");
+    }
+    else
+    {
+        AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+    }
+
     AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits