[Libreoffice-commits] .: 2 commits - formula/source framework/source

[Sebastian Spaeth]

 formula/source/ui/dlg/structpg.cxx                    |    4 ----
 framework/source/uiconfiguration/imagemanagerimpl.cxx |    2 --
 2 files changed, 6 deletions(-)

New commits:
commit b2321cee902c9f06bf159b461ceb8d016ee128eb
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Nov 12 10:27:10 2010 +0100

    Remove one more instance of HighContrast stuff

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 6988f75..a3f86b7 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -442,8 +442,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
     sal_Int16 nIndex( 0 );
     if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
         nIndex += 1;
-    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
-        nIndex += 2;
     return nIndex;
 }
 
commit 52509a422fb185f1540ab1c3997384ce330cd083
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Nov 11 12:18:33 2010 -0800

    Removed BmpColorMode(SvLBoxContextBmp_Impl and SvLBoxButtonData) - libs-core

diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 7d541a8..d8497c5 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -65,10 +65,6 @@ SvLBoxEntry* StructListBox::InsertStaticEntry(
         SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken )
 {
     SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken );
-    SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
-    DBG_ASSERT( pBmpItem, "StructListBox::InsertStaticEntry - missing item" );
-    pBmpItem->SetBitmap1( rEntryImgHC, BMP_COLOR_HIGHCONTRAST );
-    pBmpItem->SetBitmap2( rEntryImgHC, BMP_COLOR_HIGHCONTRAST );
     return pEntry;
 }