diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-02-08 20:40:57 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-18 00:53:47 +0100 |
| commit | 21ed2e32bd99f49fa2565ccf8db3c44eadc2445f (patch) | |
| tree | 4e068d7ee49d90b9e219c60dc11d46375bd7e7a0 /sc | |
| parent | 489fca3be68e8c13b5c753d0e2edada9de01dd19 (diff) | |
sc lok: Set appropriate ScViewOptions when annotations are off
Change-Id: I65b3fea9a33396419dff70b134729594c0dda4db
(cherry picked from commit c7b84ac9ea14e6c96165e3281c4bea422918c83f)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 1a62a909d10c..42b0cbebfe0a 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -431,6 +431,7 @@ public: void SetHScrollMode ( bool bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } bool IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } void SetOutlineMode ( bool bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } + void SetNotesMode ( bool bNewMode ) { pOptions->SetOption( VOPT_NOTES, bNewMode ); } /// Force page size for PgUp/PgDown to overwrite the computation based on m_aVisArea. void ForcePageUpDownOffset(long nTwips) { m_nLOKPageUpDownOffset = nTwips; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 7ad438167e72..5c24ede5cf69 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1053,6 +1053,10 @@ 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; |