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

More debugging; fixed Font::IsTransparent

Browse Source 
Change-Id: Idcb54408dd3cf6561b78eb28fdb409d2e31df541
(cherry picked from commit d84dba8b01c1f240f22b774c951ebf206d5a3ac9)
This commit is contained in:
matteocam
2014-06-06 15:14:52 -04:00
committed by Fridrich Štrba
parent 13ed85d1ab
commit ae915ba34f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vcl/outdev.hxx
View File

@@ -1040,7 +1040,7 @@ public:
void SetTextFillColor(); void SetTextFillColor();
void SetTextFillColor( const Color& rColor ); void SetTextFillColor( const Color& rColor );
Color GetTextFillColor() const; Color GetTextFillColor() const;
bool IsTextFillColor() const { return return !maFont.IsTransparent(); } bool IsTextFillColor() const { return !maFont.IsTransparent(); }
void SetTextLineColor(); void SetTextLineColor();
void SetTextLineColor( const Color& rColor ); void SetTextLineColor( const Color& rColor );

8
vcl/source/outdev/text.cxx
View File

@@ -966,11 +966,11 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry, const sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen ) sal_Int32 nIndex, sal_Int32 nLen )
{ {
fprintf(stderr, "TextFillColor printing %c is (%d, %d, %d)\n", if ( maFont.IsTransparent() )
fprintf(stderr, "[Actually transparent font] Real color = %x\n", maFont.GetFillColor().GetColor() );
fprintf(stderr, "TextFillColor printing %c is %x\n",
(char) rStr.toChar(), (char) rStr.toChar(),
GetTextFillColor().GetRed(), GetTextFillColor().GetColor());
GetTextFillColor().GetGreen(),
GetTextFillColor().GetBlue());
if(nLen == 0x0FFFF) if(nLen == 0x0FFFF)
{ {