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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit c16a6581a2f29feda36948e7d2bd0d0a28015806
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Mon Feb 25 14:36:05 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Feb 26 09:19:25 2019 +0100

    lok: sc: clicking on individual chart elements doesn't select object
    
    Exporting to svg a selected object of a chart does not work.
    In the chart case the selected object for the current document is
    always the chart itself, not an internal chart object.
    Moreover the exporting action cause the exported object to be selected
    again. So you try to selected the chart legend and you end up with the
    whole chart selected again.
    
    Change-Id: Ib4aa91afd592909ad354ca373dc03298547f9fb5
    Reviewed-on: https://gerrit.libreoffice.org/68348
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a1f4dea54c41..8c79f36484a2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -92,6 +92,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/lokcharthelper.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/DocumentSigner.hxx>
 #include <svx/dialmgr.hxx>
@@ -2719,6 +2720,11 @@ static size_t doc_renderShapeSelection(LibreOfficeKitDocument* pThis, char** pOu
     if (gImpl)
         gImpl->maLastExceptionMsg.clear();
 
+    LokChartHelper aChartHelper(SfxViewShell::Current());
+
+    if (aChartHelper.GetWindow())
+        return 0;
+
     try
     {
         LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);