Kaydet (Commit) 039599e9 authored tarafından matteocam's avatar matteocam Kaydeden (comit) Fridrich Štrba

Put text filling in SvxFont

Change-Id: I290fff0cb66fc07122b976d977dff24ac491e108
(cherry picked from commit ea564417)
üst d097bc8e
...@@ -457,9 +457,16 @@ void SvxFont::QuickDrawText( OutputDevice *pOut, ...@@ -457,9 +457,16 @@ void SvxFont::QuickDrawText( OutputDevice *pOut,
const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Int32* pDXArray ) const 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... // Font has to be selected in OutputDevice...
if ( !IsCaseMap() && !IsCapital() && !IsKern() && !IsEsc() ) if ( !IsCaseMap() && !IsCapital() && !IsKern() && !IsEsc() )
{ {
// set right background
if ( HasBackgroundColor() ) {
Color aColor = COL_RED;
pOut->SetTextFillColor(aColor);
}
pOut->DrawTextArray( rPos, rTxt, pDXArray, nIdx, nLen ); pOut->DrawTextArray( rPos, rTxt, pDXArray, nIdx, nLen );
return; return;
} }
......
...@@ -288,6 +288,7 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, ...@@ -288,6 +288,7 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout,
if( ImplDrawRotateText( rSalLayout ) ) if( ImplDrawRotateText( rSalLayout ) )
return true; return true;
long nOldX = rSalLayout.DrawBase().X(); long nOldX = rSalLayout.DrawBase().X();
if( HasMirroredGraphics() ) if( HasMirroredGraphics() )
{ {
...@@ -330,10 +331,6 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, ...@@ -330,10 +331,6 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout,
maFont.GetStrikeout(), maFont.GetUnderline(), maFont.GetOverline(), maFont.GetStrikeout(), maFont.GetUnderline(), maFont.GetOverline(),
maFont.IsWordLineMode(), ImplIsUnderlineAbove( maFont ) ); maFont.IsWordLineMode(), ImplIsUnderlineAbove( maFont ) );
// draw background
if ( bTextBkg ) {
}
// emphasis marks // emphasis marks
if( maFont.GetEmphasisMark() & EMPHASISMARK_STYLE ) if( maFont.GetEmphasisMark() & EMPHASISMARK_STYLE )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment