[Libreoffice-commits] .: chart2/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Tue Nov 16 01:49:02 PST 2010
chart2/source/controller/dialogs/Bitmaps_HC.hrc | 210 ---
chart2/source/controller/dialogs/Bitmaps_HC.src | 534 ----------
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 235 ++--
chart2/source/controller/dialogs/DataBrowser.cxx | 25
chart2/source/controller/dialogs/RangeSelectionButton.cxx | 1
chart2/source/controller/dialogs/ResourceIds.hrc | 5
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 15
chart2/source/controller/dialogs/dlg_DataEditor.hrc | 3
chart2/source/controller/dialogs/dlg_DataEditor.src | 7
chart2/source/controller/dialogs/makefile.mk | 6
chart2/source/controller/dialogs/res_ErrorBar.cxx | 24
chart2/source/controller/dialogs/res_Trendline.cxx | 17
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1
chart2/source/controller/dialogs/tp_ChartType.cxx | 9
14 files changed, 159 insertions(+), 933 deletions(-)
New commits:
commit 886f069fbb966fa8badb4e7b77da75e99335f05f
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Tue Nov 16 10:48:24 2010 +0100
Removed more _HC instances
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
deleted file mode 100644
index c0e1d6a..0000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ /dev/null
@@ -1,210 +0,0 @@
-/*************************************************************************
- *
- * 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)
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src
deleted file mode 100644
index fe3c909..0000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ /dev/null
@@ -1,534 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#include "Bitmaps_HC.hrc"
-
-Image IMG_TYPE_COLUMN_HC
-{
- ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BAR_HC
-{
- ImageBitmap = Bitmap { File = "typebar_16.png " ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_PIE_HC
-{
- ImageBitmap = Bitmap { File = "typepie_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_LINE_HC
-{
- ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_XY_HC
-{
- ImageBitmap = Bitmap { File = "typexy_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_AREA_HC
-{
- ImageBitmap = Bitmap { File = "typearea_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_NET_HC
-{
- ImageBitmap = Bitmap { File = "typenet_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_STOCK_HC
-{
- ImageBitmap = Bitmap { File = "typestock_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_COLUMN_LINE_HC
-{
- ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BUBBLE_HC
-{
- ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
-};
-Bitmap BMP_BUBBLE_1_HC
-{
- File = "bubble_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_HC
-{
- File = "areas_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_1_HC
-{
- File = "areaspiled_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_3_HC
-{
- File = "areasfull_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_HC
-{
- File = "areaspiled3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_1_HC
-{
- File = "areas3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_2_HC
-{
- File = "areasfull3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_BARS_2D_1_HC
-{
- File = "bar_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_2_HC
-{
- File = "barstack_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_3_HC
-{
- File = "barpercent_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_HC
-{
- File = "bar3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_1_HC
-{
- File = "bar3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_2_HC
-{
- File = "barstack3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_3_HC
-{
- File = "barpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_CIRCLES_2D_HC
-{
- File = "pie_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_2D_EXPLODED_HC
-{
- File = "pieexploded_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_HC
-{
- File = "pie3d_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_EXPLODED_HC
-{
- File = "pie3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_DONUT_2D_HC
-{
- File = "donut_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_2D_EXPLODED_HC
-{
- File = "donutexploded_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_HC
-{
- File = "donut3d_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_EXPLODED_HC
-{
- File = "donut3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_2D_1_HC
-{
- File = "columns_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_2_HC
-{
- File = "columnstack_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_3_HC
-{
- File = "columnpercent_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_HC
-{
- File = "columnline_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_STACKED_HC
-{
- File = "columnstackline_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_3D_HC
-{
- File = "columns3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_1_HC
-{
- File = "columns3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_2_HC
-{
- File = "columnstack3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_3_HC
-{
- File = "columnpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_KEGELQ_3D_1_HC
-{
- File = "conehori_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_2_HC
-{
- File = "conehoristack_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_3_HC
-{
- File = "conehoripercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_4_HC
-{
- File = "conehorideep_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_1_HC
-{
- File = "cone_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_2_HC
-{
- File = "conestack_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_3_HC
-{
- File = "conepercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_4_HC
-{
- File = "conedeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_POINTS_XVALUES_HC
-{
- File = "valueaxisdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_XCATEGORY_HC
-{
- File = "nostackdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_STACKED_HC
-{
- File = "stackdirectpoints_52x60_h.png" ;
-};
-//---------------------
-
-Bitmap BMP_LINE_P_XVALUES_HC
-{
- File = "valueaxisdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_HC
-{
- File = "valueaxisdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_HC
-{
- File = "valueaxisdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_XCATEGORY_HC
-{
- File = "nostackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_HC
-{
- File = "nostackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_HC
-{
- File = "nostackdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_STACKED_HC
-{
- File = "stackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_HC
-{
- File = "stackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_HC
-{
- File = "stackdirect3d_52x60_h.png" ;
-};
-
-//---------------------
-Bitmap BMP_LINE_P_XVALUES_SMOOTH_HC
-{
- File = "valueaxissmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_SMOOTH_HC
-{
- File = "valueaxissmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_SMOOTH_HC
-{
- File = "valueaxissmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_XCATEGORY_SMOOTH_HC
-{
- File = "nostacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_SMOOTH_HC
-{
- File = "nostacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_SMOOTH_HC
-{
- File = "nostacksmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_STACKED_SMOOTH_HC
-{
- File = "stacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_SMOOTH_HC
-{
- File = "stacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_SMOOTH_HC
-{
- File = "stacksmooth3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_NET_HC
-{
- File = "net_52x60_h.png" ;
-};
-Bitmap BMP_NET_STACK_HC
-{
- File = "netstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_HC
-{
- File = "netpoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_STACK_HC
-{
- File = "netpointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_HC
-{
- File = "netlinepoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_STACK_HC
-{
- File = "netlinepointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_HC
-{
- File = "netfill_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_STACK_HC
-{
- File = "netstackfill_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_PYRAMIDQ_3D_1_HC
-{
- File = "pyramindhori_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_2_HC
-{
- File = "pyramindhoristack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_3_HC
-{
- File = "pyramindhoripercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_4_HC
-{
- File = "pyramindhorideep_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_1_HC
-{
- File = "pyramind_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_2_HC
-{
- File = "pyramindstack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_3_HC
-{
- File = "pyramindpercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_4_HC
-{
- File = "pyraminddeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_ROEHRE_3D_1_HC
-{
- File = "cylinderhori_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_2_HC
-{
- File = "cylinderhoristack_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_3_HC
-{
- File = "cylinderhoriprocent_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_4_HC
-{
- File = "cylinderhorideep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_SAEULE_3D_1_HC
-{
- File = "cylinder_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_2_HC
-{
- File = "cylinderstack_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_3_HC
-{
- File = "cylinderpercent_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_4_HC
-{
- File = "cylinderdeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_STOCK_1_HC
-{
- File = "stock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_2_HC
-{
- File = "stockblock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_3_HC
-{
- File = "stockcolumns_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_4_HC
-{
- File = "stockcolumnsattach_52x60_h.png" ;
-};
-//---------------------
-//---------------------
-//---------------------
-//error indicator
-Image BMP_INDICATE_BOTH_VERTI_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errorbothverti_30_h.png" ;
- };
-};
-Image BMP_INDICATE_DOWN_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errordown_30_h.png" ;
- };
-};
-Image BMP_INDICATE_UP_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errorup_30_h.png" ;
- };
-};
-Image BMP_INDICATE_BOTH_HORI_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errorbothhori_30_h.png" ;
- };
-};
-Image BMP_INDICATE_RIGHT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errorright_30_h.png" ;
- };
-};
-Image BMP_INDICATE_LEFT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "errorleft_30_h.png" ;
- };
-};
-
-//---------------------
-//regression curves
-Image BMP_REGRESSION_NONE_HC
-{
- ImageBitmap = Bitmap
- {
- File = "regno_h.bmp" ;
- };
-};
-Image BMP_REGRESSION_LINEAR_HC
-{
- ImageBitmap = Bitmap
- {
- File = "reglin_h.bmp" ;
- };
-};
-Image BMP_REGRESSION_LOG_HC
-{
- ImageBitmap = Bitmap
- {
- File = "reglog_h.bmp" ;
- };
-};
-Image BMP_REGRESSION_EXP_HC
-{
- ImageBitmap = Bitmap
- {
- File = "regexp_h.bmp" ;
- };
-};
-Image BMP_REGRESSION_POWER_HC
-{
- ImageBitmap = Bitmap
- {
- File = "regpow_h.bmp" ;
- };
-};
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 0911f95..2acbab0 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -34,7 +34,6 @@
#include "HelpIds.hrc"
#include "Strings.hrc"
#include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
#include "macros.hxx"
#include "ChartModelHelper.hxx"
#include "DiagramHelper.hxx"
@@ -61,11 +60,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 ))
-
ChartTypeParameter::ChartTypeParameter()
: nSubTypeIndex( 1 )
, bXAxisWithValues( false )
@@ -449,9 +443,12 @@ String ColumnChartDialogController::getName()
{
return String( SchResId( STR_TYPE_COLUMN ));
}
+/*
+ * @param bIsHighContrast, this is now an unused noop. FIXME, remove carefully.
+ */
Image ColumnChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_COLUMN );
+ return Image( SchResId( IMG_TYPE_COLUMN ));
}
const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
{
@@ -476,36 +473,36 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool
switch(rParameter.nGeometry3D)
{
case DataPointGeometry3D::CYLINDER:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_SAEULE_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_SAEULE_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_SAEULE_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_SAEULE_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_SAEULE_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_SAEULE_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_SAEULE_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_SAEULE_3D_4 )));
break;
case DataPointGeometry3D::CONE:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGEL_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGEL_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGEL_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGEL_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGEL_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGEL_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGEL_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGEL_3D_4 )));
break;
case DataPointGeometry3D::PYRAMID:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMID_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMID_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMID_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMID_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMID_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMID_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMID_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMID_3D_4 )));
break;
default: //DataPointGeometry3D::CUBOID:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_COLUMNS_3D ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_COLUMNS_3D )));
break;
}
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_2D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_2D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_2D_3 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_2D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_2D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 )));
}
rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
@@ -526,9 +523,12 @@ String BarChartDialogController::getName()
{
return String( SchResId( STR_TYPE_BAR ));
}
+/**
+ * @param bIsHighContrast This is now an unused Noop. FIXME: remove carefully
+ */
Image BarChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_BAR );
+ return Image( SchResId( IMG_TYPE_BAR ));
}
const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
{
@@ -553,36 +553,36 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
switch(rParameter.nGeometry3D)
{
case DataPointGeometry3D::CYLINDER:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_ROEHRE_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_ROEHRE_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_ROEHRE_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_ROEHRE_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_ROEHRE_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_ROEHRE_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_ROEHRE_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_ROEHRE_3D_4 )));
break;
case DataPointGeometry3D::CONE:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGELQ_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGELQ_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGELQ_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGELQ_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGELQ_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGELQ_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGELQ_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGELQ_3D_4 )));
break;
case DataPointGeometry3D::PYRAMID:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMIDQ_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMIDQ_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMIDQ_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMIDQ_3D_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMIDQ_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMIDQ_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMIDQ_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMIDQ_3D_4 )));
break;
default: //DataPointGeometry3D::CUBOID:
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_3D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_3D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_3D_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_BARS_3D ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_3D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_3D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_3D_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_BARS_3D )));
break;
}
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_2D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_2D_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_2D_3 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_2D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 )));
}
rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
@@ -602,9 +602,12 @@ String PieChartDialogController::getName()
{
return String( SchResId( STR_TYPE_PIE ));
}
+/**
+ * @param bIsHighContrast: This is now an unused Noop. FIXME, remove carefully.
+ */
Image PieChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_PIE );
+ return Image( SchResId( IMG_TYPE_PIE ));
}
const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
{
@@ -627,17 +630,17 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
if( rParameter.b3DLook )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_3D ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_3D_EXPLODED ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_3D ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_3D_EXPLODED ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_3D )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_3D_EXPLODED )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_3D )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_3D_EXPLODED )));
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_2D ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_2D_EXPLODED ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_2D ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_2D_EXPLODED ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_2D )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_2D_EXPLODED )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED )));
}
rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED )) );
@@ -664,9 +667,12 @@ String LineChartDialogController::getName()
{
return String( SchResId( STR_TYPE_LINE ));
}
+/**
+ * @param bIsHighContrast: This is now an noop. FIXME: please remove carefully.
+ */
Image LineChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_LINE );
+ return Image( SchResId( IMG_TYPE_LINE ));
}
const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
{
@@ -700,34 +706,34 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
//direct lines
if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY )));
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED )));
}
}
else //CurveStyle_LINES
{
if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY_SMOOTH ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY_SMOOTH ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY_SMOOTH ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_SMOOTH )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_SMOOTH )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_SMOOTH )));
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED_SMOOTH ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED_SMOOTH ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_SMOOTH )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_SMOOTH )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_SMOOTH )));
}
}
@@ -799,7 +805,7 @@ String XYChartDialogController::getName()
}
Image XYChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_XY );
+ return Image( SchResId( IMG_TYPE_XY ));
}
const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
{
@@ -819,18 +825,18 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsH
if( CurveStyle_LINES==rParameter.eCurveStyle )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
}
else //CurveStyle_LINES
{
//smooth lines
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES_SMOOTH ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES_SMOOTH )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES_SMOOTH )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES_SMOOTH )));
}
rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -884,9 +890,12 @@ String AreaChartDialogController::getName()
{
return String( SchResId( STR_TYPE_AREA ));
}
+/**
+ * @param: bIsHighContrast: This is now an unused noop. FIXME, please remove carefully.
+ */
Image AreaChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_AREA );
+ return Image( SchResId( IMG_TYPE_AREA ));
}
bool AreaChartDialogController::shouldShow_3DLookControl() const
{
@@ -911,15 +920,15 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
if( rParameter.b3DLook )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_3D ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_3D_1 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_3D_2 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_3D ) );
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_3D_1 ) );
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_3D_2 ) );
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_2D_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_2D_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_2D )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 )));
}
rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) );
@@ -967,9 +976,12 @@ String NetChartDialogController::getName()
{
return String( SchResId( STR_TYPE_NET ));
}
+/**
+ * @param bIsHighContrast this is now an unused noop. Please remove carefully.
+ */
Image NetChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_NET );
+ return Image( SchResId( IMG_TYPE_NET ));
}
bool NetChartDialogController::shouldShow_StackingControl() const
{
@@ -1004,17 +1016,17 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
if( GlobalStackMode_NONE == rParameter.eStackMode )
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL )));
}
else
{
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB_STACK ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB_STACK ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET_STACK ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL_STACK ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB_STACK )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB_STACK )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET_STACK )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK )));
}
rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -1060,9 +1072,12 @@ String StockChartDialogController::getName()
{
return String( SchResId( STR_TYPE_STOCK ));
}
+/**
+ * @param bIsHighContrast this is now an unused noop. FIXME, please remove carefully.
+ */
Image StockChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_STOCK );
+ return Image( SchResId( IMG_TYPE_STOCK ));
}
const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
{
@@ -1078,10 +1093,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp
void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_STOCK_1 ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_STOCK_2 ) );
- rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_STOCK_3 ) );
- rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_STOCK_4 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_STOCK_1 )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_STOCK_2 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 )));
+ rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 )));
rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) );
@@ -1111,9 +1126,12 @@ String CombiColumnLineChartDialogController::getName()
{
return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
}
+/**
+ * @param bIsHighContrast this is now an unused noop. FIXME, please remove carefully
+ */
Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_COLUMN_LINE );
+ return Image( SchResId( IMG_TYPE_COLUMN_LINE ));
}
const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
{
@@ -1127,8 +1145,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle
void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMN_LINE ) );
- rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMN_LINE_STACKED ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED )));
rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) );
@@ -1251,9 +1269,12 @@ String BubbleChartDialogController::getName()
{
return String( SchResId( STR_TYPE_BUBBLE ));
}
+/**
+ * @param bIsHighContrast this is now a noop. FIXME, please remove carefully
+ */
Image BubbleChartDialogController::getImage( bool bIsHighContrast )
{
- return SELECT_IMAGE( IMG_TYPE_BUBBLE );
+ return Image( SchResId( IMG_TYPE_BUBBLE ));
}
const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
{
@@ -1265,7 +1286,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem
void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
- rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BUBBLE_1 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 )));
rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) );
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 7005284..8f05899 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/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;
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 9b7e6ba..df6f9e9 100644
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/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"
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 4e6f015..3cf9e4e 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/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
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 8523495..9744b45 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/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
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc
index c8c0536..522dac0 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc
+++ b/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
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src
index 002ff09..552fbb4 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.src
+++ b/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;
- };
};
diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk
index d22f5c8..dfeb028 100644
--- a/chart2/source/controller/dialogs/makefile.mk
+++ b/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 \
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index adca253..7e90649 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/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 )));
}
}
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 100d910..c4c3674 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/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()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 41d3449..e8b0984 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/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"
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 9fac737..1b0811c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/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()
More information about the Libreoffice-commits
mailing list