diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-01-18 18:27:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-17 12:56:51 +0200 |
| commit | 9090dc1f3b27195f5defd35586ac79357992be21 (patch) | |
| tree | d39f4b624ae337d5c9ce76eba8521b76e53afa05 /include/sfx2 | |
| parent | Directly initialize maps in ADatabaseMetaDataResultSet.cxx (diff) | |
| download | core-9090dc1f3b27195f5defd35586ac79357992be21.tar.gz core-9090dc1f3b27195f5defd35586ac79357992be21.zip | |
split OutputDevice from Window
as part of a longer-term goal of doing our
widget rendering only inside a top-level render-
context.
I moved all of the OutputDevice-related code that existed in vcl::Window
into a new subclass of OutputDevice called WindowOutputDevice.
Notes for further work
(*) not sure why we are getting an 1x1 surface in
SvpSalGraphics::releaseCairoContext, but to fix it I clamp
the size there
(*) might have to dump VCLXDevice, and move it's code down into VCLXWindow and VCLXVirtualDevice
(*) can we remove use of VCLXDevice in other places, in favour of just talking to the VCL code?
Change-Id: I105946377f5322677d6f7d0c1c23847178a720b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113204
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/LokControlHandler.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/LokControlHandler.hxx b/include/sfx2/LokControlHandler.hxx index 5617dae4b2f8..5a6d87529fb4 100644 --- a/include/sfx2/LokControlHandler.hxx +++ b/include/sfx2/LokControlHandler.hxx @@ -37,7 +37,7 @@ public: if (aControlRectHMM.IsInside(aPointHmm)) { css::uno::Reference<css::awt::XControl> xControl - = pUnoObect->GetUnoControl(*pDrawView, rMainWindow); + = pUnoObect->GetUnoControl(*pDrawView, *rMainWindow.GetOutDev()); if (!xControl.is()) return false; @@ -73,7 +73,7 @@ public: tools::Rectangle const& rTileRectHMM, double scaleX, double scaleY) { css::uno::Reference<css::awt::XControl> xControl - = pUnoObect->GetUnoControl(*pDrawView, rMainWindow); + = pUnoObect->GetUnoControl(*pDrawView, *rMainWindow.GetOutDev()); if (!xControl.is()) return; |