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

[Michael Meeks (via logerrit)]

 sc/source/ui/drawfunc/fuins2.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4dfba2861424693455818f8ae16537b2d62961eb
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed May 29 18:03:37 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Oct 11 20:19:58 2019 +0200

    lok: Don't activate chart on insert.
    
    Change-Id: I6b28438251c8f3eb6805ce4623e85b6fbd7710a4
    Reviewed-on: https://gerrit.libreoffice.org/80663
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ae42a4ee7693..760b2229c7d8 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -47,6 +47,7 @@
 
 #include <cppuhelper/component_context.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/lok.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/lok.hxx>
@@ -674,7 +675,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawV
         //the controller will be unlocked by the dialog when the dialog is told to do so
 
         // only activate object if not called via API (e.g. macro)
-        rViewShell.ActivateObject( m_pInsertedObject, embed::EmbedVerbs::MS_OLEVERB_SHOW );
+        if (!comphelper::LibreOfficeKit::isActive())
+            rViewShell.ActivateObject( m_pInsertedObject, embed::EmbedVerbs::MS_OLEVERB_SHOW );
 
         //open wizard
         //@todo get context from calc if that has one