diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-22 16:18:29 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:37 +0200 |
| commit | 039599e9d52461ea57a9690f847bbfe5bae6f3aa (patch) | |
| tree | 0ffd35df6c6c6f62202bee8cbc23773152b8b663 | |
| parent | d097bc8e156b50a4fd04dd82c42efa2921f0e886 (diff) | |
Put text filling in SvxFont
Change-Id: I290fff0cb66fc07122b976d977dff24ac491e108
(cherry picked from commit ea56441757a34082b9ffc5f28936413fcb55e31a)
| -rw-r--r-- | editeng/source/items/svxfont.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 895eef60291c..e9f2a710623f 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 2f3303bae8fb..52c05374d543 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 ) |