HC Cleanup - libs-gui

6 files changed, 25 insertions, 70 deletions

diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index b2d3b2dd745a..9cd56b4932d0 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -296,7 +296,7 @@ namespace svt
     {
         if ( !m_aStatusImages.GetImageCount() )
         {
-            const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList(SvtResId(RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX));
+            const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX ) );
         }
 
         Image aImage;
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index bf9e474cbf56..beb2236ab2c8 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.src
@@ -42,9 +42,15 @@ ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
             Blue  = 0xFFFF;
     };
     IdList = {
-        IMG_EBB_CURRENT; IMG_EBB_MODIFIED;
-        IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW;
-        IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER;
+        IMG_EBB_CURRENT;
+        IMG_EBB_MODIFIED;
+        IMG_EBB_NEW;
+        IMG_EBB_DELETED;
+        IMG_EBB_CURRENTNEW;
+        IMG_EBB_PRIMARYKEY;
+        IMG_EBB_CURRENT_PRIMARYKEY;
+        IMG_EBB_FILTER;
+        IMG_EBB_HEADERFOOTER;
     };
     IdCount = { 9; };
 };
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 63843069b95d..503ca80ffa7e 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -478,17 +478,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         case SPELL :
         case DRAWDRAWING :
         case SMARTTAGS :
-        {
-            const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-                aRet = rStyleSettings.GetHighContrastMode() ?
-                    rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
-        }
-        break;
+            aRet = aAutoColors[eEntry];
+            break;
 
         case DRAWFILL            :
-                aRet = /*rStyleSettings.GetHighContrastMode() ?
-                    rStyleSettings.OutlineMode??? : */  aAutoColors[eEntry];
-        break;
+            aRet = aAutoColors[eEntry];
+            break;
 
         case FONTCOLOR :
             aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 6eeb469cf543..1bd17f9d584c 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -46,20 +46,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
 {
     aText = rText;
     aImage = rImage;
-    aImageHC = rImage;
-    pUserData = NULL;
-
-    nFlags = _nFlags;
-    eTextMode = IcnShowTextShort;
-    pblink = 0;
-    pflink = 0;
-}
-
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT _nFlags )
-{
-    aText = rText;
-    aImage = rImage;
-    aImageHC = rImageHC;
     pUserData = NULL;
 
     nFlags = _nFlags;
@@ -94,15 +80,6 @@ void SvxIconChoiceCtrlEntry::LockPos( BOOL bLock )
         nFlags &= ~ICNVIEW_FLAG_POS_LOCKED;
 }
 
-/*sal_Unicode SvxIconChoiceCtrlEntry::GetMnemonicChar() const
-{
-    sal_Unicode cChar = 0;
-    xub_StrLen nPos = aText.Search( '~' );
-    if ( nPos != STRING_NOTFOUND && nPos < ( aText.Len() ) - 1 )
-        cChar = aText.GetChar( nPos + 1 );
-    return cChar;
-}*/
-
 String SvxIconChoiceCtrlEntry::GetDisplayText() const
 {
     return MnemonicGenerator::EraseAllMnemonicChars( aText );
@@ -177,43 +154,41 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
     return pEntry;
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, ULONG nPos, const Point* pPos, USHORT nFlags  )
-{
-    SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, rImageHC, nFlags);
-
-    _pImp->InsertEntry( pEntry, nPos, pPos );
-
-    return pEntry;
-}
-
 BOOL SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, BOOL )
 {
     return TRUE;
 }
+
 BOOL SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
 {
     return TRUE;
 }
+
 void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
 {
-    rDev.DrawImage( rPos, GetSettings().GetStyleSettings().GetHighContrastMode() ? pEntry->GetImageHC() : pEntry->GetImage() );
+    rDev.DrawImage( rPos, pEntry->GetImage() );
 }
+
 String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, BOOL )
 {
     return pEntry->GetText();
 }
+
 BOOL SvtIconChoiceCtrl::HasBackground() const
 {
     return FALSE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFont() const
 {
     return FALSE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFontTextColor() const
 {
     return TRUE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFontFillColor() const
 {
     return TRUE;
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 65834dd8b3cc..4d163f68acaa 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -504,15 +504,11 @@ ContextMenuHelper::associateUIConfigurationManagers()
 }
 
 Image
-ContextMenuHelper::getImageFromCommandURL(
-    const ::rtl::OUString& aCmdURL,
-    bool                   bHiContrast ) const
+ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const
 {
     Image     aImage;
     sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL|
                           ui::ImageType::SIZE_DEFAULT );
-    if ( bHiContrast )
-        nImageType |= ui::ImageType::COLOR_HIGHCONTRAST;
 
     uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
     uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 );
@@ -544,7 +540,7 @@ ContextMenuHelper::getImageFromCommandURL(
         {
             aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq );
             uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0];
-        aImage = Image( xGraphic );
+            aImage = Image( xGraphic );
 
             if ( !!aImage )
                 return aImage;
@@ -609,7 +605,6 @@ ContextMenuHelper::completeMenuProperties(
     // menu correctly.
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     bool  bShowMenuImages( rSettings.GetUseImagesInMenus() );
-    bool  bIsHiContrast( rSettings.GetHighContrastMode() );
 
     if ( pMenu )
     {
@@ -639,7 +634,7 @@ ContextMenuHelper::completeMenuProperties(
                 {
                     Image aImage;
                     if ( aCmdURL.getLength() > 0 )
-                        aImage = getImageFromCommandURL( aCmdURL, bIsHiContrast );
+                        aImage = getImageFromCommandURL( aCmdURL );
                     pMenu->SetItemImage( nId, aImage );
                 }
                 else
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 2981959bf035..1503c8a73737 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -673,22 +673,6 @@ sal_Bool ToolboxController::hasBigImages() const
     return SvtMiscOptions().AreCurrentSymbolsLarge();
 }
 
-sal_Bool ToolboxController::isHighContrast() const
-{
-    sal_Bool bHighContrast( sal_False );
-
-    Reference< XWindow > xWindow = m_pImpl->m_xParentWindow;
-    if ( xWindow.is() )
-    {
-        SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        if ( pWindow )
-            bHighContrast = ( ((ToolBox *)pWindow)->GetSettings().GetStyleSettings().GetHighContrastMode() );
-    }
-
-    return bHighContrast;
-}
-
 void ToolboxController::updateStatus()
 {
     bindListener();