|
 |
f325b2 |
From 675db4db926a09024df57ae8f9be457662393757 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 22 Oct 2015 14:15:14 +0200
|
|
|
f325b2 |
Subject: [PATCH 237/398] sd: implement vcl::ITiledRenderable::getWindow()
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 8522948ba2f30fb703d4725086d30d9aa2a0cf4c)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I8bc7316d9304d9e764ee846fe3af34599bf6fc35
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sd/source/ui/inc/unomodel.hxx | 4 +++-
|
|
|
f325b2 |
sd/source/ui/unoidl/unomodel.cxx | 11 +++++++++++
|
|
|
f325b2 |
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
index 4d7314875f0b..a24f774e2fc9 100644
|
|
|
f325b2 |
--- a/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
+++ b/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
@@ -257,7 +257,9 @@ public:
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::setGraphicSelection().
|
|
|
f325b2 |
virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE;
|
|
|
f325b2 |
/// @see lok::Document::resetSelection().
|
|
|
f325b2 |
- virtual void resetSelection() SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual void resetSelection() override;
|
|
|
f325b2 |
+ /// @see vcl::ITiledRenderable::getWindow().
|
|
|
f325b2 |
+ virtual vcl::Window* getWindow() override;
|
|
|
f325b2 |
|
|
|
f325b2 |
// XComponent
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
index 6ae01a28efac..1628a18df296 100644
|
|
|
f325b2 |
--- a/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
@@ -2539,6 +2539,17 @@ void SdXImpressDocument::resetSelection()
|
|
|
f325b2 |
pSdrView->UnmarkAll();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+vcl::Window* SdXImpressDocument::getWindow()
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ SolarMutexGuard aGuard;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ DrawViewShell* pViewShell = GetViewShell();
|
|
|
f325b2 |
+ if (!pViewShell)
|
|
|
f325b2 |
+ return 0;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ return pViewShell->GetActiveWindow();
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
uno::Reference< i18n::XForbiddenCharacters > SdXImpressDocument::getForbiddenCharsTable()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|