[Libreoffice-commits] core.git: vcl/source

Keith Curtis keithcu at gmail.com
Fri May 25 14:30:40 UTC 2018


 vcl/source/window/toolbox2.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 758d2099ae281e270ef014711b693580ab27206b
Author: Keith Curtis <keithcu at gmail.com>
Date:   Tue May 22 03:35:37 2018 -0400

    Remove unnecessary code from ae37972cd25117d467d34ee8591c21dcbb5a0fec
    
    Git commit: ae37972cd25117d467d34ee8591c21dcbb5a0fec added some logic at
    the bottom to call Toolbox::SetItemImage to trigger the bitmap doubling
    code. This is no longer needed and is faster without.
    
    Change-Id: I0fb0538000d5616cb8d8a0ae35e15fb09cdf2c59
    Reviewed-on: https://gerrit.libreoffice.org/54654
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index de0faecfa607..cc86b0d9a0f9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -373,7 +373,6 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBi
     // create item and add to list
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
                              ImplToolItem( nItemId, rImage, nBits ) );
-    SetItemImage(nItemId, rImage);
     mpData->ImplClearLayoutData();
 
     ImplInvalidate( true );
@@ -393,7 +392,6 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUStrin
     // create item and add to list
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
                              ImplToolItem( nItemId, rImage, MnemonicGenerator::EraseAllMnemonicChars(rText), nBits ) );
-    SetItemImage(nItemId, rImage);
     mpData->ImplClearLayoutData();
 
     ImplInvalidate( true );


More information about the Libreoffice-commits mailing list