summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-05-26 16:58:36 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-05-26 17:18:23 +0200
commit67a37be9969d8b5a0bc8ae081bc1aba697ea6ba5 (patch)
tree92e5c20ff3a56f48fa104bfa210fc99cc5ac8b2e
parenta10adead1ae4a923592073cf5bef1de05518fdd9 (diff)
sd: fix LOK search result highlight when result is not on the current slide
By adding a new callback event, so clients can switch to the correct slide. Change-Id: I6c2388eb11ef97811cc644fe3a9d3866aa82fd75
-rw-r--r--include/LibreOfficeKit/LibreOfficeKitEnums.h9
-rw-r--r--sd/source/ui/view/drviews1.cxx6
2 files changed, 14 insertions, 1 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index ba4db824e00c..bbcd5b90c239 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -148,7 +148,14 @@ typedef enum
* Clients should assume that data returned by an earlier
* lok::Document::getDocumentSize() call is no longer valid.
*/
- LOK_CALLBACK_PAGE_COUNT_CHANGED
+ LOK_CALLBACK_PAGE_COUNT_CHANGED,
+
+ /**
+ * The current part number is changed.
+ *
+ * Payload is a single 0-based integer.
+ */
+ LOK_CALLBACK_SET_PART
}
LibreOfficeKitCallbackType;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9aa19dabd03c..74a77c44b564 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -81,6 +81,7 @@
#include <sfx2/request.hxx>
#include <boost/bind.hpp>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace com::sun::star;
@@ -1098,6 +1099,11 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
mpDrawView->AdjustMarkHdl();
}
+ if (bOK)
+ {
+ OString aPayload = OString::number(nSelectedPage);
+ GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, aPayload.getStr());
+ }
return bOK;
}