Bitmap Tree Cleanup - components

Removed all references to HIGHCONTRAST mode from svtools classes:
	SvImpLBox
	SvTreeListBox

The reset is just fall out.

4 files changed, 14 insertions, 58 deletions

diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index be0771b83fc8..99dc56bfb683 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -66,8 +66,6 @@
 #define STR_BASICNAME 62
 #define BMP_COLLAPSED 63
 #define BMP_EXPANDED 64
-#define BMP_COLLAPSED_HC 65
-#define BMP_EXPANDED_HC 66
 #define STR_BASICMACROS 67
 #define STR_DLG_MACROS 68
 #define STR_HUMAN_APPNAME 69
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index bf2c2ae7485a..659f3f928d98 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -278,7 +278,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
         {
             File = "plus.bmp" ;
         };
-         // MaskColor = Color { Predefine = COL_GREEN ; };
     };
     Image BMP_EXPANDED
     {
@@ -286,21 +285,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
         {
             File = "minus.bmp" ;
         };
-         // MaskColor = Color { Predefine = COL_GREEN ; };
-    };
-    Image BMP_EXPANDED_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "minus_h.bmp" ;
-        };
-    };
-    Image BMP_COLLAPSED_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "plus_h.bmp" ;
-        };
     };
 };
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 392f419c6387..f56dc424f3b9 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -463,9 +463,7 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
     String m_aStrGroupStyles;
     String m_aScriptType;
     Image m_collapsedImage;
-    Image m_collapsedImage_hc;
     Image m_expandedImage;
-    Image m_expandedImage_hc;
 
     SvxConfigGroupBoxResource_Impl();
 };
@@ -488,9 +486,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
     m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
     m_aScriptType(String(CUI_RES(STR_BASICNAME))),
     m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
-    m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
-    m_expandedImage(CUI_RES(BMP_EXPANDED)),
-    m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
+    m_expandedImage(CUI_RES(BMP_EXPANDED))
 {
     FreeResource();
 }
@@ -501,8 +497,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
         , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
 {
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
-    SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
-    SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
+    SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
 
     // Check configuration to see whether only Basic macros,
     // only Scripting Framework scripts, or both should be listed
@@ -929,11 +924,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                                 Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL );
                                 SvLBoxEntry* pNewEntry =
                                     InsertEntry( uiName, NULL);
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_HIGHCONTRAST );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                SetExpandedEntryBmp(  pNewEntry, aImage );
+                                SetCollapsedEntryBmp( pNewEntry, aImage );
 
                                 pNewEntry->SetUserData( pInfo );
                                 aArr.Insert( pInfo, aArr.Count() );
@@ -1275,11 +1267,8 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                                 Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
                                 SvLBoxEntry* pNewEntry =
                                     pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
-                                pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                                pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
 
                                 pGrpInfo->sCommand = uri;
                                 pGrpInfo->sLabel = children[n]->getName();
@@ -1499,11 +1488,8 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                                 Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
                                 SvLBoxEntry* pNewEntry =
                                     InsertEntry( theChild->getName(), pEntry );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                SetExpandedEntryBmp( pNewEntry, aImage );
+                                SetCollapsedEntryBmp(pNewEntry, aImage );
 
                                 pNewEntry->SetUserData( pGrpInfo );
                                 aArr.Insert( pGrpInfo, aArr.Count() );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index cd44651dd8e1..7fd97e88168f 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -269,13 +269,8 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
 
     SetNodeBitmaps(
         aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_NORMAL );
-
-    SetNodeBitmaps(
-        aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_HIGHCONTRAST );
+        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
+    );
 }
 
 
@@ -420,12 +415,8 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
 
                 ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
                 Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL );
-                SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-                SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-
-                aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_HIGHCONTRAST );
-                SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
+                SetExpandedEntryBmp( pNewEntry, aImage );
+                SetCollapsedEntryBmp( pNewEntry, aImage );
 
                 SvxGroupInfo_Impl* pInfo =
                     new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild );
@@ -902,11 +893,8 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
                             Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
                             SvLBoxEntry* pNewEntry =
                                 pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
-                            pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                            aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                            pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                            pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
 
                             pNewEntry->SetUserData( _pGroupInfo );