diff options
-rw-r--r-- | formula/source/ui/dlg/formdlgs.hrc | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/formdlgs.src | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/docvor.cxx | 24 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 16 |
7 files changed, 17 insertions, 51 deletions
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc index 9e6378a53d2c..b387ab5a1d91 100644 --- a/formula/source/ui/dlg/formdlgs.hrc +++ b/formula/source/ui/dlg/formdlgs.hrc @@ -68,8 +68,6 @@ #define BMP_STR_OPEN 2 #define BMP_STR_END 3 #define BMP_STR_ERROR 4 -#define BMP_STR_CLOSE_H 11 -#define BMP_STR_OPEN_H 12 #define BMP_STR_END_H 13 #define BMP_STR_ERROR_H 14 diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index c85aa561ced8..2b98213a61e8 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -111,21 +111,11 @@ TabPage RID_FORMULATAB_STRUCT ImageBitmap = Bitmap { File = "fapclose.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_CLOSE_H - { - ImageBitmap = Bitmap { File = "fapclose_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; Image BMP_STR_OPEN { ImageBitmap = Bitmap { File = "fapopen.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_OPEN_H - { - ImageBitmap = Bitmap { File = "fapopen_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; Image BMP_STR_END { ImageBitmap = Bitmap { File = "fapok.bmp"; }; diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index ea2569248823..867784989108 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -117,10 +117,8 @@ StructPage::StructPage(Window* pParent): WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION); aTlbStruct.SetNodeDefaultImages(); - aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) ); + aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) ); aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE ) ) ); - aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN_H ) ), BMP_COLOR_HIGHCONTRAST ); - aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE_H ) ), BMP_COLOR_HIGHCONTRAST ); FreeResource(); diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 983074e91fb3..23000346edf4 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1323,39 +1323,37 @@ USHORT SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const //------------------------------------------------------------------------- -SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, - SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData ) +SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( + const XubString& rText, + BMPTYPE eBmpType, + SvLBoxEntry* pParent, + BOOL bChildsOnDemand, + ULONG nPos, + void* pUserData +) { SvLBoxEntry* pEntry = NULL; const Image* pExp = NULL; const Image* pCol = NULL; - const Image* pExpHC = NULL; - const Image* pColHC = NULL; switch( eBmpType ) { case BMPTYPE_FOLDER: pExp = &aOpenedFolderBmp; pCol = &aClosedFolderBmp; - pExpHC = &aOpenedFolderBmpHC; - pColHC = &aClosedFolderBmpHC; break; - default: - DBG_ERROR( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" ); case BMPTYPE_DOC: pExp = &aOpenedDocBmp; pCol = &aClosedDocBmp; - pExpHC = &aOpenedDocBmpHC; - pColHC = &aClosedDocBmpHC; break; + + default: + DBG_ERROR( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" ); } pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildsOnDemand, nPos, pUserData ); - SetExpandedEntryBmp( pEntry, *pExpHC, BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pEntry, *pColHC, BMP_COLOR_HIGHCONTRAST ); - return pEntry; } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9f31e10848bb..5921ff2b8846 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1092,8 +1092,6 @@ RecoveryDialog::RecoveryDialog(Window* pParent, sName += impl_getStatusString( rInfo ); SvLBoxEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage); pEntry->SetUserData((void*)&rInfo); - m_aFileListLB.SetExpandedEntryBmp (pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST); - m_aFileListLB.SetCollapsedEntryBmp(pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST); } // mark first item diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 0322965e7d14..e81ede2f4b9a 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1163,8 +1163,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); SetNodeBitmaps( aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL + aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) ); } @@ -1565,12 +1564,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos) // insert the item SvLBoxEntry* pParentEntry = FindEntry( pParent ); - SvLBoxEntry* pNewEntry = InsertEntry(pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); - if ( pNewEntry ) - { - SetExpandedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST ); - } + InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); if ( pParentEntry ) Expand( pParentEntry ); } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index bb6f8f741b6c..2a52f3e3d6f4 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -207,8 +207,7 @@ namespace svxform SetNodeBitmaps( m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL + m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) ); SetDragDropMode(0xFFFF); @@ -662,11 +661,8 @@ namespace svxform SvLBoxEntry* pEntry = FindEntry( pData ); if (pEntry) { // das Image neu setzen - SetCollapsedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL ); - SetExpandedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL ); - - SetCollapsedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - SetExpandedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); + SetCollapsedEntryBmp( pEntry, pData->GetNormalImage() ); + SetExpandedEntryBmp( pEntry, pData->GetNormalImage() ); } } @@ -720,12 +716,6 @@ namespace svxform pEntryData->GetNormalImage(), pEntryData->GetNormalImage(), pParentEntry, sal_False, nRelPos, pEntryData ); - if ( pNewEntry ) - { - SetExpandedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - } - ////////////////////////////////////////////////////////////////////// // Wenn Root-Eintrag Root expandieren if( !pParentEntry ) |