include/svx/svdotext.hxx | 1 + svx/source/svdraw/svdoutl.cxx | 4 ++++ 2 files changed, 5 insertions(+)
New commits: commit c52f139b4f7140033144dde29f70a39ebedb6aa0 Author: Pranam Lashkari <lpra...@collabora.com> AuthorDate: Tue Jul 16 02:24:04 2024 +0200 Commit: Pranam Lashkari <lpra...@collabora.com> CommitDate: Wed Aug 28 23:33:30 2024 +0200 svx: fixed textbox text always black on dark theme problem: when doc is in dark mode and a textbox is inserted, even though text has automatic color it will be black on unselecting textbox Change-Id: I8736c15a1254682f06218a1eb1039b1985eda552 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170537 Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> (cherry picked from commit 41b277224310b63a181d65a279e1d77950db9309) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172494 Tested-by: Jenkins Reviewed-by: Pranam Lashkari <lpra...@collabora.com> diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 92d0cf0b9bf3..901e1daf4610 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -133,6 +133,7 @@ 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 8198c260e344..2002b5f05392 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -26,6 +26,7 @@ #include <editeng/editstat.hxx> #include <svl/itempool.hxx> #include <editeng/editview.hxx> +#include <editeng/editeng.hxx> SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, OutlinerMode nMode ) @@ -62,6 +63,9 @@ 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);