HC Cleanup - libs-core

24 files changed, 116 insertions, 192 deletions

diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 1bd4d18249..27d0815f91 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -57,11 +57,6 @@ friend class SfxOrganizeDlg_Impl;
     Image					aOpenedDocBmp;
     Image					aClosedDocBmp;
 
-    Image					aOpenedFolderBmpHC;
-    Image					aClosedFolderBmpHC;
-    Image					aOpenedDocBmpHC;
-    Image					aClosedDocBmpHC;
-
     SfxOrganizeMgr*			pMgr;
     SfxOrganizeDlg_Impl*	pDlg;
 
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index c3120fd10a..37daa8d566 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,15 +54,15 @@ public:
 
                     // get images from resources
     void			SetImages( ToolBox& rToolBox );
-    void			SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
-    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
+    void			SetImages( ToolBox& rToolBox, BOOL bLarge );
+    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge );
 
-    Image           GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           GetImage( USHORT nId, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bHiContrast ) const;
+    Image           GetImage( USHORT nId, BOOL bLarge ) const;
+    Image           GetImage( USHORT nId) const;
+    Image           SeekImage( USHORT nId, BOOL bLarge ) const;
+    Image           SeekImage( USHORT nId ) const;
 };
 
-#endif 
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5b567c2c6f..617ab7fa5a 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -162,7 +162,7 @@ class SfxAppMenuControl_Impl : public SfxMenuControl
     BOOL		m_bShowMenuImages;
 
 protected:
-    DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+    DECL_LINK( Activate, Menu * );
 
 public:
     SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 55be88a2dd..89528127b4 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -105,7 +105,6 @@ public:
     SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
     SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
-    SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 1940ee47aa..d9baf16824 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,13 +63,6 @@ protected:
     virtual void	Paint( const Rectangle& rRect );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
-    /** state whether a system setting for high contrast should be evaluated
-        and taken into account for this window.
-
-        The default implementation uses the accessibility option IsForDrawings
-      */
-    virtual bool    UseHighContrastSetting() const;
-
 public:
     SfxPreviewWin( Window* pParent,
                    const ResId& rResId,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index f9eb6aebb5..565a241031 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -552,17 +552,22 @@ public:
     virtual void                SetOrganizerSearchMask(
                                     SfxStyleSheetBasePool* ) const;
 
+    virtual sal_uInt16 			GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
+
+    virtual sal_Bool   			CanHaveChilds(
+                                        sal_uInt16 nIdx1,
+                                        sal_uInt16 nIdx2 = INDEX_IGNORE
+                                );
 
-    sal_uInt16                  GetContentCount(sal_uInt16 nIdx);
-    bool                        CanHaveChilds( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
-    void                        GetContent( String &,
+    virtual void   				GetContent( String &,
                                         Bitmap &rClosedBitmap,
                                         Bitmap &rOpenedBitmap,
-                                        bool &bCanDelete,
+                                        sal_Bool   &bCanDelete,
                                         sal_uInt16 nPos,
-                                        sal_uInt16 nIdx1 );
+                                        sal_uInt16 nIdx1
+                                );
 
-    void                TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2);
+    virtual void                TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
 
     virtual Bitmap 				GetStyleFamilyBitmap(SfxStyleFamily eFamily);
 
@@ -592,10 +597,6 @@ public:
                                 // F"ur Docs, die zum Formatieren die Viewgr"o\se
                                 // ben"otigen
     virtual SfxObjectShell* 	GetObjectShell();
-    //void                        SetBaseURL( const String& rURL );
-    //const String&               GetBaseURL() const;
-    //const String&               GetBaseURLForSaving() const;
-    //void                        SetEmptyBaseURL();
 
     virtual SfxFrame*      		GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
 
@@ -639,7 +640,6 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
 
-//REMOVE		void SetFileName( const ::rtl::OUString& );
     SvGlobalName    GetClassName() const;
 
     // comphelper::IEmbeddedHelper
@@ -700,7 +700,7 @@ public:
 
     // =================================
 
-    SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
+    SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const;
 
     SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
 
@@ -786,8 +786,8 @@ public:
     SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
-        ImplAnalyzeSignature( 
-            sal_Bool bScriptingContent, 
+        ImplAnalyzeSignature(
+            sal_Bool bScriptingContent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
                 = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
 
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 797c53833c..7a4614d7cf 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -105,7 +105,7 @@ public:
         @return
             <TRUE/> if an image list for the requested mode could be found in the given resource.
     */
-    sal_Bool	updateImages( const ResId& _rId, const BmpColorMode _eMode );
+    sal_Bool	updateImages( const ResId& _rId );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index c87e279296..61b522ffe6 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,6 @@ class SfxUnoControllerItem;
 
 svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & );
 typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
 
 struct SfxTbxCtrlFactory
@@ -367,7 +366,7 @@ protected:
     virtual void            Select( BOOL );
     virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindow* CreatePopupWindow();
-                            DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+                            DECL_LINK( Activate, Menu * );
 private:
     String                  aLastURL;
     BOOL					bBigImages;
@@ -423,7 +422,7 @@ protected:
     using SfxToolBoxControl::Select;
     virtual void            Select( BOOL );
     virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-                            DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+                            DECL_LINK( Activate, Menu * );
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
                             SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d284d8454c..474d1a59dc 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 94b47535dd..569c14c815 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,11 @@ typedef std::hash_map< ::rtl::OUString,
                        ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
 
 
-Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig )
+Image SAL_CALL GetImage(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+)
 {
     // TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
     if ( !rFrame.is() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 39661f9eb0..ef3f93432f 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -66,12 +66,10 @@ public:
     SfxChildWinFactArr_Impl*	pFactArr;
     ImageList*                  pImgListSmall;
     ImageList*                  pImgListBig;
-    ImageList*					pImgListHiSmall;
-    ImageList*					pImgListHiBig;
 
                                 SfxModule_Impl();
                                 ~SfxModule_Impl();
-    ImageList*                  GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE );
+    ImageList*                  GetImageList( ResMgr* pResMgr, BOOL bBig );
 };
 
 SfxModule_Impl::SfxModule_Impl()
@@ -88,14 +86,11 @@ SfxModule_Impl::~SfxModule_Impl()
     delete pFactArr;
     delete pImgListSmall;
     delete pImgListBig;
-    delete pImgListHiSmall;
-    delete pImgListHiBig;
 }
 
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig )
 {
-    ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig   : pImgListBig   ) :
-                                ( bHiContrast ? pImgListHiSmall : pImgListSmall );
+    ImageList*& rpList = bBig ? pImgListBig : pImgListSmall;
     if ( !rpList )
     {
         ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr );
@@ -128,16 +123,7 @@ ResMgr* SfxModule::GetResMgr()
 }
 
 //====================================================================
-/*
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
-                      SfxObjectFactory* pFactoryP )
-    : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
-{
-    Construct_Impl();
-    if ( pFactoryP )
-        pFactoryP->SetModule_Impl( this );
-}
-*/
+
 SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
                       SfxObjectFactory* pFactoryP, ... )
     : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
@@ -168,8 +154,6 @@ void SfxModule::Construct_Impl()
         pImpl->pFactArr=0;
         pImpl->pImgListSmall=0;
         pImpl->pImgListBig=0;
-        pImpl->pImgListHiSmall=0;
-        pImpl->pImgListHiBig=0;
 
         SetPool( &pApp->GetPool() );
     }
@@ -217,7 +201,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
     if (!pImpl->pFactArr)
         pImpl->pFactArr = new SfxChildWinFactArr_Impl;
 
-//#ifdef DBG_UTIL
     for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pImpl->pFactArr)[nFactory]->nId)
@@ -227,7 +210,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
             return;
         }
     }
-//#endif
 
     pImpl->pFactArr->C40_INSERT(
         SfxChildWinFactory, pFact, pImpl->pFactArr->Count() );
@@ -352,12 +334,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
 
 ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
 {
-    return pImpl->GetImageList( pResMgr, bBig, FALSE );
-}
-
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast )
-{
-    return pImpl->GetImageList( pResMgr, bBig, bHiContrast );
+    return pImpl->GetImageList( pResMgr, bBig );
 }
 
 SfxTabPage*	SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 3cacbea7f8..e3f547ca85 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -128,7 +128,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
 
     FreeResource();
 
-    updateImages( rResId, BMP_COLOR_NORMAL );
+    updateImages( rResId );
 }
 
 // -----------------------------------------------------------------------
@@ -149,7 +149,7 @@ SfxStyleFamilies::~SfxStyleFamilies()
 
 // -----------------------------------------------------------------------
 
-sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _eMode )
+sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
 {
     sal_Bool bSuccess = sal_False;
 
@@ -157,7 +157,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _
         ::svt::OLocalResourceAccess aLocalRes( _rId );
 
         // check if the image list is present
-        ResId aImageListId( (sal_uInt16)_eMode + 1, *_rId.GetResMgr() );
+        ResId aImageListId( (sal_uInt16) 1, *_rId.GetResMgr() );
         aImageListId.SetRT( RSC_IMAGELIST );
 
         if ( aLocalRes.IsAvailableRes( aImageListId ) )
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index fb78c239d9..d1de5e0aec 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -607,7 +607,7 @@ namespace sfx2
                 // assuming that nobody will insert hundreths of panels, a simple O(n) search should suffice here ...
                 while ( nPanelPos > 0 )
                 {
-                    const short nCompare = i_pPanelCompare->compareToolPanelsURLs( 
+                    const short nCompare = i_pPanelCompare->compareToolPanelsURLs(
                         *resource,
                         GetPanelResourceURL( --nPanelPos )
                     );
@@ -1011,7 +1011,7 @@ namespace sfx2
         if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
         {
             i_pToolBox->EndSelection();
-            
+
             ::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
             pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
 
@@ -1255,7 +1255,7 @@ namespace sfx2
             );
 
         pMenu->RemoveDisabledEntries( FALSE, FALSE );
-                
+
         return pMenu;
     }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b671bbfc8e..ff7d461341 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2375,8 +2375,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
         return;
 
     // let the families collection update the images
-    sal_Bool bIsHighContrast = m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode();
-    pStyleFamilies->updateImages( *m_pStyleFamiliesId, bIsHighContrast ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL );
+    pStyleFamilies->updateImages( *m_pStyleFamiliesId );
 
     // and set the new images on our toolbox
     USHORT nLoop = pStyleFamilies->Count();
@@ -2421,14 +2420,6 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 
 SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
 {
-/*
-    SfxImageManager* pImgMgr = pBindings->GetImageManager();
-    if ( pImgMgr )
-    {
-        pImgMgr->ReleaseToolBox( &m_aActionTbL );
-        pImgMgr->ReleaseToolBox( &m_aActionTbR );
-    }
-*/
 }
 
 //-------------------------------------------------------------------------
@@ -2448,10 +2439,6 @@ void SfxTemplateDialog_Impl::Resize()
     FloatingWindow *pF = m_pFloat->GetFloatingWindow();
     if ( pF )
     {
-// 		if(pF->IsZoomedIn() && m_bZoomIn==FALSE)
-// 			pF->SetText(String(SfxResId( DLG_STYLE_DESIGNER )));
-// 		if(!pF->IsZoomedIn() && m_bZoomIn==TRUE && GetFamilyItem_Impl())
-// 			UpdateStyles_Impl(UPDATE_FAMILY); //Bereich wieder in Titel schreiben
         m_bZoomIn = pF->IsRollUp();
         if ( m_bZoomIn )
             return;
@@ -2841,13 +2828,6 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
         aOkBtn.Enable( bCheck );
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
-
-/*      for(USHORT i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
-    if(i!=aFamIds.Count())
-        aFamList.SelectEntry(aFamIds[i]);
-    else
-        DBG_ERROR("Entry nicht gefunden");*/
-
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index bc021a9ad6..fe22072723 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1193,9 +1193,9 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
                 const bool bCanHaveChilds =
                     aRef->CanHaveChilds(aPath[nDocLevel+1],
                                         aPath[nDocLevel+2]);
-                for(USHORT i = 0; i < nCount; ++i)
+                for(sal_uInt16 i = 0; i < nCount; ++i)
                 {
-                    bool bDeletable;
+                    sal_Bool bDeletable;
                     aRef->GetContent(
                         aText, aClosedBmp, aOpenedBmp, bDeletable,
                         i, aPath[nDocLevel+1]);
@@ -1483,17 +1483,16 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL         bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image* pRet = NULL;
 
     switch( nLevel )
     {
         case 0:
-           pRet = bHC ? &aOpenedFolderBmpHC : &aOpenedFolderBmp; break;
+            pRet = &aOpenedFolderBmp; break;
         case 1:
-           pRet = bHC ? &aOpenedDocBmpHC : &aOpenedDocBmp; break;
+            pRet = &aOpenedDocBmp; break;
         default:
-            pRet = bHC ? &aClosedFolderBmpHC : &aClosedFolderBmp; break;
+            pRet = &aClosedFolderBmp; break;
     }
 
     return *pRet;
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 5a07801377..52e36d7241 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -174,8 +174,7 @@ SfxPreviewWin::SfxPreviewWin(
     SetHelpId( HID_PREVIEW_FRAME );
 
     // adjust contrast mode initially
-    bool bUseContrast = UseHighContrastSetting();
-    SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+    SetDrawMode( OUTPUT_DRAWMODE_COLOR );
 
     // #107818# This preview window is for document previews.  Therefore
     // right-to-left mode should be off
@@ -216,18 +215,10 @@ void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
     if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
         (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        // adjust contrast mode
-        bool bUseContrast = UseHighContrastSetting();
-        SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+        SetDrawMode( OUTPUT_DRAWMODE_COLOR );
     }
 }
 
-bool SfxPreviewWin::UseHighContrastSetting() const
-{
-    return GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
-
 class SfxNewFileDialog_Impl
 {
     FixedText aRegionFt;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 6ecc69f0a4..94489c4ee3 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -119,16 +119,14 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight)
     return sal_False;
 }
 
-
 ::boost::shared_ptr<GDIMetaFile>
 SfxObjectShell::GetPreviewMetaFile( sal_Bool bFullContent ) const
 {
-    return CreatePreviewMetaFile_Impl( bFullContent, sal_False );
+    return CreatePreviewMetaFile_Impl( bFullContent );
 }
 
-
 ::boost::shared_ptr<GDIMetaFile>
-SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const
+SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
 {
     // Nur wenn gerade nicht gedruckt wird, darf DoDraw aufgerufen
     // werden, sonst wird u.U. der Printer abgeschossen !
@@ -143,10 +141,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHig
     VirtualDevice aDevice;
     aDevice.EnableOutput( FALSE );
 
-    // adjust the output device if HC-metafile is requested
-    if ( bHighContrast )
-        aDevice.SetDrawMode( aDevice.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-
     MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() );
     aDevice.SetMapMode( aMode );
     pFile->SetPrefMapMode( aMode );
@@ -361,7 +355,7 @@ void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2)
     }
 }
 
-bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
+sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
 {
     switch(nIdx1)
     {
@@ -378,8 +372,12 @@ bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
 //--------------------------------------------------------------------
 
 void SfxObjectShell::GetContent(String &rText,
-    Bitmap &rClosedBitmap, Bitmap &rOpenedBitmap,
-    bool &bCanDel, sal_uInt16 i, sal_uInt16 nIdx)
+                                Bitmap &rClosedBitmap,
+                                Bitmap &rOpenedBitmap,
+                                sal_Bool &bCanDel,
+                                sal_uInt16 i,
+                                sal_uInt16 nIdx
+)
 {
     bCanDel=true;
 
@@ -696,7 +694,7 @@ BOOL SfxObjectShell::Print
             boost::shared_ptr< vcl::PrinterController > pController( pAdaptor );
 
             pAdaptor->StartPage();
-            
+
             pPrinter->SetMapMode(MapMode(MAP_10TH_MM));
             Font aFont( DEFINE_CONST_UNICODE( "Arial" ), Size(0, 64));   // 18pt
             aFont.SetWeight(WEIGHT_BOLD);
@@ -790,7 +788,7 @@ BOOL SfxObjectShell::Print
                 pStyle = pIter->Next();
             }
             pAdaptor->EndPage();
-            
+
             Printer::PrintJob( pController, rPrt.GetJobSetup() );
 
             delete pIter;
@@ -1080,10 +1078,10 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
         xDocProps->setTemplateName( ::rtl::OUString() );
         xDocProps->setTemplateDate( util::DateTime() );
         xDocProps->resetUserData( ::rtl::OUString() );
-    
+
         // TODO/REFACTOR:
         // Title?
-    
+
         if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
         {
             String aFoundName;
@@ -1092,13 +1090,13 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
                 INetURLObject aObj( rFileName );
                 xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
                 xDocProps->setTemplateName( rTemplateName );
-    
+
                 ::DateTime now;
                 xDocProps->setTemplateDate( util::DateTime(
                     now.Get100Sec(), now.GetSec(), now.GetMin(),
                     now.GetHour(), now.GetDay(), now.GetMonth(),
                     now.GetYear() ) );
-    
+
                 SetQueryLoadTemplate( sal_True );
             }
         }
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1214c3ca54..dae91d79eb 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1996,7 +1996,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
                 ::boost::shared_ptr<GDIMetaFile> pMetaFile =
-                    m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True, sal_True );
+                    m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True );
 
                 if ( pMetaFile )
                 {
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index acf3aec2eb..c9e3304ef4 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -124,7 +124,6 @@ public:
     void			SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*			GetResMgr() { return pResMgr; }
     void			SetHelpIds( ResMgr* );
-    BOOL			IsHiContrastMode() const;
     void			UpdateImages();
 
     DECL_LINK( Select, Menu * );
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 5fc1966bc0..49c931ea24 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -530,8 +530,8 @@ SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
     return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
 }
 
-SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd, 
-        USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText, 
+SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
+        USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, sHelpText, rBindings, pVirt);
@@ -549,7 +549,7 @@ SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
     pUnoCtrl->GetNewDispatch();
 }
 
-SfxUnoMenuControl::SfxUnoMenuControl( 
+SfxUnoMenuControl::SfxUnoMenuControl(
     const String& rCmd, USHORT nSlotId, Menu& /*rMenu*/,
     const String& rItemText, const String& rHelpText,
     SfxBindings& rBindings, SfxVirtualMenu* pVirt)
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index d77163b555..276f4430c2 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -181,10 +181,10 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
 static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
 {
     Image aRes;
-    
+
     ::rtl::OUString aTmp;
     osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-    
+
     Graphic aGraphic;
     const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
     if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
@@ -228,11 +228,10 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
         if (nNumSynonyms > 0)
         {
             SvtLinguConfig aCfg;
-            const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-            
+
             Image aImage;
             String sThesImplName( aHelper.GetThesImplName( aLocale ) );
-            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName, bHC ) );
+            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) );
             if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
@@ -240,7 +239,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
             {
                 //! item ids should start with values > 0, since 0 has special meaning
                 const USHORT nId = i + 1;
-                
+
                 String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
                 ::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) );
@@ -622,7 +621,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         aPop.Execute( rPoint, pWindow );
 
         // #i112646 avoid crash when context menu is closed.
-        // the (manually inserted) sub-menu needs to be destroyed before 
+        // the (manually inserted) sub-menu needs to be destroyed before
         // aPop gets destroyed.
         delete pThesSubMenu;
         pThesSubMenu = 0;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 2ced6fe6b7..1f51b12060 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -134,7 +134,8 @@ void SfxMenuImageControl_Impl::Update()
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                                  const rtl::OUString& aImageId,
                                  const rtl::OUString& aURL,
-                                 BOOL bBigImage )
+                                 BOOL bBigImage
+)
 {
     Image aImage;
 
@@ -194,7 +195,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
                 SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
                 SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
     pItems(0),
-       pImageControl(0),
+    pImageControl(0),
     pBindings(&rBindings),
     pResMgr(0),
     pAutoDeactivate(0),
@@ -320,14 +321,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
     DBG_ASSERT( !nLocks, "destroying active menu" );
 }
 //--------------------------------------------------------------------
-
-BOOL SfxVirtualMenu::IsHiContrastMode() const
-{
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    return rSettings.GetHighContrastMode();
-}
-
-//--------------------------------------------------------------------
 // internal: creates the virtual menu from the pSVMenu
 
 void SfxVirtualMenu::CreateFromSVMenu()
@@ -407,7 +400,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
         if ( pPopup )
         {
-            
+
             SfxMenuControl *pMnuCtrl =
                 SfxMenuControl::CreateControl(nSlotId, *pPopup, *pBindings);
 
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 8b4402d172..ac3c008692 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -66,8 +66,8 @@ public:
     ImageList*                      m_pImageList[IMAGELIST_COUNT];
     SfxModule*                      m_pModule;
 
-    ImageList*              GetImageList( BOOL bBig, BOOL bHiContrast );
-    Image                   GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast );
+    ImageList*              GetImageList( BOOL bBig );
+    Image                   GetImage( USHORT nId, BOOL bBig );
     void                    SetSymbolsSize_Impl( sal_Int16 );
 
     DECL_LINK( OptionsChanged_Impl, void* );
@@ -169,7 +169,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
 
 //-------------------------------------------------------------------------
 
-ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
+ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig )
 {
     sal_Int32 nIndex = impl_convertBools( bBig );
     if ( !m_pImageList[nIndex] )
@@ -177,7 +177,7 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
         if ( !m_pModule )
             m_pImageList[nIndex] = ::GetImageList( bBig );
         else
-            m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig, bHiContrast );
+            m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig );
     }
 
     return m_pImageList[nIndex];
@@ -185,9 +185,9 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast )
+Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig )
 {
-    ImageList* pImageList = GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = GetImageList( bBig );
     if ( pImageList )
         return pImageList->GetImage( nId );
     return Image();
@@ -210,14 +210,13 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
             if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
             {
                 ToolBox *pBox       = pInf->pToolBox;
-                BOOL    bHiContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
                 USHORT  nCount      = pBox->GetItemCount();
                 for ( USHORT nPos=0; nPos<nCount; nPos++ )
                 {
                     USHORT nId = pBox->GetItemId( nPos );
                     if ( pBox->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
                     {
-                        pBox->SetItemImage( nId, GetImage( nId, bLarge, bHiContrast ) );
+                        pBox->SetItemImage( nId, GetImage( nId, bLarge ) );
                         SfxStateCache *pCache = SfxViewFrame::Current()->GetBindings().GetStateCache( nId );
                         if ( pCache )
                             pCache->SetCachedState();
@@ -296,9 +295,9 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId, BOOL bBig ) const
 {
-    ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bBig );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
         return pImageList->GetImage( nId );
     return Image();
@@ -306,23 +305,23 @@ Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId ) const
 {
     BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    return GetImage( nId, bLarge, bHiContrast );
+    return GetImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig ) const
 {
     sal_Bool bGlobal = ( pImp->m_pModule == 0 );
-    ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bBig );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
         return pImageList->GetImage( nId );
     else if ( !bGlobal )
     {
-        pImageList = ::GetImageManager( 0 )->GetImageList( bBig, bHiContrast );
+        pImageList = ::GetImageManager( 0 )->GetImageList( bBig );
         if ( pImageList )
             return pImageList->GetImage( nId );
     }
@@ -331,10 +330,10 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) cons
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId ) const
 {
     BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    return SeekImage( nId, bLarge, bHiContrast );
+    return SeekImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
@@ -368,16 +367,16 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bLarge )
 {
-    SetImagesForceSize( rToolBox, bLarge, bHiContrast );
+    SetImagesForceSize( rToolBox, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge )
 {
-    ImageList* pImageList = pImp->GetImageList( bLarge, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bLarge );
 
     USHORT nCount = rToolBox.GetItemCount();
     for (USHORT n=0; n<nCount; n++)
@@ -405,8 +404,7 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, B
 void SfxImageManager::SetImages( ToolBox& rToolBox )
 {
     BOOL bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
-    BOOL bHiContrast = rToolBox.GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImagesForceSize( rToolBox, bHiContrast, bLarge );
+    SetImagesForceSize( rToolBox, bLarge );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2af713c30c..c5117823ac 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite