[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdotextdecomposition.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 628e84cff5cd685ed242c8ebb32c88e63d16c57a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 5 20:27:22 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Oct 6 12:34:28 2022 +0200

    Resolves: tdf#151053 Body text with dark bg not visible in Notes view
    
    this is a similar case to:
    
    commit 76a0b3170664b19c3eb66edc8fccb04dc5485387
    Author: Caolán McNamara <caol...@redhat.com>
    Date:   Fri Jan 10 16:49:19 2014 +0000
    
        Resolves: fdo#35779 set the bg color of the editeng from the text shape
    
    Change-Id: Ib7ca42426397346e5d7473b93e60f853e646a423
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140996
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 7fb0efa38986..890f59f84264 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -745,6 +745,10 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
     rOutliner.SetMinAutoPaperSize(aNullSize);
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
 
+    // That color needs to be restored on leaving this method
+    Color aOriginalBackColor(rOutliner.GetBackgroundColor());
+    setSuitableOutlinerBg(rOutliner);
+
     // add one to rage sizes to get back to the old Rectangle and outliner 
measurements
     const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
     const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1));
@@ -847,6 +851,7 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
     aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, 
aClipRange);
 
     // cleanup outliner
+    rOutliner.SetBackgroundColor(aOriginalBackColor);
     rOutliner.Clear();
     rOutliner.setVisualizedPage(nullptr);
     rOutliner.SetControlWord(nOriginalControlWord);