summaryrefslogtreecommitdiff
path: root/svx/source/sdr/contact/objectcontactofpageview.cxx
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-06-16 07:28:58 -0400
committerAshod Nakashian <ashnakash@gmail.com>2016-06-16 11:59:55 +0000
commit60fdcda65bad242f99895cb453182578250fbdea (patch)
tree72e80652f345417180b1bde41e0ed89d259c471a /svx/source/sdr/contact/objectcontactofpageview.cxx
parent0dbffca63191712d9f77297061a3d4651b8410aa (diff)
LOK: tile rendering regression fix
Calc fast rendering requires us to offset the are being rendered and shift all bitmaps accordingly. This however is breaking Impress rendering since the offseting logic is common (in svx and vcl). This adds new API to enable or disable this local rendering (as opposed to rendering a full document as was previously done. The new flag is then set by Calc to enable the offseting logic in isolation without affecting other applications. In one case isolation was achieved by checking the MapModeUnit. Change-Id: Ia0aadfc3f6df7c1a891b97dc731f5897414c9420 Reviewed-on: https://gerrit.libreoffice.org/26367 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'svx/source/sdr/contact/objectcontactofpageview.cxx')
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 6238cadb2f51..1f6fcecd618a 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -231,7 +231,8 @@ namespace sdr
// transform to world coordinates
aViewRange.transform(rTargetOutDev.GetInverseViewTransformation());
- if (comphelper::LibreOfficeKit::isActive())
+ if (comphelper::LibreOfficeKit::isActive() &&
+ comphelper::LibreOfficeKit::isLocalRendering())
{
const int TWIPS_PER_PIXEL = 15;
aViewRange = basegfx::B2DRange(aViewRange.getMinimum().getX(),
@@ -308,7 +309,8 @@ namespace sdr
drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rTargetOutDev, getViewInformation2D()));
- if (comphelper::LibreOfficeKit::isActive())
+ if (comphelper::LibreOfficeKit::isActive() &&
+ comphelper::LibreOfficeKit::isLocalRendering())
{
// Restore the origin.
MapMode aMapMode = pOutDev->GetMapMode();
@@ -321,7 +323,8 @@ namespace sdr
pProcessor2D->process(xPrimitiveSequence);
}
- if (comphelper::LibreOfficeKit::isActive())
+ if (comphelper::LibreOfficeKit::isActive() &&
+ comphelper::LibreOfficeKit::isLocalRendering())
{
// Restore the original map-mode.
pOutDev->SetMapMode(aOrigMapMode);