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

[Libreoffice Gerrit user]

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

New commits:
commit 72909fbfdc4111f3c8cfc2f2e70dc6a1fdf97f97
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Feb 7 09:21:20 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Feb 8 22:16:07 2019 +0100

    lok: Bullets and Numbering → disable Graphic selection in Customize
    
    Change-Id: If0f7b953a40ca1d5f469087cb8f362a949c39b37
    Reviewed-on: https://gerrit.libreoffice.org/67499
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 979eff2f3433..e5bde2e15be8 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -49,6 +49,7 @@
 #include <svl/stritem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/slstitm.hxx>
+#include <comphelper/lok.hxx>
 
 static bool bLastRelative = false;
 
@@ -957,7 +958,16 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent,
     m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
     AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
     AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
-    m_nOptionsPageId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        RemoveTabPage("customize");
+    }
+    else
+    {
+        m_nOptionsPageId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+    }
+
     m_nPositionPageId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
 }