Rebased ref, commits from common ancestor:
commit 728a929d1f5e18c83f92d8bd272830004b11bc8a
Author:     Pranam Lashkari <[email protected]>
AuthorDate: Tue Jan 27 14:34:34 2026 +0100
Commit:     Andras Timar <[email protected]>
CommitDate: Tue Jan 27 15:47:30 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]>

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());
 }
commit 807aedd9bd8ff3f6e162eff0ddba174f6eaf217f
Author:     Parth Raiyani <[email protected]>
AuthorDate: Tue Nov 25 11:23:08 2025 +0530
Commit:     Caolán McNamara <[email protected]>
CommitDate: Tue Jan 27 14:42:30 2026 +0100

    a11y: add mnemonic-widget property to link Tab stop pos label to 
GtkSpinButton
    
    Signed-off-by: Parth Raiyani <[email protected]>
    Change-Id: I20ddbe1921b5b69e576478029dd1539a71ed98ad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194500
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Szymon Kłos <[email protected]>
    (cherry picked from commit bcf2a7686dcc64d3c81b4bf9d617189de8f62b71)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198204
    Tested-by: Caolán McNamara <[email protected]>
    Reviewed-by: Caolán McNamara <[email protected]>

diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui 
b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 2c2d5183d6c3..5081746ab0a2 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -463,6 +463,7 @@
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="label" translatable="yes" 
context="tocentriespage|tabstopposft">Tab stop position:</property>
+                            <property 
name="mnemonic-widget">tabstoppos</property>
                             <property name="use-underline">True</property>
                             <property name="xalign">0</property>
                           </object>

Reply via email to