diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-22 14:15:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-27 08:49:57 +0100 |
| commit | 657dc1004e558eb74c69c6a804c40e5d58c6d581 (patch) | |
| tree | 447644d34fe4e170a71ed9de021b6cafb98c31dc /sd/source/ui | |
| parent | 03a965280caf3665c0abb01c7b46debdd3dbeac1 (diff) | |
sd: implement vcl::ITiledRenderable::getWindow()
(cherry picked from commit 8522948ba2f30fb703d4725086d30d9aa2a0cf4c)
Conflicts:
sd/source/ui/inc/unomodel.hxx
Change-Id: I8bc7316d9304d9e764ee846fe3af34599bf6fc35
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 4d7314875f0b..5f04474f4f6c 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -258,6 +258,8 @@ public: virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE; /// @see lok::Document::resetSelection(). virtual void resetSelection() SAL_OVERRIDE; + /// @see vcl::ITiledRenderable::getWindow(). + virtual vcl::Window* getWindow() SAL_OVERRIDE; // XComponent diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 6ae01a28efac..1628a18df296 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2539,6 +2539,17 @@ void SdXImpressDocument::resetSelection() pSdrView->UnmarkAll(); } +vcl::Window* SdXImpressDocument::getWindow() +{ + SolarMutexGuard aGuard; + + DrawViewShell* pViewShell = GetViewShell(); + if (!pViewShell) + return 0; + + return pViewShell->GetActiveWindow(); +} + uno::Reference< i18n::XForbiddenCharacters > SdXImpressDocument::getForbiddenCharsTable() { uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters); |