diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-09 21:00:04 -0800 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-10 10:00:10 +0100 |
| commit | c4d6d303e56ac395179fa0cbcecd475138a4f7b5 (patch) | |
| tree | 2ec3704061453d67dfafbdbd50c6a82ec6749c3d /reportdesign | |
| parent | Spelling mistakes, and deleting unwanted comments and commented code (diff) | |
| download | core-c4d6d303e56ac395179fa0cbcecd475138a4f7b5.tar.gz core-c4d6d303e56ac395179fa0cbcecd475138a4f7b5.zip | |
Bitmap Tree Cleanup - base
Removed all references to HIGHCONTRAST mode from svtools classes:
SvImpLBox
SvTreeListBox
The reset is just fall out.
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/inc/RptResId.hrc | 1 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 16 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.src | 7 |
3 files changed, 1 insertions, 23 deletions
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 3c5920f37a59..65d0b6420829 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -266,7 +266,6 @@ #define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2) #define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3) #define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) -#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5) #define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6) #define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7) #define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8) diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 98befe02e480..b02d9c4c87fa 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -154,7 +154,6 @@ class NavigatorTree : public ::cppu::BaseMutex AutoTimer m_aDropActionTimer; Timer m_aSynchronizeTimer; ImageList m_aNavigatorImages; - ImageList m_aNavigatorImagesHC; Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde DROP_ACTION m_aDropActionType; OReportController& m_rController; @@ -244,17 +243,10 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) SetHelpId( HID_REPORT_NAVIGATOR_TREE ); m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) ); - m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) ); SetNodeBitmaps( m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL - ); - SetNodeBitmaps( - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST + m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) ); SetDragDropMode(0xFFFF); @@ -527,12 +519,6 @@ SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntr { const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) ); pEntry = InsertEntry(_sName,aImage,aImage,_pParent,FALSE,_nPosition,_pData); - if ( pEntry ) - { - const Image aImageHC( m_aNavigatorImagesHC.GetImage( _nImageId ) ); - SetExpandedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST ); - } } else pEntry = InsertEntry(_sName,_pParent,FALSE,_nPosition,_pData); diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 496bae3b0ab7..af6ec90b2e7f 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -88,13 +88,6 @@ ImageList RID_SVXIMGLIST_RPTEXPL NAVIGATOR_IMAGEIDS; }; -ImageList RID_SVXIMGLIST_RPTEXPL_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - NAVIGATOR_IMAGEIDS; -}; - String RID_STR_FUNCTIONS { Text [ en-US ] = "Functions" ; |