summaryrefslogtreecommitdiff
path: root/sfx2/source/toolbox/tbxitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/toolbox/tbxitem.cxx')
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 6209a3d312..2af713c30c 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1522,7 +1522,6 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId
// Determine the current background color of the menus
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
- m_bWasHiContrastMode = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
SetImage( String() );
@@ -1647,11 +1646,10 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
aURL = sFallback;
BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
- BOOL bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
- Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC );
+ Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig );
if ( !aImage )
aImage = !!aMenuImage ? aMenuImage :
- SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig, bHC );
+ SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig );
Size aBigSize( GetToolBox().GetDefaultImageSize() );
if ( bBig && aImage.GetSizePixel() != aBigSize )
{
@@ -1798,15 +1796,12 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( nSymbolsStyle != m_nSymbolsStyle ) ||
- ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
( bShowMenuImages != m_bShowMenuImages ))
{
m_nSymbolsStyle = nSymbolsStyle;
- m_bWasHiContrastMode = bIsHiContrastMode;
m_bShowMenuImages = bShowMenuImages;
USHORT nCount = pActMenu->GetItemCount();
@@ -1828,7 +1823,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
if ( aImageId.getLength() > 0 )
{
Reference< ::com::sun::star::frame::XFrame > xFrame;
- Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+ Image aImage = GetImage( xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -1840,7 +1835,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
if ( !bImageSet && aCmd.Len() )
{
Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+ INetURLObject(aCmd), FALSE );
if ( !!aImage )
pActMenu->SetItemImage( nId, aImage );
}