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

matteocam matteo.campanelli at gmail.com
Sat May 31 01:47:32 PDT 2014


 editeng/source/editeng/editattr.cxx |    2 +-
 vcl/source/gdi/font.cxx             |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4b2d62f02a386013d0004058a02fed80eb8df675
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Sat May 31 04:46:44 2014 -0400

    Debugging output
    
    Change-Id: I4e9418746ad50e1bdb1336459c00a4cf614e2350

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 2eba576..2447ffa 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -133,7 +133,7 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
     rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() );
 
     /* FIXME(matteocam) */
-    rFont.SetFillColor(aColor);
+    rFont.SetFillColor(aColor); // XXX: alone it works but it set it white (vcl causing troubes?)
     // end FIXME
 
     if ( pOutDev )
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 616fb61..f223d7b 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -299,11 +299,15 @@ void Font::SetFillColor( const Color& rColor )
     mpImplFont->maFillColor = rColor;
     if ( rColor.GetTransparency() )
         mpImplFont->mbTransparent = true;
+    if (GetUnderline() == UNDERLINE_SINGLE ) {
+        fprintf(stderr, "I'm setting a filling (from Font) of (%d,%d,%d) \n",
+            rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
+    }
 }
 
 void Font::SetBackgroundColor(const Color& rColor)
 {
-    // FIXME
+    // FIXME(matteocam)
     //MakeUnique();
     /*mpImplFont->maBkgColor = rColor;
     if () */


More information about the Libreoffice-commits mailing list