mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhbz#1728763 black bg seen in renderer emfs

Browse Source 
back in 5-4 series FWIW, since...

commit a3c95ec453
Author: Caolán McNamara <caolanm@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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-07-23 10:36:21 +01:00
parent 04b7fdb567
commit ff706aa45c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cppcanvas/source/mtfrenderer/textaction.cxx
View File

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