[Libreoffice-commits] core.git: sc/source

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 11 19:20:31 UTC 2019


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

New commits:
commit 702b199db825599222514c8716da575032f1b346
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 21:19:26 2019 +0200

    lok: Don't activate chart on insert.
    
    Change-Id: I6b28438251c8f3eb6805ce4623e85b6fbd7710a4
    Reviewed-on: https://gerrit.libreoffice.org/80657
    Tested-by: Jenkins
    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 beb43c0a4381..8e15f0a73872 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -43,6 +43,7 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <comphelper/lok.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/lok.hxx>
@@ -613,7 +614,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(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW);
+        if (!comphelper::LibreOfficeKit::isActive())
+            rViewShell.ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW);
 
         //open wizard
         //@todo get context from calc if that has one


More information about the Libreoffice-commits mailing list