diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-11-27 19:23:22 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-28 19:49:27 +0100 |
| commit | eba961f518774d467b03c5a77828a2a7c21b42ed (patch) | |
| tree | ae65a0d16ae85e5a4227e7a8b34f9df115ba94bb /sd | |
| parent | 57c0ccf77627b485e8ed05cad295c4eef5eb16e4 (diff) | |
lokdialog: Move the LOKWindowId <-> VclPtr<Window> mapping to Window.
This allows registering & de-registering of non-sfx windows too, and makes the
Calc autofilter popup to appear.
Change-Id: I7cbbe94d208115aabcb6fa5f964646c7b7ce4c93
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index ee1cb5687dd1..087fa521ca9e 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -268,9 +268,6 @@ public: /// @see vcl::ITiledRenderable::getPostIts(). virtual OUString getPostIts() override; - /// @see vcl::ITiledRenderable::findWindow(). - VclPtr<vcl::Window> findWindow(vcl::LOKWindowId nLOKWindowId) const override; - // XComponent /** This dispose implementation releases the resources held by the diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c902e2dc5104..6b852e2cb5bb 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2705,12 +2705,6 @@ Pointer SdXImpressDocument::getPointer() return pWindow->GetPointer(); } -VclPtr<vcl::Window> SdXImpressDocument::findWindow(vcl::LOKWindowId nLOKWindowId) const -{ - SfxViewShell* pViewShell = SfxViewShell::Current(); - return pViewShell->GetOpenedDlg(nLOKWindowId); -} - uno::Reference< i18n::XForbiddenCharacters > SdXImpressDocument::getForbiddenCharsTable() { uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters); |