svx/source/svdraw/svdedxv.cxx | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
New commits: commit b096419327b469f5502d80a4ef1a0d9aa36d2260 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 5 09:14:23 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jan 6 13:19:26 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/+/196601 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f59b9d4c0d4b..3c7df834e4bc 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -946,27 +946,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; } } } commit bca4888319941380a9a97256e3d4d4ae7637fc5c Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Jan 2 02:41:13 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jan 6 13:19:18 2026 +0100 svx: update background color of editing outliner view problem: when textbox is in edit mode and user changed the theme automatic font color was not updated until textbox editing ended this resulted in automatic color staying accoring to previous theme Change-Id: I522e9244621345853d6ede45403e12a1ac4ed94d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196402 Tested-by: Jenkins CollaboraOffice <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196600 diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 4b37aae2f82a..f59b9d4c0d4b 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -960,6 +960,9 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) if (pOLV->GetWindow()->GetOutDev() == pOutputDevice || comphelper::LibreOfficeKit::isActive()) { + SdrPage* pPage = GetSdrPageView()->GetPage(); + pOLV->SetBackgroundColor( + pPage->GetPageBackgroundColor(GetSdrPageView(), true)); ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); return;
