diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 11:22:13 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 15:06:42 +0100 |
commit | 70c946d1682d019e12cd447fdf4d6a523b899ba4 (patch) | |
tree | 2dbe0dcf13518b311e35c7fb355f1f5a952e94db /svx | |
parent | 83c540d275e351b1979f7b59be8aad728bca6dc0 (diff) |
sd tiled rendering: it's pointless to send selection changes during search all
But they do cause annoying flashing.
(cherry picked from commit b9565ef0a73c235cd1e14fce9031db6e9237c524)
Conflicts:
include/svx/svdmodel.hxx
svx/source/svdraw/svdmodel.cxx
Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
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 47c3c21d7aa2..b26f1561c7d1 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -88,6 +88,7 @@ #include <vcl/svapp.hxx> #include <boost/scoped_array.hpp> #include <libxml/xmlwriter.h> +#include <LibreOfficeKit/LibreOfficeKitEnums.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -127,6 +128,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbTiledRendering = false; mpLibreOfficeKitCallback = 0; mpLibreOfficeKitData = 0; + mbTiledSearching = false; nProgressAkt=0; nProgressMax=0; nProgressOfs=0; @@ -816,10 +818,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; |