sc/source/filter/xml/xmlcelli.cxx | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 35585f85049fd20719c42d7d7433859df59a0967
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Fri Aug 28 00:46:06 2020 +0530
Commit: Pranam Lashkari <lpra...@collabora.com>
CommitDate: Mon Aug 31 23:39:38 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 413f4bc4d54785d3953a03948276c8d9bb1f3397)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101465
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari <lpra...@collabora.com>
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 1551fb9fbb6f..db4ce95cda52 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;
@@ -862,7 +863,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 ) )
{
@@ -896,9 +897,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 );
+ }
+
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
