diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-20 16:43:04 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:46:23 -0400 |
| commit | 2283585d82b60bb613642613525e5e1fc0dd2376 (patch) | |
| tree | 2e40a65c3a8aa386c6e1b49aec207ccc9862f241 /include | |
| parent | bce02c8547a87bc9c2270c341529d9a13142432a (diff) | |
Remove no longer needed SdrModel::libreOfficeKitCallback()
All former clients are changed to call
SfxViewShell::libreOfficeKitViewCallback() instead.
Reviewed-on: https://gerrit.libreoffice.org/26521
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3f6ad98c4764402dc6e876106867e49e3e888f8f)
Change-Id: Ic5dcf0a8a4241338fcd6941f13ce438157676481
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdmodel.hxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index d1eb48731d16..83f8c00a2b4a 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -148,7 +148,7 @@ public: struct SdrModelImpl; -class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase< SdrModel >, public OutlinerSearchable +class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase< SdrModel > { protected: std::vector<SdrPage*> maMaPag; // master pages @@ -173,10 +173,6 @@ protected: SdrOutliner* pChainingOutliner; // an Outliner for chaining overflowing text sal_uIntPtr nDefTextHgt; // Default text height in logical units VclPtr<OutputDevice> pRefOutDev; // ReferenceDevice for the EditEngine - LibreOfficeKitCallback mpLibreOfficeKitCallback; - void* mpLibreOfficeKitData; - /// Set if we are in the middle of a tiled search. - bool mbTiledSearching; sal_uIntPtr nProgressAkt; // for the sal_uIntPtr nProgressMax; // ProgressBar- sal_uIntPtr nProgressOfs; // -Handler @@ -334,16 +330,6 @@ public: // ReferenceDevice for the EditEngine void SetRefDevice(OutputDevice* pDev); OutputDevice* GetRefDevice() const { return pRefOutDev.get(); } - /// The actual implementation of the vcl::ITiledRenderable::registerCallback() API. - void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData); - /// Gets the LOK data registered by registerLibreOfficeKitCallback(). - void* getLibreOfficeKitData() const; - /// Invokes the registered callback, if there are any. - void libreOfficeKitCallback(int nType, const char* pPayload) const override; - /// Set if we are doing tiled searching. - void setTiledSearching(bool bTiledSearching); - /// Are we doing tiled searching? - bool isTiledSearching() const; // If a new MapMode is set on the RefDevice (or similar) void RefDeviceChanged(); // not yet implemented // default font height in logical units |