[Libreoffice-commits] .: formula/source sfx2/source svx/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 01:04:44 PST 2010
formula/source/ui/dlg/formdlgs.hrc | 4 +---
formula/source/ui/dlg/formdlgs.src | 12 +-----------
formula/source/ui/dlg/structpg.cxx | 6 ++----
sfx2/source/doc/docvor.cxx | 24 +++++++++++-------------
svx/source/dialog/docrecovery.cxx | 2 --
svx/source/form/filtnav.cxx | 10 ++--------
svx/source/form/navigatortree.cxx | 16 +++-------------
7 files changed, 20 insertions(+), 54 deletions(-)
New commits:
commit d8c1499ca5841788905a09ff4457b1f49a5ce9b2
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 9 20:10:02 2010 -0800
Bitmap Tree Cleanup - libs-core
Removed all references to HIGHCONTRAST mode from svtools classes:
SvImpLBox
SvTreeListBox
The reset is just fall out.
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index bb9e2a5..0801a88 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 8ea9545..626f9a0 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 3bbd182..7d541a8 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 7214654..aeb2a53 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 3818f94..b242c2e 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 682011d..15d19e5 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 9c40b13..3ad5abe 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 )
More information about the Libreoffice-commits
mailing list