[Libreoffice-commits] core.git: cppcanvas/source

[Caolán McNamara (via logerrit)]

 cppcanvas/source/mtfrenderer/textaction.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit ff706aa45cc41fb71b31a8c648b08cf3f1669c7e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 23 10:36:21 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 23 17:16:38 2019 +0200

    rhbz#1728763 black bg seen in renderer emfs
    
    back in 5-4 series FWIW, since...
    
    commit a3c95ec45397b146c86a3fa44445c763de99d3a3
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Jun 11 09:00:46 2018 +0100
    
        rhbz#1589029 tdf#93789 impress not showing text highlight in presentation mode
    
    Change-Id: I8412854cd32af73cf2512db8c424d56ed84d9c1e
    Reviewed-on: https://gerrit.libreoffice.org/76153
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 04f37560bfad..066cbb60f242 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -755,6 +755,7 @@ namespace cppcanvas
                                   const ::Color&             rReliefColor,
                                   const ::basegfx::B2DSize&  rShadowOffset,
                                   const ::Color&             rShadowColor,
+                                  const ::Color&             rTextFillColor,
                                   const OUString&     rText,
                                   sal_Int32                  nStartPos,
                                   sal_Int32                  nLen,
@@ -767,6 +768,7 @@ namespace cppcanvas
                                   const ::Color&                    rReliefColor,
                                   const ::basegfx::B2DSize&         rShadowOffset,
                                   const ::Color&                    rShadowColor,
+                                  const ::Color&                    rTextFillColor,
                                   const OUString&            rText,
                                   sal_Int32                         nStartPos,
                                   sal_Int32                         nLen,
@@ -822,6 +824,7 @@ namespace cppcanvas
                                                 const ::Color&             rReliefColor,
                                                 const ::basegfx::B2DSize&  rShadowOffset,
                                                 const ::Color&             rShadowColor,
+                                                const ::Color&             rTextFillColor,
                                                 const OUString&     rText,
                                                 sal_Int32                  nStartPos,
                                                 sal_Int32                  nLen,
@@ -839,6 +842,7 @@ namespace cppcanvas
                 maReliefColor( rReliefColor ),
                 maShadowOffset( rShadowOffset ),
                 maShadowColor( rShadowColor ),
+                maTextFillColor( rTextFillColor ),
                 maTextDirection( rState.textDirection )
             {
                 const double nLineWidth(getLineWidth( rVDev, rState, maStringContext ));
@@ -861,6 +865,7 @@ namespace cppcanvas
                                                 const ::Color&                  rReliefColor,
                                                 const ::basegfx::B2DSize&       rShadowOffset,
                                                 const ::Color&                  rShadowColor,
+                                                const ::Color&                  rTextFillColor,
                                                 const OUString&          rText,
                                                 sal_Int32                       nStartPos,
                                                 sal_Int32                       nLen,
@@ -879,6 +884,7 @@ namespace cppcanvas
                 maReliefColor( rReliefColor ),
                 maShadowOffset( rShadowOffset ),
                 maShadowColor( rShadowColor ),
+                maTextFillColor( rTextFillColor ),
                 maTextDirection( rState.textDirection )
             {
                 const double nLineWidth( getLineWidth( rVDev, rState, maStringContext ) );
@@ -2181,7 +2187,8 @@ namespace cppcanvas
                     !rState.textUnderlineStyle &&
                     !rState.textStrikeoutStyle &&
                     rReliefColor == aEmptyColor &&
-                    rShadowColor == aEmptyColor )
+                    rShadowColor == aEmptyColor &&
+                    rTextFillColor == aEmptyColor )
                 {
                     // nope
                     if( rParms.maTextTransformation.is_initialized() )
@@ -2216,6 +2223,7 @@ namespace cppcanvas
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
+                                                    rTextFillColor,
                                                     rText,
                                                     nStartPos,
                                                     nLen,
@@ -2230,6 +2238,7 @@ namespace cppcanvas
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
+                                                    rTextFillColor,
                                                     rText,
                                                     nStartPos,
                                                     nLen,