diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-03-31 18:17:23 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-03-31 19:22:53 +0200 |
| commit | 83487c28d3e2d0b331dd161b97a804be8e9bc1b9 (patch) | |
| tree | 0969e93fd01c873580fbc62aee0dbe172b3d1ef3 /svx/source | |
| parent | 3b65c1660427e66642f63f24ba35c85c48c7a08c (diff) | |
lok sc: Don't depend on the OutputDevice existence when invalidating.
We know that the drawinglayer operates in 100th of millimetre, and that we
need twips for LOK.
Change-Id: I8813f936ab66eaca4d6b9c03341e090d703decb8
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/sdrpagewindow.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index add2130a32be..729c65ea997e 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -36,7 +36,7 @@ #include <osl/mutex.hxx> #include <svx/fmview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> - +#include <sfx2/lokhelper.hxx> using namespace ::com::sun::star; @@ -409,7 +409,23 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...) void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange) { - if(GetPageView().IsVisible() && GetPaintWindow().OutputToWindow()) + if (comphelper::LibreOfficeKit::isActive()) + { + // we don't really have a paint window with LOK; OTOH we know that the + // drawinglayer units are 100ths of mm, so they are easy to convert to + // twips + const Rectangle aRect100thMM( + static_cast<long>(floor(rRange.getMinX())), + static_cast<long>(floor(rRange.getMinY())), + static_cast<long>(ceil(rRange.getMaxX())), + static_cast<long>(ceil(rRange.getMaxY()))); + + const Rectangle aRectTwips = OutputDevice::LogicToLogic(aRect100thMM, MapUnit::Map100thMM, MapUnit::MapTwip); + + if (SfxViewShell* pViewShell = SfxViewShell::Current()) + SfxLokHelper::notifyInvalidation(pViewShell, aRectTwips.toString()); + } + else if (GetPageView().IsVisible() && GetPaintWindow().OutputToWindow()) { const SvtOptionsDrawinglayer aDrawinglayerOpt; vcl::Window& rWindow(static_cast< vcl::Window& >(GetPaintWindow().GetOutputDevice())); |