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

[matteocam]

 editeng/source/items/svxfont.cxx |    7 +++++++
 vcl/source/outdev/text.cxx       |    5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit ea56441757a34082b9ffc5f28936413fcb55e31a
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu May 22 16:18:29 2014 -0400

    Put text filling in SvxFont
    
    Change-Id: I290fff0cb66fc07122b976d977dff24ac491e108

diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 895eef6..e9f2a71 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -457,9 +457,16 @@ void SvxFont::QuickDrawText( OutputDevice *pOut,
     const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Int32* pDXArray ) const
 {
 
+    fprintf(stderr, "About to print %s\n", rTxt.getStr());
+
     // Font has to be selected in OutputDevice...
     if ( !IsCaseMap() && !IsCapital() && !IsKern() && !IsEsc() )
     {
+    // set right background
+    if ( HasBackgroundColor() ) {
+        Color aColor = COL_RED;
+        pOut->SetTextFillColor(aColor);
+    }
         pOut->DrawTextArray( rPos, rTxt, pDXArray, nIdx, nLen );
         return;
     }
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 90da4db..eea1569 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -288,6 +288,7 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout,
         if( ImplDrawRotateText( rSalLayout ) )
             return true;
 
+
     long nOldX = rSalLayout.DrawBase().X();
     if( HasMirroredGraphics() )
     {
@@ -330,10 +331,6 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout,
             maFont.GetStrikeout(), maFont.GetUnderline(), maFont.GetOverline(),
             maFont.IsWordLineMode(), ImplIsUnderlineAbove( maFont ) );
 
-    // draw background
-    if ( bTextBkg ) {
-
-    }
 
     // emphasis marks
     if( maFont.GetEmphasisMark() & EMPHASISMARK_STYLE )