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

[Pranam Lashkari (via logerrit)]

 sc/source/filter/xml/xmlcelli.cxx |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 413f4bc4d54785d3953a03948276c8d9bb1f3397
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Aug 28 00:46:06 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Aug 28 10:49:29 2020 +0200

    LOK: do not show calc notes in the online
    
    Change-Id: I3d69aab2a76948182483025536dbc4ddc928a86e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101500
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 359f48b1e24f..21368afdda52 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -95,6 +95,7 @@
 #include <i18nlangtag/lang.h>
 
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/lok.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
@@ -868,7 +869,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos)
 
         /*  Try to reuse the drawing object already created (but only if the
             note is visible, and the object is a caption object). */
-        if( mxAnnotationData->mbShown && mxAnnotationData->mbUseShapePos )
+        if( mxAnnotationData->mbShown && mxAnnotationData->mbUseShapePos && !comphelper::LibreOfficeKit::isActive())
         {
             if( SdrCaptionObj* pCaption = dynamic_cast< SdrCaptionObj* >( pObject ) )
             {
@@ -902,9 +903,19 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos)
             if (xOutlinerObj)
             {
                 // create cell note with all data from drawing object
-                pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
+                if(!comphelper::LibreOfficeKit::isActive())
+                {
+                    pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
                     std::move(xItemSet), xOutlinerObj.release(),
                     aCaptionRect, mxAnnotationData->mbShown );
+                }
+                else
+                {
+                    pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
+                    std::move(xItemSet), xOutlinerObj.release(),
+                    aCaptionRect, false );
+                }
+
             }
         }
     }