diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-02 14:21:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-02 12:54:33 +0000 |
| commit | c152008943160fa901ef8a356515a6a074370ff0 (patch) | |
| tree | 8fe53e484776cd2dbe2972d56f8b01fc46953751 /include | |
| parent | 9a01af253060123b86b702bb9d8ae8fe623edde4 (diff) | |
svx: move GetSfxViewShell() to SdrMarkView
... from SdrObjEditView. This way SdrMarkView can avoid
SfxViewShell::Current() calls, and it can avoid clearing the LOK graphic
selection of the old view when constructing a new view.
With this, an existing graphic selection in an Impress LOK view is no
longer cleared when creating a new view, thanks to the
sd::View::GetSfxViewShell() override.
Change-Id: I70a287aa9c2265bf59a9fb18e0c3839b8f119bbc
Reviewed-on: https://gerrit.libreoffice.org/28618
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdedxv.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svdmrkv.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 0e48c22ad94a..a22f5b5c1f21 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -35,7 +35,6 @@ class ImpSdrEditPara; struct PasteOrDropInfos; class SdrUndoManager; class TextChainCursorManager; -class SfxViewShell; namespace com { namespace sun { namespace star { namespace uno { class Any; @@ -160,8 +159,6 @@ public: SdrPageView* ShowSdrPage(SdrPage* pPage) override; void HideSdrPage() override; - /// Get access to the view shell owning this draw view, if any. - virtual SfxViewShell* GetSfxViewShell() const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; virtual void ModelHasChanged() override; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index dc4f739ebe56..1c851ec25940 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -27,6 +27,8 @@ #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +class SfxViewShell; + // The following is not yet implemented, or just partially: enum class SdrSearchOptions { @@ -437,6 +439,8 @@ public: // End point of the axis of reflextion const Point& GetRef2() const { return maRef1; } void SetRef2(const Point& rPt); + /// Get access to the view shell owning this draw view, if any. + virtual SfxViewShell* GetSfxViewShell() const; }; |