summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorArmin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de>2023-08-02 16:02:16 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2023-08-03 04:40:07 +0200
commit142e8c023575e2aabc7f60110137da85e5a06770 (patch)
treef07a2788dfe0272e92cbd4be895117c61c8b7792 /svx
parent7109110a6494e9af2fa8aa9291d5f10f23f3f26b (diff)
tdf#153102: use given RedrawArea in DoProcessDisplay
In ObjectContactOfPageView::DoProcessDisplay someone changed (seven years ago) to ignore the given RedrawArea if comphelper::LibreOfficeKit::isActive(). Using and setting that RedrawArea is needed to get the visual clipping against e.g. PageBounds in Writer paint working. Adding that again. Change-Id: If628039379c2756aac8865c3632e37c19993d0da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155262 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 9698ce992dc220051d5338f58a0d1f59c5691a89) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155241
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index e07cf01bb86c..84df5650207e 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -149,7 +149,9 @@ namespace sdr::contact
bool bClipRegionPushed(false);
const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
- if(!rRedrawArea.IsEmpty() && !comphelper::LibreOfficeKit::isActive())
+ // tdf#153102 using the given RedrawArea is needed e.g. for Writer's
+ // visual clipping against PageBounds (also for android viewer)
+ if(!rRedrawArea.IsEmpty())
{
bClipRegionPushed = true;
pOutDev->Push(vcl::PushFlags::CLIPREGION);