Removed more _HC instances

chart2/source/controller/dialogs/Bitmaps_HC.hrc

-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-// RID_SCH_START is 30512 (see svl/solar.hrc)
-
-// next free: 100
-
-#ifndef SC_HC_MASKCOLOR
-#define SC_HC_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-#endif
-
-//-----------------------------------------------------------------------------
-// chart types
-// Images:
-
-#define IMG_TYPE_COLUMN_HC (RID_SCH_START + 1)
-#define IMG_TYPE_BAR_HC    (RID_SCH_START + 2)
-#define IMG_TYPE_PIE_HC    (RID_SCH_START + 3)
-#define IMG_TYPE_AREA_HC   (RID_SCH_START + 4)
-#define IMG_TYPE_LINE_HC   (RID_SCH_START + 5)
-#define IMG_TYPE_XY_HC     (RID_SCH_START + 6)
-#define IMG_TYPE_BUBBLE_HC (RID_SCH_START + 7)
-#define IMG_TYPE_NET_HC    (RID_SCH_START + 8)
-#define IMG_TYPE_STOCK_HC  (RID_SCH_START + 9)
-#define IMG_TYPE_COLUMN_LINE_HC  (RID_SCH_START + 10)
-
-//-----------------------------------------------------------------------------
-//Chart Subtypes
-// Bitmaps:
-
-//----------------------
-// Column Chart Subtypes
-#define BMP_COLUMNS_2D_1_HC (RID_SCH_START + 1)
-#define BMP_COLUMNS_2D_2_HC (RID_SCH_START + 2)
-#define BMP_COLUMNS_2D_3_HC (RID_SCH_START + 3)
-
-#define BMP_COLUMNS_3D_HC (RID_SCH_START + 4)
-#define BMP_COLUMNS_3D_1_HC (RID_SCH_START + 5)
-#define BMP_COLUMNS_3D_2_HC (RID_SCH_START + 6)
-#define BMP_COLUMNS_3D_3_HC (RID_SCH_START + 7)
-
-#define BMP_SAEULE_3D_1_HC (RID_SCH_START + 8)
-#define BMP_SAEULE_3D_2_HC (RID_SCH_START + 9)
-#define BMP_SAEULE_3D_3_HC (RID_SCH_START + 10)
-#define BMP_SAEULE_3D_4_HC (RID_SCH_START + 11)
-
-#define BMP_KEGEL_3D_1_HC (RID_SCH_START + 12)
-#define BMP_KEGEL_3D_2_HC (RID_SCH_START + 13)
-#define BMP_KEGEL_3D_3_HC (RID_SCH_START + 14)
-#define BMP_KEGEL_3D_4_HC (RID_SCH_START + 15)
-
-#define BMP_PYRAMID_3D_1_HC (RID_SCH_START + 16)
-#define BMP_PYRAMID_3D_2_HC (RID_SCH_START + 17)
-#define BMP_PYRAMID_3D_3_HC (RID_SCH_START + 18)
-#define BMP_PYRAMID_3D_4_HC (RID_SCH_START + 19)
-
-//----------------------
-// Bar Chart Subtypes
-
-#define BMP_BARS_2D_1_HC (RID_SCH_START + 20)
-#define BMP_BARS_2D_2_HC (RID_SCH_START + 21)
-#define BMP_BARS_2D_3_HC (RID_SCH_START + 22)
-
-#define BMP_BARS_3D_HC (RID_SCH_START + 23)
-#define BMP_BARS_3D_1_HC (RID_SCH_START + 24)
-#define BMP_BARS_3D_2_HC (RID_SCH_START + 25)
-#define BMP_BARS_3D_3_HC (RID_SCH_START + 26)
-
-#define BMP_ROEHRE_3D_1_HC (RID_SCH_START + 27)
-#define BMP_ROEHRE_3D_2_HC (RID_SCH_START + 28)
-#define BMP_ROEHRE_3D_3_HC (RID_SCH_START + 29)
-#define BMP_ROEHRE_3D_4_HC (RID_SCH_START + 30)
-
-#define BMP_KEGELQ_3D_1_HC (RID_SCH_START + 31)
-#define BMP_KEGELQ_3D_2_HC (RID_SCH_START + 32)
-#define BMP_KEGELQ_3D_3_HC (RID_SCH_START + 33)
-#define BMP_KEGELQ_3D_4_HC (RID_SCH_START + 34)
-
-#define BMP_PYRAMIDQ_3D_1_HC (RID_SCH_START + 35)
-#define BMP_PYRAMIDQ_3D_2_HC (RID_SCH_START + 36)
-#define BMP_PYRAMIDQ_3D_3_HC (RID_SCH_START + 37)
-#define BMP_PYRAMIDQ_3D_4_HC (RID_SCH_START + 38)
-
-//----------------------
-// Pie and Donut Chart Subtypes
-
-#define BMP_CIRCLES_2D_HC (RID_SCH_START + 39)
-#define BMP_CIRCLES_2D_EXPLODED_HC (RID_SCH_START + 40)
-#define BMP_CIRCLES_3D_HC (RID_SCH_START + 41)
-#define BMP_CIRCLES_3D_EXPLODED_HC (RID_SCH_START + 42)
-#define BMP_DONUT_2D_HC (RID_SCH_START + 43)
-#define BMP_DONUT_2D_EXPLODED_HC (RID_SCH_START + 44)
-#define BMP_DONUT_3D_HC (RID_SCH_START + 45)
-#define BMP_DONUT_3D_EXPLODED_HC (RID_SCH_START + 46)
-
-//----------------------
-// Points and Lines Chart Subtypes
-
-#define BMP_POINTS_XVALUES_HC (RID_SCH_START + 47)
-#define BMP_POINTS_XCATEGORY_HC (RID_SCH_START + 48)
-#define BMP_POINTS_STACKED_HC (RID_SCH_START + 49)
-
-#define BMP_LINE_P_XVALUES_HC (RID_SCH_START + 50)
-#define BMP_LINE_O_XVALUES_HC (RID_SCH_START + 51)
-#define BMP_LINE3D_XVALUES_HC (RID_SCH_START + 52)
-
-#define BMP_LINE_P_XCATEGORY_HC (RID_SCH_START + 53)
-#define BMP_LINE_O_XCATEGORY_HC (RID_SCH_START + 54)
-#define BMP_LINE3D_XCATEGORY_HC (RID_SCH_START + 55)
-
-#define BMP_LINE_P_STACKED_HC (RID_SCH_START + 56)
-#define BMP_LINE_O_STACKED_HC (RID_SCH_START + 57)
-#define BMP_LINE3D_STACKED_HC (RID_SCH_START + 58)
-
-#define BMP_LINE_P_XVALUES_SMOOTH_HC (RID_SCH_START + 59)
-#define BMP_LINE_O_XVALUES_SMOOTH_HC (RID_SCH_START + 60)
-#define BMP_LINE3D_XVALUES_SMOOTH_HC (RID_SCH_START + 61)
-
-#define BMP_LINE_P_XCATEGORY_SMOOTH_HC (RID_SCH_START + 62)
-#define BMP_LINE_O_XCATEGORY_SMOOTH_HC (RID_SCH_START + 63)
-#define BMP_LINE3D_XCATEGORY_SMOOTH_HC (RID_SCH_START + 64)
-
-#define BMP_LINE_P_STACKED_SMOOTH_HC (RID_SCH_START + 65)
-#define BMP_LINE_O_STACKED_SMOOTH_HC (RID_SCH_START + 66)
-#define BMP_LINE3D_STACKED_SMOOTH_HC (RID_SCH_START + 67)
-
-//----------------------
-// Area Chart Subtypes
-
-#define BMP_AREAS_2D_HC (RID_SCH_START + 68)
-#define BMP_AREAS_2D_1_HC (RID_SCH_START + 69)
-#define BMP_AREAS_2D_3_HC (RID_SCH_START + 70)
-#define BMP_AREAS_3D_HC (RID_SCH_START + 71)
-#define BMP_AREAS_3D_1_HC (RID_SCH_START + 72)
-#define BMP_AREAS_3D_2_HC (RID_SCH_START + 73)
-
-//----------------------
-// Net Chart Subtypes
-
-#define BMP_NET_HC (RID_SCH_START + 74)
-#define BMP_NET_STACK_HC (RID_SCH_START + 75)
-#define BMP_NET_SYMB_HC (RID_SCH_START + 76)
-#define BMP_NET_SYMB_STACK_HC (RID_SCH_START + 77)
-#define BMP_NET_LINESYMB_HC (RID_SCH_START + 78)
-#define BMP_NET_LINESYMB_STACK_HC (RID_SCH_START + 79)
-#define BMP_NET_FILL_HC (RID_SCH_START + 80)
-#define BMP_NET_FILL_STACK_HC (RID_SCH_START + 81)
-
-//----------------------
-// Stock Chart Subtypes
-
-#define BMP_STOCK_1_HC (RID_SCH_START + 82)
-#define BMP_STOCK_2_HC (RID_SCH_START + 83)
-#define BMP_STOCK_3_HC (RID_SCH_START + 84)
-#define BMP_STOCK_4_HC (RID_SCH_START + 85)
-
-//----------------------
-// Column + Line Chart Subtypes
-
-#define BMP_COLUMN_LINE_HC (RID_SCH_START + 86)
-#define BMP_COLUMN_LINE_STACKED_HC (RID_SCH_START + 87)
-
-//----------------------
-// Bubble Chart Subtypes
-#define BMP_BUBBLE_1_HC (RID_SCH_START + 88)
-
-//-----------------------------------------------------------------------------
-//further Images:
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 1
-#define BMP_INDICATE_BOTH_VERTI_HC (RID_SCH_START + 89)
-#define BMP_INDICATE_UP_HC (RID_SCH_START + 90)
-#define BMP_INDICATE_DOWN_HC (RID_SCH_START + 91)
-#define BMP_INDICATE_BOTH_HORI_HC (RID_SCH_START + 97)
-#define BMP_INDICATE_RIGHT_HC (RID_SCH_START + 98)
-#define BMP_INDICATE_LEFT_HC (RID_SCH_START + 99)
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 2
-#define BMP_REGRESSION_NONE_HC (RID_SCH_START + 92)
-#define BMP_REGRESSION_LINEAR_HC (RID_SCH_START + 93)
-#define BMP_REGRESSION_LOG_HC (RID_SCH_START + 94)
-#define BMP_REGRESSION_EXP_HC (RID_SCH_START + 95)
-#define BMP_REGRESSION_POWER_HC (RID_SCH_START + 96)

chart2/source/controller/dialogs/DataBrowser.cxx

@@ -52,7 +52,6 @@
 #include "servicenames_charttypes.hxx"
 #include "ResId.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "HelpIds.hrc"
 
 #include <vcl/fixed.hxx>
@@ -69,8 +68,6 @@
 #include <algorithm>
 #include <functional>
 
-#define SELECT_IMAGE(name,hc) Image( SchResId( hc ? name ## _HC : name ))
-
 /*  BROWSER_COLUMNSELECTION :  single cells may be selected rather than only
                                entire rows
     BROWSER_(H|V)LINES :       show horizontal or vertical grid-lines
@@ -388,7 +385,9 @@ bool SeriesHeader::HasFocus() const
     return m_spSeriesName->HasFocus();
 }
 
-// static
+/**
+ * @param bHC is a noop. FIXME, remove carefully
+ */
 Image SeriesHeader::GetChartTypeImage(
     const Reference< chart2::XChartType > & xChartType,
     bool bSwapXAndYAxis,
@@ -401,40 +400,40 @@ Image SeriesHeader::GetChartTypeImage(
 
     if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_AREA, bHC );
+        aResult = Image( SchResId( IMG_TYPE_AREA ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ))
     {
         if( bSwapXAndYAxis )
-            aResult = SELECT_IMAGE( IMG_TYPE_BAR, bHC );
+            aResult = Image( SchResId( IMG_TYPE_BAR ));
         else
-            aResult = SELECT_IMAGE( IMG_TYPE_COLUMN, bHC );
+            aResult = Image( SchResId( IMG_TYPE_COLUMN ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_LINE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_LINE ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_XY, bHC );
+        aResult = Image( SchResId( IMG_TYPE_XY ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_PIE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_PIE ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET )
           || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_NET, bHC );
+        aResult = Image( SchResId( IMG_TYPE_NET ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ))
     {
         // @todo: correct image for candle-stick type
-        aResult = SELECT_IMAGE( IMG_TYPE_STOCK, bHC );
+        aResult = Image( SchResId( IMG_TYPE_STOCK ));
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_BUBBLE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_BUBBLE ));
     }
 
     return aResult;

chart2/source/controller/dialogs/RangeSelectionButton.cxx

@@ -31,7 +31,6 @@
 
 #include "RangeSelectionButton.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "Strings.hrc"
 #include "ResId.hxx"
 

chart2/source/controller/dialogs/ResourceIds.hrc

@@ -30,10 +30,7 @@
 
 //-----------------------------------------------------------------------------
 //for strings see Strings.hrc
-
-//-----------------------------------------------------------------------------
-//for Bimaps see Bimaps.hrc and Bimaps_HC.hrc
-
+//for Bimaps see Bimaps.hrc
 //-----------------------------------------------------------------------------
 //Dialog Ids:
 #define DLG_DIAGRAM_TYPE    743

chart2/source/controller/dialogs/dlg_DataEditor.cxx

@@ -70,7 +70,6 @@ DataEditor::DataEditor(
         m_xChartDoc( xChartDoc ),
         m_xContext( xContext ),
         m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )),
-        m_aToolboxImageListHighContrast( SchResId( IL_HC_DIAGRAM_DATA ))
 {
     FreeResource();
 
@@ -324,16 +323,14 @@ bool DataEditor::ApplyChangesToModel()
     return m_apBrwData->EndEditing();
 }
 
-// sets the correct toolbar icons depending on the current mode (e.g. high contrast)
+/**
+ * sets the correct toolbar icons depending on the current mode (e.g. high contrast)
+ * FIXME: does not serve any purpose anymore, as the high contrast theme has been removed
+ * FIXME: check callers and see if we can do away with it
+ */
 void DataEditor::ApplyImageList()
 {
-    bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    ImageList& rImgLst = bIsHighContrast
-        ? m_aToolboxImageListHighContrast
-        : m_aToolboxImageList;
-
-    m_aTbxData.SetImageList( rImgLst );
+    m_aTbxData.SetImageList( m_aToolboxImageList );
 }
 
 // add/remove a window (the toolbar) to/from the global list, so that F6

chart2/source/controller/dialogs/dlg_DataEditor.hrc

@@ -42,6 +42,5 @@
 #define TBI_DATA_SWAP_ROW 6
 #define TBI_DATA_INSERT_TEXT_COL 7
 
-// image lists (normal and high-contrast) for toolbox
+// image lists for toolbox
 #define IL_DIAGRAM_DATA     1
-#define IL_HC_DIAGRAM_DATA  2

chart2/source/controller/dialogs/dlg_DataEditor.src

@@ -138,11 +138,4 @@ ModalDialog DLG_DIAGRAM_DATA
         MaskColor = IMAGE_BUTTON_STD_MASK_COLOR;
         IMAGE_ID_LIST;
     };
-
-    ImageList IL_HC_DIAGRAM_DATA
-    {
-        Prefix = "dataeditor_icon_h";
-        MaskColor = IMAGE_BUTTON_HC_MASK_COLOR;
-        IMAGE_ID_LIST;
-    };
 };

chart2/source/controller/dialogs/makefile.mk

@@ -108,10 +108,6 @@ SLOFILES=   	\
 
 # --- Resources ---------------------------------------------------------------
 
-#               Bitmaps.src
-#               Bitmaps_HC.src
-
-
 SRC1FILES=		\
                 res_TextSeparator.src \
                 res_BarGeometry.src \
@@ -141,7 +137,6 @@ SRC1FILES=		\
                 Strings_AdditionalControls.src \
                 Strings.src \
                 Bitmaps.src \
-                Bitmaps_HC.src \
                 dlg_DataEditor.src \
                 dlg_DataSource.src \
                 dlg_View3D.src \
@@ -172,7 +167,6 @@ $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_SecondaryAxisCheckBoxes.hrc
 
 $(SRS)$/chcdialogs.srs: \
         Bitmaps.hrc \
-        Bitmaps_HC.hrc \
         CommonResources.hrc \
         ResourceIds.hrc \
         ..$/..$/inc$/Strings.hrc \

chart2/source/controller/dialogs/res_ErrorBar.cxx

@@ -34,7 +34,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "RangeSelectionHelper.hxx"
 // for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR
 #include "TabPageNotifiable.hxx"
@@ -92,10 +91,6 @@ namespace chart
 {
 //.............................................................................
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 enum StatIndicator
 {
     INDICATE_BOTH,
@@ -697,24 +692,17 @@ BOOL ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void ErrorBarResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aRbConst.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    // do not scale images, show then centered
-//     m_aFiPositive.SetStyle( (m_aFiPositive.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiNegative.SetStyle( (m_aFiNegative.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiBoth.SetStyle( (m_aFiBoth.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-
     if( m_eErrorBarType == ERROR_BAR_Y )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_DOWN ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_UP ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_VERTI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN )));
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP )));
+        m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI )));
     }
     else if( m_eErrorBarType == ERROR_BAR_X )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_LEFT ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_RIGHT ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_HORI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT )));
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT )));
+        m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI )));
     }
 }
 

chart2/source/controller/dialogs/res_Trendline.cxx

@@ -35,16 +35,11 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 
 #include <vector>
 #include <algorithm>
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 namespace
 {
 template< class T >
@@ -260,14 +255,12 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void TrendlineResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aFLType.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
     if( m_bNoneAvailable )
-        m_aFINone.SetImage( SELECT_IMAGE( BMP_REGRESSION_NONE ));
-    m_aFILinear.SetImage( SELECT_IMAGE( BMP_REGRESSION_LINEAR ));
-    m_aFILogarithmic.SetImage( SELECT_IMAGE( BMP_REGRESSION_LOG ));
-    m_aFIExponential.SetImage( SELECT_IMAGE( BMP_REGRESSION_EXP ));
-    m_aFIPower.SetImage( SELECT_IMAGE( BMP_REGRESSION_POWER ));
+        m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE ));
+    m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR ));
+    m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG ));
+    m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP ));
+    m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER ));
 }
 
 void TrendlineResources::UpdateControlStates()

chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx

@@ -34,7 +34,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "CommonConverters.hxx"
 #include "NoWarningThisInCTOR.hxx"
 

chart2/source/controller/dialogs/tp_ChartType.cxx

@@ -56,15 +56,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
 namespace
 {
     long lcl_getDistance()