cui/uiconfig/ui/numberingoptionspage.ui | 5 +++++ cui/uiconfig/ui/numberingpositionpage.ui | 5 +++++ editeng/source/editeng/impedit.hxx | 2 +- editeng/source/editeng/impedit3.cxx | 13 +++++++++---- include/svx/svdotext.hxx | 1 - solenv/sanitizers/ui/modules/swriter.suppr | 2 -- svx/source/svdraw/svdedxv.cxx | 3 +++ svx/source/svdraw/svdoutl.cxx | 4 ---- sw/uiconfig/swriter/ui/tokenwidget.ui | 2 ++ 9 files changed, 25 insertions(+), 12 deletions(-)
New commits: commit 7b37be3aab71805132493f460521272566e0841d Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jan 6 20:28:44 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:48:35 2026 +0100 add tooltips to left/right buttons in toc token widget scrolling area Change-Id: I05fcf614c6e1829633f2265e8c48189664d6ec60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196629 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr index c1a0e0df5455..5d5667d72d31 100644 --- a/solenv/sanitizers/ui/modules/swriter.suppr +++ b/solenv/sanitizers/ui/modules/swriter.suppr @@ -144,8 +144,6 @@ sw/uiconfig/swriter/ui/tabletextflowpage.ui://GtkLabel[@id='label39'] orphan-lab sw/uiconfig/swriter/ui/textgridpage.ui://GtkLabel[@id='labelFT_CHARRANGE'] orphan-label sw/uiconfig/swriter/ui/textgridpage.ui://GtkLabel[@id='labelFT_LINERANGE'] orphan-label sw/uiconfig/swriter/ui/titlepage.ui://GtkSpinButton[@id='NF_PAGE_START'] missing-label-for -sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='left'] button-no-label -sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='right'] button-no-label sw/uiconfig/swriter/ui/toxbuttonwidget.ui://GtkToggleButton[@id='button'] button-no-label sw/uiconfig/swriter/ui/toxentrywidget.ui://GtkEntry[@id='entry'] no-labelled-by sw/uiconfig/swriter/ui/unfloatbutton.ui://GtkButton[@id='button'] button-no-label diff --git a/sw/uiconfig/swriter/ui/tokenwidget.ui b/sw/uiconfig/swriter/ui/tokenwidget.ui index 69d37f3c43a6..e36338ab2087 100644 --- a/sw/uiconfig/swriter/ui/tokenwidget.ui +++ b/sw/uiconfig/swriter/ui/tokenwidget.ui @@ -22,6 +22,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> + <property name="tooltip_text" translatable="yes" context="tokenwidget|left|tooltip_text">Scroll left</property> <property name="image">image1</property> <property name="always-show-image">True</property> </object> @@ -84,6 +85,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> + <property name="tooltip_text" translatable="yes" context="tokenwidget|right|tooltip_text">Scroll right</property> <property name="image">image2</property> <property name="always-show-image">True</property> </object> commit 19a0237e09ffe7eb3f35839248ade6dd3f216f89 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 8 10:21:19 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:48:13 2026 +0100 add a11y name to preview widget Change-Id: I18fabddbbbfa1fc74fc4d2d6a3659708329986ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196835 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index 9655272283ee..85b766809132 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -529,6 +529,11 @@ numbering and text:</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="numberingpositionpage|preview-atkobject">Preview</property> + </object> + </child> </object> </child> </object> commit 3dd42b34ed4b884bfd024e5da92a8b6128c19256 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 8 08:42:01 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:48:01 2026 +0100 add a11y name to preview widget Change-Id: I56710e388e5bf927309c35b94dd4819de9ba70eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196829 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 22f05bae051f..1b088870ad49 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -839,6 +839,11 @@ <property name="height-request">300</property> <property name="visible">True</property> <property name="can-focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="numberingoptionspage|preview-atkobject">Preview</property> + </object> + </child> </object> </child> </object> commit 58a6bceaa172619f1a544b194c56db16780e8d7f Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Jan 2 02:45:48 2026 +0530 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:45:56 2026 +0100 Revert "svx: fixed textbox text always black on dark theme" This reverts commit c52f139b4f7140033144dde29f70a39ebedb6aa0. these changes are not needed after b1a6bc7a Change-Id: Id71c57d383703c182dec790b66e96563ed8fbac2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196404 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196605 Tested-by: Jenkins diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 872474fc0cef..06f365f5d480 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -128,7 +128,6 @@ private: friend class TextChain; friend class TextChainFlow; friend class EditingTextChainFlow; - friend class SdrOutliner; // CustomShapeproperties need to access the "mbTextFrame" member: friend class sdr::properties::CustomShapeProperties; diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index da7bafc506c7..52cbc9862f9a 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -26,7 +26,6 @@ #include <editeng/editstat.hxx> #include <svl/itempool.hxx> #include <editeng/editview.hxx> -#include <editeng/editeng.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> @@ -64,9 +63,6 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) SetPaperSize( aMaxSize ); SetTextColumns(pObj->GetTextColumnsNumber(), pObj->GetTextColumnsSpacing()); ClearPolygon(); - - if (pObj->GetTextEditOutliner()) - SetBackgroundColor(pObj->GetTextEditOutliner()->GetEditEngine().GetBackgroundColor()); } mxWeakTextObj = const_cast< SdrTextObj* >(pObj); commit 81ce4364f112262defc0a592e7baf26784e05dac Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Jan 2 02:43:25 2026 +0530 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:45:47 2026 +0100 editeng: for automatic font color also check char background problem: in automatic color we only check doc color and background color(i.e: cell color) text can also have highlight color which also should be taken in cosideration when chosing automatic color Change-Id: I3689baa5cc95bc8d3b855251ae92c91a82102db3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196403 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196604 diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index aba08ab2f2ba..cd381cadc6f9 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -832,7 +832,7 @@ private: tools::Long CalcVertLineSpacing(Point& rStartPos) const; - Color GetAutoColor() const; + Color GetAutoColor(const SvxFont* pFonts = nullptr) const; void EnableAutoColor( bool b ) { mbUseAutoColor = b; } bool IsAutoColorEnabled() const { return mbUseAutoColor; } void ForceAutoColor( bool b ) { mbForceAutoColor = b; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index fca52b933676..6b087304c6fa 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3036,7 +3036,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo if ( IsAutoColorEnabled() && !bPrinting && !bPDFExporting) { // Never use WindowTextColor on the printer - rFont.SetColor( GetAutoColor() ); + rFont.SetColor(GetAutoColor(&rFont)); } else { @@ -4742,16 +4742,21 @@ Reference < i18n::XExtendedInputSequenceChecker > const & ImpEditEngine::ImplGet return mxISC; } -Color ImpEditEngine::GetAutoColor() const +Color ImpEditEngine::GetAutoColor(const SvxFont* pFont) const { Color aColor; const SfxViewShell* pKitSh = comphelper::LibreOfficeKit::isActive() ? SfxViewShell::Current() : nullptr; if (pKitSh) { - Color aBackgroundColor = GetBackgroundColor(); - if (aBackgroundColor == COL_AUTO) + Color aBackgroundColor; + if (pFont) //check for char backgound color + aBackgroundColor = pFont->GetFillColor(); + if (aBackgroundColor == COL_AUTO) // check for aother backgound (i.e: cell color) + aBackgroundColor = GetBackgroundColor(); + if (aBackgroundColor == COL_AUTO) // if everything is auto/transperent then use doc color aBackgroundColor = pKitSh->GetColorConfigColor(svtools::DOCCOLOR); + if (aBackgroundColor.IsDark()) aColor = COL_WHITE; else commit e532e0e418cd8571e77bfcbd610831d0d606488c Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Jan 2 02:41:13 2026 +0530 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 17:45:36 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 e0a3b26fa19f..bc7a121c4565 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;
