From 000591bdd5e42117dc2e4fe5a8f5df9526b62ae1 Mon Sep 17 00:00:00 2001 From: Pranam Lashkari Date: Fri, 2 Jan 2026 02:45:48 +0530 Subject: [PATCH] Revert "svx: fixed textbox text always black on dark theme" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196605 Tested-by: Jenkins --- include/svx/svdotext.hxx | 1 - svx/source/svdraw/svdoutl.cxx | 4 ---- 2 files changed, 5 deletions(-) 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 #include #include -#include #include @@ -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);