summaryrefslogtreecommitdiff
path: root/include/svx/svdmodel.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-06-20 16:43:04 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-20 15:16:07 +0000
commit3f6ad98c4764402dc6e876106867e49e3e888f8f (patch)
tree1cd35548cfb4dc55e5d2fc43ea48872791b1aa12 /include/svx/svdmodel.hxx
parentc544a8b674dd7ac9dd466a84a440ede030942438 (diff)
Remove no longer needed SdrModel::libreOfficeKitCallback()
All former clients are changed to call SfxViewShell::libreOfficeKitViewCallback() instead. Change-Id: Ic5dcf0a8a4241338fcd6941f13ce438157676481 Reviewed-on: https://gerrit.libreoffice.org/26521 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/svx/svdmodel.hxx')
-rw-r--r--include/svx/svdmodel.hxx16
1 files changed, 1 insertions, 15 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index b0e4d56c8e20..709844dce915 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -143,7 +143,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
@@ -168,10 +168,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
@@ -328,16 +324,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