User: kz Date: 06/01/05 10:02:20 Modified: /dba/dbaccess/source/ui/misc/ ToolBoxHelper.cxx
Log: INTEGRATION: CWS iconswitching1 (1.3.378); FILE MERGED 2005/11/01 16:03:27 kendy 1.3.378.2: RESYNC: (1.3-1.5); FILE MERGED 2005/07/20 13:48:36 kendy 1.3.378.1: #i36518# Cleanup after cutnpaste in CWS oooicons File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: ToolBoxHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/ToolBoxHelper.cxx?r1=1.5&r2=1.6 Delta lines: +9 -28 -------------------- --- ToolBoxHelper.cxx 23 Sep 2005 12:38:14 -0000 1.5 +++ ToolBoxHelper.cxx 5 Jan 2006 18:02:18 -0000 1.6 @@ -61,11 +61,11 @@ OToolBoxHelper::OToolBoxHelper() : m_bIsHiContrast(sal_False) ,m_pToolBox(NULL) - ,m_nBitmapSet(-1 ) + ,m_nSymbolsSize(-1 ) { DBG_CTOR(OToolBoxHelper,NULL); - OSL_ENSURE(m_nBitmapSet != getCurrentSymbolSet(),"BitmapSet should not be identical"); + OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical"); SvtMiscOptions().AddListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); } @@ -74,42 +74,23 @@ { SvtMiscOptions().RemoveListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); - DBG_DTOR(OToolBoxHelper,NULL); } - // ----------------------------------------------------------------------------- - sal_Int16 OToolBoxHelper::getCurrentSymbolSet() - { - sal_Int16 eOptSymbolSet = SvtMiscOptions().GetSymbolSet(); - - if ( eOptSymbolSet == SFX_SYMBOLS_AUTO ) - { - // Use system settings, we have to retrieve the toolbar icon size from the - // Application class - ULONG nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); - if ( nStyleIconSize == STYLE_TOOLBAR_ICONSIZE_LARGE ) - eOptSymbolSet = SFX_SYMBOLS_LARGE; - else - eOptSymbolSet = SFX_SYMBOLS_SMALL; - } - - return eOptSymbolSet; - } // ----------------------------------------------------------------------------- void OToolBoxHelper::checkImageList() { if ( m_pToolBox ) { - sal_Int16 nCurBitmapSet = getCurrentSymbolSet(); - if ( nCurBitmapSet != m_nBitmapSet || + sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); + if ( nCurSymbolsSize != m_nSymbolsSize || m_bIsHiContrast != m_pToolBox->GetBackground().GetColor().IsDark() ) { - m_nBitmapSet = nCurBitmapSet; + m_nSymbolsSize = nCurSymbolsSize; m_bIsHiContrast = m_pToolBox->GetBackground().GetColor().IsDark(); - m_pToolBox->SetImageList( ModuleRes( getImageListId(m_nBitmapSet,m_bIsHiContrast) ) ); + m_pToolBox->SetImageList( ModuleRes( getImageListId(m_nSymbolsSize,m_bIsHiContrast) ) ); Size aTbOldSize = m_pToolBox->GetSizePixel(); adjustToolBoxSize(m_pToolBox); Size aTbNewSize = m_pToolBox->GetSizePixel(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
