diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-05 19:24:42 -0700 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-11-06 10:09:11 -0500 |
| commit | 7e31ccaa560f43e436c0562fe0b31e7d41e9ce24 (patch) | |
| tree | 636229e1447ed72b68f63f0179a6d4cfadbe99f7 /svx/source/form/datanavi.cxx | |
| parent | c60968d9e4b5b101c921ae8d34002e8c828ca20b (diff) | |
High-Contrast Cleanup Phase #1
Diffstat (limited to 'svx/source/form/datanavi.cxx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 66fd1a296355..c4b300bc7ae6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -306,14 +306,12 @@ namespace svxform m_pNaviWin ( _pNaviWin ), m_bHasModel ( false ), m_eGroup ( _eGroup ), - m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ), - m_TbxHCImageList( SVX_RES( IL_TBX_BMPS_HC ) ) + m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ) { FreeResource(); - const ImageList& rImageList = - GetBackground().GetColor().IsDark() ? m_TbxHCImageList : m_TbxImageList; + const ImageList& rImageList = m_TbxImageList; m_aToolBox.SetItemImage( TBI_ITEM_ADD, rImageList.GetImage( IID_ITEM_ADD ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ELEMENT, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ATTRIBUTE, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) ); @@ -777,9 +775,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvLBoxEntry* pParent = m_aItemList.FirstSelected(); - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); ::rtl::OUString sName; @@ -987,9 +983,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvLBoxEntry* pEntry = NULL; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); ItemNode* pNode = new ItemNode( _rEntry ); @@ -1243,9 +1237,7 @@ namespace svxform m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY ); String sRet; m_bHasModel = true; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); switch ( m_eGroup ) { @@ -1561,7 +1553,6 @@ namespace svxform m_bIsNotifyDisabled ( false ), m_aItemImageList ( SVX_RES( IL_ITEM_BMPS ) ), - m_aItemHCImageList ( SVX_RES( IL_ITEM_BMPS_HC ) ), m_xDataListener ( new DataListener( this ) ) { |