summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatteocam <matteo.campanelli@gmail.com>2014-06-06 15:14:52 -0400
committerFridrich Štrba <fridrich.strba@bluewin.ch>2014-06-30 22:54:42 +0200
commitae915ba34f6b721b81747e7b90a46e1133d5238e (patch)
tree795580cc84f9fc3e03321e95c47073f5981f49fc
parent13ed85d1ab5b60df45d88c823e584acf94b83527 (diff)
More debugging; fixed Font::IsTransparent
Change-Id: Idcb54408dd3cf6561b78eb28fdb409d2e31df541 (cherry picked from commit d84dba8b01c1f240f22b774c951ebf206d5a3ac9)
-rw-r--r--include/vcl/outdev.hxx2
-rw-r--r--vcl/source/outdev/text.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e3507616be59..278a7e641e5c 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1040,7 +1040,7 @@ public:
void SetTextFillColor();
void SetTextFillColor( const Color& rColor );
Color GetTextFillColor() const;
- bool IsTextFillColor() const { return return !maFont.IsTransparent(); }
+ bool IsTextFillColor() const { return !maFont.IsTransparent(); }
void SetTextLineColor();
void SetTextLineColor( const Color& rColor );
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 397bc5efd458..3fd6500f7951 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -966,11 +966,11 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry,
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(),
- GetTextFillColor().GetRed(),
- GetTextFillColor().GetGreen(),
- GetTextFillColor().GetBlue());
+ GetTextFillColor().GetColor());
if(nLen == 0x0FFFF)
{