[Libreoffice-commits] .: extensions/source

Sebastian Spaeth spaetz at kemper.freedesktop.org
Tue Nov 16 05:56:47 PST 2010


 extensions/source/bibliography/bib.hrc     |    3 +--
 extensions/source/bibliography/toolbar.cxx |    6 ++----
 extensions/source/bibliography/toolbar.src |   13 -------------
 3 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit f4e05437481c79b98fa7b376e833d661c7759e1d
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Nov 16 14:56:18 2010 +0100

    Remove High contrast from bibliography extension

diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index eb6afcb..09b9899 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -45,9 +45,8 @@
 #define RID_BIB_CONTROLS			(RID_BIB_START + 100)
 #define RID_BIB_TOOLBAR				(RID_BIB_CONTROLS+ 1)
 #define RID_TOOLBAR_IMGLIST         (RID_BIB_CONTROLS+ 2)
-#define RID_TOOLBAR_IMGLIST_HC      (RID_BIB_CONTROLS+ 3)
+// free
 #define RID_TOOLBAR_BIGIMGLIST      (RID_BIB_CONTROLS+ 4)
-#define RID_TOOLBAR_BIGIMGLIST_HC   (RID_BIB_CONTROLS+ 5)
 
 //Menu(100)
 #define RID_BIB_MENU				(RID_BIB_CONTROLS + 100)
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 8eed2d5..ae5af0b 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -204,9 +204,7 @@ SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr);
 BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
     aImgLst(BibResId(  RID_TOOLBAR_IMGLIST     )),
-    aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC  )),
     aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
-    aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )),
     aFtSource(this,WB_VCENTER),
     aLBSource(this,WB_DROPDOWN),
     aFtQuery(this,WB_VCENTER),
@@ -610,8 +608,8 @@ void BibToolBar::RebuildToolbar()
 void BibToolBar::ApplyImageList()
 {
     ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? 
-                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) :
-                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst );
+                       ( aImgLst ) :
+                       ( aBigImgLst );
     
     SetItemImage(TBC_BT_AUTOFILTER  , rList.GetImage(SID_FM_AUTOFILTER));
     SetItemImage(TBC_BT_FILTERCRIT  , rList.GetImage(SID_FM_FILTERCRIT));
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index 9016a45..95681c7 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -212,12 +212,6 @@ ImageList RID_TOOLBAR_IMGLIST
     MASKCOLOR
     BIB_IMAGES
 };
-ImageList RID_TOOLBAR_IMGLIST_HC
-{
-    Prefix = "sch";
-    MASKCOLOR
-    BIB_IMAGES
-};
 
 ImageList RID_TOOLBAR_BIGIMGLIST
 {
@@ -225,13 +219,6 @@ ImageList RID_TOOLBAR_BIGIMGLIST
     MASKCOLOR
     BIB_IMAGES
 };
-ImageList RID_TOOLBAR_BIGIMGLIST_HC
-{
-    Prefix = "lch";
-    MASKCOLOR
-    BIB_IMAGES
-};
-
 
 
 


More information about the Libreoffice-commits mailing list