summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-11-09 20:10:02 -0800
committerSebastian Spaeth <Sebastian@SSpaeth.de>2010-11-10 10:01:05 +0100
commitd8c1499ca5841788905a09ff4457b1f49a5ce9b2 (patch)
treee24499767166a5b27fceab4ba9cd8c687621fc08 /svx
parent269ebab74cf3b8c2e1f4f5b998ec562cfd422068 (diff)
Bitmap Tree Cleanup - libs-core
Removed all references to HIGHCONTRAST mode from svtools classes: SvImpLBox SvTreeListBox The reset is just fall out.
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/docrecovery.cxx2
-rw-r--r--svx/source/form/filtnav.cxx10
-rw-r--r--svx/source/form/navigatortree.cxx16
3 files changed, 5 insertions, 23 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 3818f94993..b242c2e048 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 682011de77..15d19e57f0 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 9c40b13cf6..3ad5abe6cf 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 )