Kaydet (Commit) 55369420 authored tarafından Caolán McNamara's avatar Caolán McNamara

stop unbalanced OutputDevice Push/Pop warnings on closing help

where it takes the early GetBackColor return after Push but before Pop

Change-Id: I5fac78b7270c8561cb8e7d26bd2bff44628c8547
üst 0921642e
...@@ -1182,17 +1182,22 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const ...@@ -1182,17 +1182,22 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
// #i16816# tagged pdf support // #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pTmpOut ); SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pTmpOut );
pTmpOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); Color aFillColor;
if( m_pFnt->GetHighlightColor() != COL_TRANSPARENT ) if( m_pFnt->GetHighlightColor() != COL_TRANSPARENT )
{ {
pTmpOut->SetFillColor( m_pFnt->GetHighlightColor() ); aFillColor = m_pFnt->GetHighlightColor();
} }
else else
{ {
if( !m_pFnt->GetBackColor() ) return; if( !m_pFnt->GetBackColor() )
pTmpOut->SetFillColor( *m_pFnt->GetBackColor() ); return;
aFillColor = *m_pFnt->GetBackColor();
} }
pTmpOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
pTmpOut->SetFillColor(aFillColor);
pTmpOut->SetLineColor(); pTmpOut->SetLineColor();
DrawRect( aIntersect, sal_True, sal_False ); DrawRect( aIntersect, sal_True, sal_False );
......
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