|
 |
f325b2 |
From 48e3532611ca0d7de71f9796bf3e8bf3263929dd Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 22 Oct 2015 10:15:34 +0200
|
|
|
f325b2 |
Subject: [PATCH 224/398] vcl: add ITiledRenderable::getWindow() and implement
|
|
|
f325b2 |
in sw
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 981a974824642a81f86c526dea682cd27cd437db)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I9d0fad3904e74b44b0b126974ace4025f7a4fc5b
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/vcl/ITiledRenderable.hxx | 6 ++++++
|
|
|
f325b2 |
sw/inc/unotxdoc.hxx | 4 +++-
|
|
|
f325b2 |
sw/source/uibase/uno/unotxdoc.cxx | 7 +++++++
|
|
|
f325b2 |
3 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
index c294d20dc9cf..bb891ab97f7b 100644
|
|
|
f325b2 |
--- a/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
+++ b/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
@@ -147,6 +147,12 @@ public:
|
|
|
f325b2 |
{
|
|
|
f325b2 |
return OUString();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ /// Returns the current vcl::Window of the component.
|
|
|
f325b2 |
+ virtual vcl::Window* getWindow()
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ return 0;
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
} // namespace vcl
|
|
|
f325b2 |
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
index 346cab63ca02..d0eada25b6ef 100644
|
|
|
f325b2 |
--- a/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
+++ b/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
@@ -433,7 +433,9 @@ public:
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::resetSelection().
|
|
|
f325b2 |
virtual void resetSelection() SAL_OVERRIDE;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::getPartPageRectangles().
|
|
|
f325b2 |
- virtual OUString getPartPageRectangles() SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual OUString getPartPageRectangles() override;
|
|
|
f325b2 |
+ /// @see vcl::ITiledRenderable::getWindow().
|
|
|
f325b2 |
+ virtual vcl::Window* getWindow() override;
|
|
|
f325b2 |
|
|
|
f325b2 |
// ::com::sun::star::tiledrendering::XTiledRenderable
|
|
|
f325b2 |
virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
|
|
|
f325b2 |
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
index fc1c6f411b74..658057d7a977 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
@@ -3188,6 +3188,13 @@ OUString SwXTextDocument::getPartPageRectangles()
|
|
|
f325b2 |
return pWrtShell->getPageRectangles();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+vcl::Window* SwXTextDocument::getWindow()
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ SolarMutexGuard aGuard;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ return &pDocShell->GetView()->GetEditWin();
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
int SwXTextDocument::getPart()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SolarMutexGuard aGuard;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|