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

[Pranav Kant]

 sc/source/ui/unoobj/docuno.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit e95c84b9381ecd6836d94903aeed8769eda63033
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Apr 26 17:57:55 2017 +0530

    sc lok: Do not change comment indicator setting
    
    This setting is saved to doc model when document is saved eventually. We
    should respect the user settings, and not play with it like this -
    changing this setting to false unconditionally.
    
    Originally, setting SetNotesMode to false was meant to prevent any kind
    of in-tile note rendering in case of LOK when it is turned off. But
    turns out this option is only for note indicator i.e the red button. We
    already have a LOK in-tile rendering guard in ScDocFunc::ShowNote that
    prevents popping drawinglayer note even if corresponding UNO command is
    sent by the LOK client.
    
    Change-Id: Id6c7b2cd30cdbefe7dacc2a701638b2488ab245d
    Reviewed-on: https://gerrit.libreoffice.org/36993
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 35fa76e8e669..da430dc4fc2f 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1064,10 +1064,6 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans
     // format
     SvtSaveOptions().SetWarnAlienFormat(false);
 
-    // If annotations are turned off in tiled rendering case
-    if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isTiledAnnotations())
-        ScDocShell::GetViewData()->SetNotesMode(false);
-
     // default tile size in pixels
     mnTilePixelWidth = 256;
     mnTilePixelHeight = 256;