diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 11:22:13 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-12 14:32:49 +0200 |
| commit | 023e5d5edc5a024fd43a001a15011c5aef7e8adf (patch) | |
| tree | 2e4cc58037cf91691ebb53b6536614ffcbae9f87 /svx | |
| parent | 37a0c28b0b20a8db001bc92f5e1f25792a0ac39f (diff) | |
sd tiled rendering: it's pointless to send selection changes during search all
But they do cause annoying flashing.
Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
(cherry picked from commit b9565ef0a73c235cd1e14fce9031db6e9237c524)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4f5ca08484e9..97eb3a4a69e3 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -90,6 +90,7 @@ #include <vcl/svapp.hxx> #include <memory> #include <libxml/xmlwriter.h> +#include <LibreOfficeKit/LibreOfficeKitEnums.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -128,6 +129,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbTiledRendering = false; mpLibreOfficeKitCallback = nullptr; mpLibreOfficeKitData = nullptr; + mbTiledSearching = false; nProgressAkt=0; nProgressMax=0; nProgressOfs=0; @@ -835,10 +837,32 @@ void SdrModel::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void SdrModel::libreOfficeKitCallback(int nType, const char* pPayload) const { + if (mbTiledSearching) + { + switch (nType) + { + case LOK_CALLBACK_TEXT_SELECTION: + case LOK_CALLBACK_TEXT_SELECTION_START: + case LOK_CALLBACK_TEXT_SELECTION_END: + case LOK_CALLBACK_GRAPHIC_SELECTION: + return; + } + } + if (mpLibreOfficeKitCallback) mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData); } +void SdrModel::setTiledSearching(bool bTiledSearching) +{ + mbTiledSearching = bTiledSearching; +} + +bool SdrModel::isTiledSearching() const +{ + return mbTiledSearching; +} + LibreOfficeKitCallback SdrModel::getLibreOfficeKitCallback() const { return mpLibreOfficeKitCallback; |