diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2024-07-16 02:24:04 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-16 09:25:59 +0200 |
| commit | 41b277224310b63a181d65a279e1d77950db9309 (patch) | |
| tree | 7bfc6a7e15322ee4342b175e06b31312522d4324 | |
| parent | 57dd4b32f12918949067c4276bda8b4cca61a895 (diff) | |
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.mcnamara@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
| -rw-r--r-- | include/svx/svdotext.hxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoutl.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index f3c3a300eed7..d81c1717eb85 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -130,6 +130,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); |