editeng/source/editeng/editattr.cxx | 2 ++ vcl/source/outdev/text.cxx | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)
New commits: commit 0b8fe9834b398db7550f30718b3cb63860c6165d Author: matteocam <matteo.campane...@gmail.com> Date: Mon Jun 2 10:43:34 2014 -0400 Minor changes. Change-Id: I3b8c51690eb14601435653e9a2255a5c6ed4fd7e diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 2447ffa..7d60300 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -134,6 +134,8 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) /* FIXME(matteocam) */ rFont.SetFillColor(aColor); // XXX: alone it works but it set it white (vcl causing troubes?) + //if (pOutDev) + // pOutDev->SetTextFillColor(aColor); // this doesn't work either // end FIXME if ( pOutDev ) diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 9ea716d2..fb2a89d 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -766,7 +766,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) // FIXME(matteocam) if ( rColor.GetRed() == 0x66 ) { // component of the blue I use fprintf(stderr, "OutputDevice::SetTextFillColor(Color &): called with (%d, %d, %d)\n", - rColor.GetRed(), rColor.GetBlue(), rColor.GetGreen()); + rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue()); } // end modified code commit 1441ae75b005b4ff1ae2683755a12c5813a3a6b3 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Jun 2 10:34:40 2014 -0400 Debugging output in OutputDevice::SetTextFillColor Change-Id: I78a75a94e4012eded1a4a5b4c36d8b399a4dda6c diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 130e112..9ea716d2 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -741,8 +741,15 @@ void OutputDevice::SetTextFillColor() if ( mpMetaFile ) mpMetaFile->AddAction( new MetaTextFillColorAction( Color(), false ) ); - if ( maFont.GetColor() != Color( COL_TRANSPARENT ) ) + if ( maFont.GetColor() != Color( COL_TRANSPARENT ) ) { + // FIXME(matteocam) + Color aColor = maFont.GetColor(); + if (aColor.GetRed() == 0x66) { + fprintf(stderr, "OutputDevice::SetTextFillColor() changing blue to transparent\n "); + } + // end modified code maFont.SetFillColor( Color( COL_TRANSPARENT ) ); + } if ( !maFont.IsTransparent() ) maFont.SetTransparent( true ); @@ -756,6 +763,14 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) Color aColor( rColor ); bool bTransFill = ImplIsColorTransparent( aColor ); + // FIXME(matteocam) + if ( rColor.GetRed() == 0x66 ) { // component of the blue I use + fprintf(stderr, "OutputDevice::SetTextFillColor(Color &): called with (%d, %d, %d)\n", + rColor.GetRed(), rColor.GetBlue(), rColor.GetGreen()); + } + + // end modified code + if ( !bTransFill ) { if ( mnDrawMode & ( DRAWMODE_BLACKFILL | DRAWMODE_WHITEFILL | _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits