|
 |
b5fb7d |
From de56e13f6ddc291f2039cab57e017e9e2dd67016 Mon Sep 17 00:00:00 2001
|
|
|
b5fb7d |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
b5fb7d |
Date: Tue, 23 Jul 2019 10:38:09 +0100
|
|
|
b5fb7d |
Subject: [PATCH] rhbz#1728763 bg of blocks is black
|
|
|
b5fb7d |
|
|
|
b5fb7d |
Change-Id: I31a331c8ada44b6d1424d122b54cbbe91cc8c221
|
|
|
b5fb7d |
---
|
|
|
b5fb7d |
cppcanvas/source/mtfrenderer/emfplus.cxx | 4 ++--
|
|
|
b5fb7d |
cppcanvas/source/mtfrenderer/textaction.cxx | 11 ++++++++++-
|
|
|
b5fb7d |
2 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
b5fb7d |
|
|
|
b5fb7d |
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
b5fb7d |
index 5a9076e82a0f..8b2059a8d187 100644
|
|
|
b5fb7d |
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
b5fb7d |
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
b5fb7d |
@@ -1305,7 +1305,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
::Color(),
|
|
|
b5fb7d |
::Size(),
|
|
|
b5fb7d |
::Color(),
|
|
|
b5fb7d |
- ::Color(),
|
|
|
b5fb7d |
+ ::Color(COL_AUTO),
|
|
|
b5fb7d |
text,
|
|
|
b5fb7d |
0,
|
|
|
b5fb7d |
stringLength,
|
|
|
b5fb7d |
@@ -1621,7 +1621,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
::Color(),
|
|
|
b5fb7d |
::Size(),
|
|
|
b5fb7d |
::Color(),
|
|
|
b5fb7d |
- ::Color(),
|
|
|
b5fb7d |
+ ::Color(COL_AUTO),
|
|
|
b5fb7d |
text,
|
|
|
b5fb7d |
0,
|
|
|
b5fb7d |
glyphsCount,
|
|
|
b5fb7d |
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
|
|
|
b5fb7d |
index ad38d6c8a131..0bb23720b6a5 100644
|
|
|
b5fb7d |
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
|
|
|
b5fb7d |
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
|
|
|
b5fb7d |
@@ -766,6 +766,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
const ::Color& rReliefColor,
|
|
|
b5fb7d |
const ::basegfx::B2DSize& rShadowOffset,
|
|
|
b5fb7d |
const ::Color& rShadowColor,
|
|
|
b5fb7d |
+ const ::Color& rTextFillColor,
|
|
|
b5fb7d |
const OUString& rText,
|
|
|
b5fb7d |
sal_Int32 nStartPos,
|
|
|
b5fb7d |
sal_Int32 nLen,
|
|
|
b5fb7d |
@@ -778,6 +779,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
const ::Color& rReliefColor,
|
|
|
b5fb7d |
const ::basegfx::B2DSize& rShadowOffset,
|
|
|
b5fb7d |
const ::Color& rShadowColor,
|
|
|
b5fb7d |
+ const ::Color& rTextFillColor,
|
|
|
b5fb7d |
const OUString& rText,
|
|
|
b5fb7d |
sal_Int32 nStartPos,
|
|
|
b5fb7d |
sal_Int32 nLen,
|
|
|
b5fb7d |
@@ -834,6 +836,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
const ::Color& rReliefColor,
|
|
|
b5fb7d |
const ::basegfx::B2DSize& rShadowOffset,
|
|
|
b5fb7d |
const ::Color& rShadowColor,
|
|
|
b5fb7d |
+ const ::Color& rTextFillColor,
|
|
|
b5fb7d |
const OUString& rText,
|
|
|
b5fb7d |
sal_Int32 nStartPos,
|
|
|
b5fb7d |
sal_Int32 nLen,
|
|
|
b5fb7d |
@@ -852,6 +855,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
maReliefColor( rReliefColor ),
|
|
|
b5fb7d |
maShadowOffset( rShadowOffset ),
|
|
|
b5fb7d |
maShadowColor( rShadowColor ),
|
|
|
b5fb7d |
+ maTextFillColor( rTextFillColor ),
|
|
|
b5fb7d |
maTextDirection( rState.textDirection )
|
|
|
b5fb7d |
{
|
|
|
b5fb7d |
initEffectLinePolyPolygon( maLinesOverallSize,
|
|
|
b5fb7d |
@@ -873,6 +877,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
const ::Color& rReliefColor,
|
|
|
b5fb7d |
const ::basegfx::B2DSize& rShadowOffset,
|
|
|
b5fb7d |
const ::Color& rShadowColor,
|
|
|
b5fb7d |
+ const ::Color& rTextFillColor,
|
|
|
b5fb7d |
const OUString& rText,
|
|
|
b5fb7d |
sal_Int32 nStartPos,
|
|
|
b5fb7d |
sal_Int32 nLen,
|
|
|
b5fb7d |
@@ -892,6 +897,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
maReliefColor( rReliefColor ),
|
|
|
b5fb7d |
maShadowOffset( rShadowOffset ),
|
|
|
b5fb7d |
maShadowColor( rShadowColor ),
|
|
|
b5fb7d |
+ maTextFillColor( rTextFillColor ),
|
|
|
b5fb7d |
maTextDirection( rState.textDirection )
|
|
|
b5fb7d |
{
|
|
|
b5fb7d |
initEffectLinePolyPolygon( maLinesOverallSize,
|
|
|
b5fb7d |
@@ -2196,7 +2202,8 @@ namespace cppcanvas
|
|
|
b5fb7d |
!rState.textUnderlineStyle &&
|
|
|
b5fb7d |
!rState.textStrikeoutStyle &&
|
|
|
b5fb7d |
rReliefColor == aEmptyColor &&
|
|
|
b5fb7d |
- rShadowColor == aEmptyColor )
|
|
|
b5fb7d |
+ rShadowColor == aEmptyColor &&
|
|
|
b5fb7d |
+ rTextFillColor == aEmptyColor )
|
|
|
b5fb7d |
{
|
|
|
b5fb7d |
// nope
|
|
|
b5fb7d |
if( rParms.maTextTransformation.is_initialized() )
|
|
|
b5fb7d |
@@ -2231,6 +2238,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
rReliefColor,
|
|
|
b5fb7d |
aShadowOffset,
|
|
|
b5fb7d |
rShadowColor,
|
|
|
b5fb7d |
+ rTextFillColor,
|
|
|
b5fb7d |
rText,
|
|
|
b5fb7d |
nStartPos,
|
|
|
b5fb7d |
nLen,
|
|
|
b5fb7d |
@@ -2245,6 +2253,7 @@ namespace cppcanvas
|
|
|
b5fb7d |
rReliefColor,
|
|
|
b5fb7d |
aShadowOffset,
|
|
|
b5fb7d |
rShadowColor,
|
|
|
b5fb7d |
+ rTextFillColor,
|
|
|
b5fb7d |
rText,
|
|
|
b5fb7d |
nStartPos,
|
|
|
b5fb7d |
nLen,
|
|
|
b5fb7d |
--
|
|
|
b5fb7d |
2.21.0
|
|
|
b5fb7d |
|