diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-04 10:56:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-04 15:16:07 +0200 |
| commit | dfc9a744a536fb822ad067683c957143bc81c5b4 (patch) | |
| tree | b084f92e9d25b6a299bc04593e1aaf07334b813b /sfx2 | |
| parent | b41b72139ee5a92260b5d8732a437106d31b1688 (diff) | |
comphelper: move setTiledPainting() from SfxViewShell
And make it a static one. The primary point of that member function is
to prevent invalidations during paint, and since multiple views are
allowed, it wasn't extended to filter out invalidations from all views,
not just from the current one. (Same goes for other callback types.)
(cherry picked from commit 59e38e946f19ab59370f8e52370b7a7b861cc558)
Conflicts:
include/sfx2/viewsh.hxx
sfx2/source/view/viewsh.cxx
Change-Id: I23e6b2c2ff94227f2b72c481148b2d8279ae2905
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index ad04649669b1..e308a1b16c6f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -316,7 +316,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags) , m_pLibreOfficeKitViewCallback(nullptr) , m_pLibreOfficeKitViewData(nullptr) , m_bTiledSearching(false) -, m_bTiledPainting(false) , m_nViewShellId(SfxViewShell_Impl::m_nLastViewShellId++) {} @@ -1620,7 +1619,7 @@ void SfxViewShell::registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCa void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload) const { - if (pImp->m_bTiledPainting) + if (comphelper::LibreOfficeKit::isTiledPainting()) return; if (pImp->m_bTiledSearching) @@ -1655,21 +1654,6 @@ bool SfxViewShell::isTiledSearching() const return pImp->m_bTiledSearching; } -void SfxViewShell::setTiledPainting(bool bTiledPainting) -{ - pImp->m_bTiledPainting = bTiledPainting; -} - -bool SfxViewShell::isTiledPainting() const -{ - return pImp->m_bTiledPainting; -} - -bool SfxViewShell::getTiledPainting() const -{ - return pImp->m_bTiledPainting; -} - int SfxViewShell::getPart() const { return 0; |