summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-03-12 13:08:49 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-16 09:38:08 +0100
commit4a8afa003b854e74807389c8f82fd4609485f1b8 (patch)
tree16a66fe3adecff4a98e09d5fb3134a857e0fa504 /svx
parent5666552a07c0f742087cf987679ffeb5fa99b1a4 (diff)
Add ImpEditView::libreOfficeKitCallback()
And various other methods, so that it's possible to invoke the callback in ImpEditView. This will be needed by the blinking editeng cursor. Change-Id: Ie1b6957e5c48f606e71d5808df3f632924d3a2ec
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedxv.cxx1
-rw-r--r--svx/source/svdraw/svdmodel.cxx10
2 files changed, 11 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 06256965200f..5cf1ca1d34d8 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -447,6 +447,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
pOutlView->SetControlWord(nStat);
pOutlView->SetBackgroundColor( aBackground );
pOutlView->setTiledRendering(GetModel()->isTiledRendering());
+ pOutlView->registerLibreOfficeKitCallback(GetModel()->getLibreOfficeKitCallback(), GetModel()->getLibreOfficeKitData());
if (pText!=NULL)
{
pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode()));
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 66f004e6e261..9e59338bdbd3 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -820,6 +820,16 @@ void SdrModel::libreOfficeKitCallback(int nType, const char* pPayload) const
mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData);
}
+LibreOfficeKitCallback SdrModel::getLibreOfficeKitCallback() const
+{
+ return mpLibreOfficeKitCallback;
+}
+
+void* SdrModel::getLibreOfficeKitData() const
+{
+ return mpLibreOfficeKitData;
+}
+
void SdrModel::ImpReformatAllTextObjects()
{
if( isLocked() )