Remove the last of the HC icons

3 files changed, 6 insertions, 16 deletions

diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index c8025bb66f1a..6b3599678543 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -82,7 +82,7 @@ namespace frm
         }
 
         // ICommandImageProvider
-        virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const;
+        virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const;
 
     private:
         void    impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument );
@@ -130,15 +130,14 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const
+    CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const
     {
         const size_t nCommandCount = _rCommandURLs.getLength();
         CommandImages aImages( nCommandCount );
         try
         {
-            const sal_Int16 nImageType =
-                    ( _bLarge       ? ImageType::SIZE_LARGE         : ImageType::SIZE_DEFAULT )
-                +   ( _bHiContrast  ? ImageType::COLOR_HIGHCONTRAST : ImageType::COLOR_NORMAL );
+            const sal_Int16 nImageType = ImageType::COLOR_NORMAL
+                                       +  ( _bLarge ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT );
 
             Sequence< Reference< XGraphic > > aDocImages( nCommandCount );
             Sequence< Reference< XGraphic > > aModImages( nCommandCount );
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index 8fece35e50e9..caf19b4f2c5f 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -54,8 +54,7 @@ namespace frm
     public:
         virtual CommandImages   getCommandImages(
                                     const CommandURLs& _rCommandURLs,
-                                    const bool _bLarge,
-                                    const bool _bHiContrast
+                                    const bool _bLarge
                                 ) const = 0;
 
         virtual ~ICommandImageProvider() { }
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 7e5974971283..b1c6f0d3a588 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -369,8 +369,6 @@ namespace frm
         if ( !m_pImageProvider )
             return;
 
-        const bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         const USHORT nItemCount = m_pToolbar->GetItemCount();
 
         // collect the FormFeatures in the toolbar
@@ -396,7 +394,7 @@ namespace frm
         }
 
         // retrieve the images for the command URLs
-        CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge, bIsHighContrast );
+        CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge );
 
         // and set them at the toolbar
         CommandImages::const_iterator commandImage = aCommandImages.begin();
@@ -547,9 +545,6 @@ namespace frm
         m_pToolbar->SetControlBackground();
         forEachItemWindow( &NavigationToolBar::setItemBackground, NULL );
 
-        // the contrast of the background color may have changed, so force
-        // the images to be rebuild (high contrast requires a possibly different
-        // image set)
         implUpdateImages();
     }
 
@@ -560,9 +555,6 @@ namespace frm
         m_pToolbar->SetControlBackground( _rColor );
         forEachItemWindow( &NavigationToolBar::setItemBackground, &_rColor );
 
-        // the contrast of the background color may have changed, so force
-        // the images to be rebuild (high contrast requires a possibly different
-        // image set)
         implUpdateImages();
     }