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

[Maxim Monastirsky]

 framework/source/uielement/toolbarmanager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1745af7d0a4157ce370d5ef2243f766bd28b6155
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Jul 6 17:54:43 2015 +0300

    Set button size before updating the images
    
    So that the sub-toolbar controller will pick the
    right image size.
    
    Change-Id: I70b642ac84377b461a001ef11f551a5e1448c0f1

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ac02170..a6c0efd 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -325,6 +325,8 @@ void ToolBarManager::RefreshImages()
     SolarMutexGuard g;
 
     bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
+    m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : TOOLBOX_BUTTONSIZE_SMALL );
+
     for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
         sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
@@ -355,7 +357,6 @@ void ToolBarManager::RefreshImages()
         }
     }
 
-    m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : TOOLBOX_BUTTONSIZE_SMALL );
     ::Size aSize = m_pToolBar->CalcWindowSizePixel();
     m_pToolBar->SetOutputSizePixel( aSize );
 }