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

[Maxim Monastirsky (via logerrit)]

 framework/source/uielement/menubarmanager.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 03fe80f43c8210c81a41b84bbf5dc7ad17b2a6b2
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Wed Aug 26 17:14:48 2020 +0300
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Thu Aug 27 21:28:16 2020 +0200

    Command icon changes not reflected in menus
    
    Regression of commit 7383ab517030db0c2d7bf4f393f38743fbcaba04
    ("loplugin:constantparam in f*").
    
    To reproduce from UI:
    
    1. Start Writer with gen.
    2. Open the File menu at least once (so m_bRetrieveImages set to false).
    3. Right click on the Standard toolbar > Customize Toolbar...
    4. Right click the Open toolbar button > Change Icon..., pick some new
    icon, and confirm the changes.
    5. Open the File menu and notice that the Open... item there still has
    the old icon.
    
    Change-Id: I89ba87aafc56192dc150741244d5cd7c6f7923e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101443
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 21a4c82b731b..5359bc712f53 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -232,8 +232,7 @@ void SAL_CALL MenuBarManager::elementInserted( const css::ui::ConfigurationEvent
         return;
 
     sal_Int16 nImageType = sal_Int16();
-    if (( Event.aInfo >>= nImageType ) &&
-        ( nImageType == css::ui::ImageType::SIZE_LARGE ))
+    if (( Event.aInfo >>= nImageType ) && nImageType == 0 )
         RequestImages();
 }