get this building again

2 files changed, 3 insertions, 113 deletions

diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 448a945aa8e1..f2d1ed5be10e 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -35,165 +35,82 @@ Bitmap BMP_LAYOUT_EMPTY
 {
     File = "layout_empty.png";
 };
-Bitmap BMP_LAYOUT_EMPTY_H
-{
-    File = "layout_empty_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD01
 {
     File = "layout_head01.png";
 };
-Bitmap BMP_LAYOUT_HEAD01_H
-{
-    File = "layout_head01_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02
 {
     File = "layout_head02.png";
 };
-Bitmap BMP_LAYOUT_HEAD02_H
-{
-    File = "layout_head02_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02A
 {
     File = "layout_head02a.png";
 };
-Bitmap BMP_LAYOUT_HEAD02A_H
-{
-    File = "layout_head02a_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02B
 {
     File = "layout_head02b.png";
 };
-Bitmap BMP_LAYOUT_HEAD02B_H
-{
-    File = "layout_head02b_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03
 {
     File = "layout_head03.png";
 };
-Bitmap BMP_LAYOUT_HEAD03_H
-{
-    File = "layout_head03_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03A
 {
     File = "layout_head03a.png";
 };
-Bitmap BMP_LAYOUT_HEAD03A_H
-{
-    File = "layout_head03a_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03B
 {
     File = "layout_head03b.png";
 };
-Bitmap BMP_LAYOUT_HEAD03B_H
-{
-    File = "layout_head03b_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03C
 {
     File = "layout_head03c.png";
 };
-Bitmap BMP_LAYOUT_HEAD03C_H
-{
-    File = "layout_head03c_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD04
 {
     File = "layout_head04.png";
 };
-Bitmap BMP_LAYOUT_HEAD04_H
-{
-    File = "layout_head04_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD06
 {
     File = "layout_head06.png";
 };
-Bitmap BMP_LAYOUT_HEAD06_H
-{
-    File = "layout_head06_h.png";
-};
 Bitmap BMP_LAYOUT_TEXTONLY
 {
     File = "layout_textonly.png";
 };
-Bitmap BMP_LAYOUT_TEXTONLY_H
-{
-    File = "layout_textonly_h.png";
-};
 Bitmap BMP_LAYOUT_VERTICAL01
 {
     File = "layout_vertical01.png";
 };
-Bitmap BMP_LAYOUT_VERTICAL01_H
-{
-    File = "layout_vertical01_h.png";
-};
 Bitmap BMP_LAYOUT_VERTICAL02
 {
     File = "layout_vertical02.png";
 };
-Bitmap BMP_LAYOUT_VERTICAL02_H
-{
-    File = "layout_vertical02_h.png";
-};
-
 Bitmap BMP_FOILH_01
 {
     File = "foilh01.png";
 };
-Bitmap BMP_FOILH_01_H
-{
-    File = "foilh01_h.png";
-};
 Bitmap BMP_FOILH_02
 {
     File = "foilh02.png";
 };
-Bitmap BMP_FOILH_02_H
-{
-    File = "foilh02_h.png";
-};
 Bitmap BMP_FOILH_03
 {
     File = "foilh03.png";
 };
-Bitmap BMP_FOILH_03_H
-{
-    File = "foilh03_h.png";
-};
 Bitmap BMP_FOILH_04
 {
     File = "foilh04.png";
 };
-Bitmap BMP_FOILH_04_H
-{
-    File = "foilh04_h.png";
-};
 Bitmap BMP_FOILH_06
 {
     File = "foilh06.png";
 };
-Bitmap BMP_FOILH_06_H
-{
-    File = "foilh06_h.png";
-};
 Bitmap BMP_FOILH_09
 {
     File = "foilh09.png";
 };
-Bitmap BMP_FOILH_09_H
-{
-    File = "foilh09_h.png";
-};
-
-
 Bitmap BMP_PLACEHOLDER_CHART_SMALL
 {
     File = "placeholder_chart_small.png";
@@ -265,21 +182,11 @@ Bitmap BMP_FOILN_01
     File = "foiln01.bmp" ;
 };
 
-Bitmap BMP_FOILN_01_H
-{
-    File = "foiln01_h.bmp" ;
-};
-
 Bitmap BMP_PAGE
 {
     File = "page.bmp" ;
 };
 
-Bitmap BMP_PAGE_H
-{
-    File = "page_h.bmp" ;
-};
-
 Bitmap BMP_PAGE_EXCLUDED
 {
     File = "pageexcl.bmp" ;
@@ -374,9 +281,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
     #define STYLE_IMAGE_LISTEF \
         IdList = \
         { \
-            1; 2; \
+            1; \
         }; \
-        IdCount = 2;
+        IdCount = 1;
 
     ImageList 1 // == BMP_COLOR_NORMAL + 1
     {
@@ -384,12 +291,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         MaskColor = IMAGE_MASK_STDCOLOR;
         STYLE_IMAGE_LISTEF
     };
-    ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
-    {
-        Prefix = "sfh";
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        STYLE_IMAGE_LISTEF
-    };
     #undef STYLE_IMAGE_LISTEF
 };
 
@@ -430,17 +331,7 @@ Bitmap BMP_FADE_EFFECT_INDICATOR
     File = "fade_effect_indicator.bmp";
 };
 
-Bitmap BMP_FADE_EFFECT_INDICATOR_H
-{
-    File = "fade_effect_indicator_hc.bmp";
-};
-
 Bitmap BMP_COMMENTS_INDICATOR
 {
     File = "comments_indicator.bmp";
 };
-
-Bitmap BMP_COMMENTS_INDICATOR_H
-{
-    File = "comments_indicator_hc.bmp";
-};
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 4d2855cfb831..697d68246a06 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -306,8 +306,7 @@ void SdTbxControl::StateChanged( USHORT nSId,
                 aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage ));
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
-                                         hasBigImages(),
-                                         GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+                                         hasBigImages() );
 
                 // !-Operator prueft, ob Image nicht vorhanden ist
                 if( !!aImage )