svx/source/svdraw/svdedxv.cxx | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-)
New commits: commit 0a1bcde9fe14218720cd3ad3a27b999145d6ad74 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 5 09:18:18 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jan 23 10:07:13 2026 +0100 nViewCount is always > 0 here so simplify Change-Id: Ie0e34d1c58e4a6e7b4c2fce5793b41e8f88e142d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196537 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197888 Tested-by: Miklos Vajna <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 477bf25cc7df..cea9543b42a7 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -943,16 +943,10 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); const tools::Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); - if (sal_uInt32 i(0); i < nViewCount) - { - OutlinerView* pOLV = pActiveOutliner->GetView(i); - SdrPage* pPage = GetSdrPageView()->GetPage(); - pOLV->SetBackgroundColor( - pPage->GetPageBackgroundColor(GetSdrPageView(), true)); - ImpPaintOutlinerView(*pOLV, aCheckRect, - rPaintWindow.GetTargetOutputDevice()); - return; - } + OutlinerView* pOLV = pActiveOutliner->GetView(0); + SdrPage* pPage = GetSdrPageView()->GetPage(); + pOLV->SetBackgroundColor(pPage->GetPageBackgroundColor(GetSdrPageView(), true)); + ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); } } } commit db0fb76886e15b2169590aa458861e78302a9ee8 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 5 09:14:23 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jan 23 10:07:05 2026 +0100 comphelper::LibreOfficeKit::isActive() is always true in this branch given the earlier !comphelper::LibreOfficeKit::isActive() check, so simplify here Change-Id: I5f95035cce6d2d4e763bd1dc4be2eae2bcd35a39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196536 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197887 Tested-by: Miklos Vajna <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index eeaf6ee95bed..477bf25cc7df 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -943,27 +943,15 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); const tools::Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); - for (sal_uInt32 i(0); i < nViewCount; i++) + if (sal_uInt32 i(0); i < nViewCount) { OutlinerView* pOLV = pActiveOutliner->GetView(i); - - // If rPaintWindow knows that the output device is a render - // context and is aware of the underlying vcl::Window, - // compare against that; that's how double-buffering can - // still find the matching OutlinerView. - OutputDevice* pOutputDevice = rPaintWindow.GetWindow() - ? rPaintWindow.GetWindow()->GetOutDev() - : &rPaintWindow.GetOutputDevice(); - if (pOLV->GetWindow()->GetOutDev() == pOutputDevice - || comphelper::LibreOfficeKit::isActive()) - { - SdrPage* pPage = GetSdrPageView()->GetPage(); - pOLV->SetBackgroundColor( - pPage->GetPageBackgroundColor(GetSdrPageView(), true)); - ImpPaintOutlinerView(*pOLV, aCheckRect, - rPaintWindow.GetTargetOutputDevice()); - return; - } + SdrPage* pPage = GetSdrPageView()->GetPage(); + pOLV->SetBackgroundColor( + pPage->GetPageBackgroundColor(GetSdrPageView(), true)); + ImpPaintOutlinerView(*pOLV, aCheckRect, + rPaintWindow.GetTargetOutputDevice()); + return; } } }
