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

[Libreoffice Gerrit user]

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

New commits:
commit 836eb0ee9aaff94f9022f3dff4d6ac0ca4352155
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Mon Feb 25 14:42:51 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Feb 27 15:07:40 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/68347
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0b405be858e0..f7380fcad4d8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -94,6 +94,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/lokcharthelper.hxx>
 #include <sfx2/DocumentSigner.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -2752,6 +2753,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);