summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-02-20 14:51:06 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-23 10:10:29 +0100
commitab44ada1471873997de3ae0349b258088b2ba71b (patch)
tree056dfd6612a7678dab3543ef73b26b0b2bcc2789 /svx
parent532e77cd3886b985f6e61363f563cbaa6c1b4b6d (diff)
sd::ViewShell -> SdrModel for LOK callback
One one hand, this fixes missing invalidations after typing characters in editeng on Android. Previously it was assumed that there is only one sd::ViewShell for one Impress document, but that's obviously not true. On the other hand, this will be handy when later svx code wants to invoke the LOK callback as well, when it was stored in sd, that wasn't possible. Change-Id: Id467be01ad008aecaaabdd85b2a6b29a14f1eb86
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdmodel.cxx14
1 files changed, 14 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c444fa582b51..66f004e6e261 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -125,6 +125,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
pHitTestOutliner=NULL;
pRefOutDev=NULL;
mbTiledRendering = false;
+ mpLibreOfficeKitCallback = 0;
+ mpLibreOfficeKitData = 0;
nProgressAkt=0;
nProgressMax=0;
nProgressOfs=0;
@@ -806,6 +808,18 @@ bool SdrModel::isTiledRendering() const
return mbTiledRendering;
}
+void SdrModel::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData)
+{
+ mpLibreOfficeKitCallback = pCallback;
+ mpLibreOfficeKitData = pData;
+}
+
+void SdrModel::libreOfficeKitCallback(int nType, const char* pPayload) const
+{
+ if (mpLibreOfficeKitCallback)
+ mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData);
+}
+
void SdrModel::ImpReformatAllTextObjects()
{
if( isLocked() )