svx/source/svdraw/svdedxv.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 43e6bfece29ca35d28845be4939418a3d7c52972 Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Feb 20 01:24:03 2026 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 20 11:35:02 2026 +0100 Revert "svx: fixed incorrect outlinerView used entering textbox editing" This reverts commit 10dc2e8a4661057672e64cecce5d0caa4de4110e. Reason for revert: this was a temporary patch known to cause regression. It was merged to get some logs Change-Id: Icde84dcd034f05741f54366d6f8c109538d4b304 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199773 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 2941d5e8c703..de6c2db55a55 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -933,19 +933,19 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) if (!IsTextEdit()) return; - SfxViewShell* pViewShell = SfxViewShell::Current(); - SdrView* pSdrView = pViewShell ? pViewShell->GetDrawView() : nullptr; - OutlinerView* pOLV = pSdrView ? pSdrView->GetTextEditOutlinerView() : nullptr; - if (!pOLV) + const SdrOutliner* pActiveOutliner = GetTextEditOutliner(); + if (!pActiveOutliner) + return; + + const sal_uInt32 nViewCount(pActiveOutliner->GetViewCount()); + if (!nViewCount) return; const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); const tools::Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); - SdrPage* pPage = pSdrView->GetSdrPageView()->GetPage(); - SAL_INFO("svx.svdraw", "SfxViewShell id: " << pViewShell->GetViewShellId().get()); - SAL_INFO("svx.svdraw", - "Page background color: " << pPage->GetPageBackgroundColor(GetSdrPageView(), true)); + OutlinerView* pOLV = pActiveOutliner->GetView(0); + SdrPage* pPage = GetSdrPageView()->GetPage(); pOLV->SetBackgroundColor(pPage->GetPageBackgroundColor(GetSdrPageView(), true)); ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); }
