[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[László Németh]

 vcl/source/window/toolbox.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 103790cefe77c7aa46c9177b91997b1342a65d67
Author: László Németh <laszlo.nem...@collabora.com>
Date:   Tue Jun 2 18:08:36 2015 +0200

    fix rendercontext rendering of toolbox
    
    (cherry-picked from 751d697db61341a481178b86c6b28efa7d3c7d64)
    
    Change-Id: I927a7ffdac278384ef102e6619f217daf24879a2
    Reviewed-on: https://gerrit.libreoffice.org/16042
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e179501..f79fa80 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -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_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)
             rRenderContext.SetClipRegion();
         rRenderContext.SetFont(aOldFont);
@@ -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_aLineItemPositions.push_back( nPos );
         }
-        DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText,
+        rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), 
pItem->maText,
                       0, pItem->maText.getLength(), nTextStyle, pVector, 
pDisplayText );
         if ( bRotate )
             SetFont( aOldFont );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits