[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - include/vcl vcl/source

[matteocam]

 include/vcl/outdev.hxx     |    2 +-
 vcl/source/outdev/text.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d84dba8b01c1f240f22b774c951ebf206d5a3ac9
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jun 6 15:14:52 2014 -0400

    More debugging; fixed Font::IsTransparent
    
    Change-Id: Idcb54408dd3cf6561b78eb28fdb409d2e31df541

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3c3be7c..24277ff 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1042,7 +1042,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 fb2a89d..7a587a6 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)
     {