diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-04-26 17:57:55 +0530 |
---|---|---|
committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-04-28 20:12:30 +0530 |
commit | 1e451bb6d12677beece573512f5af700c282b25e (patch) | |
tree | c4517f4d5fc70590eac29f60bb10acee1a79e9f7 /sc | |
parent | d6fd4252bf248d2872c713a1d83817a2dc88a9d2 (diff) |
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
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index c35c98f2fee6..d44110def97e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1050,10 +1050,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; |