svx/source/svdraw/svdedxv.cxx | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-)
New commits: commit 3e98369b60cb32880b05772e981bed81ad08f966 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 5 09:20:24 2026 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Jan 6 11:23:58 2026 +0100 flatten SdrObjEditView::TextEditDrawing no logic change intended Change-Id: Ied15e90341d4e7e8f0228354dfadec2342138162 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196539 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index cea9543b42a7..de6c2db55a55 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -926,31 +926,28 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) // to update accordingly (will update selection, too). Suppress new // stuff when LibreOfficeKit is active EditViewInvalidate(tools::Rectangle()); + return; } - else - { - // draw old text edit stuff - if (IsTextEdit()) - { - const SdrOutliner* pActiveOutliner = GetTextEditOutliner(); - if (pActiveOutliner) - { - const sal_uInt32 nViewCount(pActiveOutliner->GetViewCount()); + // draw old text edit stuff + if (!IsTextEdit()) + return; - if (nViewCount) - { - const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); - const tools::Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); + const SdrOutliner* pActiveOutliner = GetTextEditOutliner(); + if (!pActiveOutliner) + return; - OutlinerView* pOLV = pActiveOutliner->GetView(0); - SdrPage* pPage = GetSdrPageView()->GetPage(); - pOLV->SetBackgroundColor(pPage->GetPageBackgroundColor(GetSdrPageView(), true)); - ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); - } - } - } - } + const sal_uInt32 nViewCount(pActiveOutliner->GetViewCount()); + if (!nViewCount) + return; + + const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); + const tools::Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); + + OutlinerView* pOLV = pActiveOutliner->GetView(0); + SdrPage* pPage = GetSdrPageView()->GetPage(); + pOLV->SetBackgroundColor(pPage->GetPageBackgroundColor(GetSdrPageView(), true)); + ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice()); } void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect,
