Kaydet (Commit) 103790ce authored tarafından László Németh's avatar László Németh Kaydeden (comit) Caolán McNamara

fix rendercontext rendering of toolbox

(cherry-picked from 751d697d)

Change-Id: I927a7ffdac278384ef102e6619f217daf24879a2
Reviewed-on: https://gerrit.libreoffice.org/16042Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d62bf7e0
...@@ -3095,7 +3095,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, ...@@ -3095,7 +3095,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId ); mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId );
mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos ); mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos );
} }
DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), DrawTextFlags::Mnemonic, pVector, pDisplayText ); rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), DrawTextFlags::Mnemonic, pVector, pDisplayText );
if (bClip) if (bClip)
rRenderContext.SetClipRegion(); rRenderContext.SetClipRegion();
rRenderContext.SetFont(aOldFont); rRenderContext.SetFont(aOldFont);
...@@ -3258,7 +3258,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, ...@@ -3258,7 +3258,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId ); mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId );
mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos ); mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos );
} }
DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText, rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText,
0, pItem->maText.getLength(), nTextStyle, pVector, pDisplayText ); 0, pItem->maText.getLength(), nTextStyle, pVector, pDisplayText );
if ( bRotate ) if ( bRotate )
SetFont( aOldFont ); SetFont( aOldFont );
......
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