svx/source/svdraw/svdedxv.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
New commits: commit 534d2d9a3f935441bb0c4f1b9e6ea1166d587e45 Author: Pranam Lashkari <[email protected]> AuthorDate: Tue Jan 27 14:34:34 2026 +0100 Commit: Mohit Marathe <[email protected]> CommitDate: Wed Jan 28 09:08:09 2026 +0100 Revert "svx: fixed incorrect outlinerView used entering textbox editing" This reverts commit a4ff095b8260d712042103bf8b496a61ecb36faf. Reason for revert: Some text was disappearing in different themes. Change-Id: Icf4dae0c707f06fbb251a01b6ac8d845eb9a7c4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198201 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> (cherry picked from commit 728a929d1f5e18c83f92d8bd272830004b11bc8a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198242 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mohit Marathe <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index e9fd1297556d..de6c2db55a55 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -933,16 +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(); + OutlinerView* pOLV = pActiveOutliner->GetView(0); + SdrPage* pPage = GetSdrPageView()->GetPage(); pOLV->SetBackgroundColor(pPage->GetPageBackgroundColor(GetSdrPageView(), true)); ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); }
