diff options
Diffstat (limited to 'chart2/source/controller/dialogs')
39 files changed, 248 insertions, 1237 deletions
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index 3945090217e0..cf7b30410210 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.src @@ -33,7 +33,7 @@ Image IMG_TYPE_COLUMN }; Image IMG_TYPE_BAR { - ImageBitmap = Bitmap { File = "typebar_16.png " ; }; + ImageBitmap = Bitmap { File = "typebar_16.png" ; }; MaskColor = STD_MASKCOLOR; }; Image IMG_TYPE_PIE @@ -501,35 +501,35 @@ Image BMP_REGRESSION_NONE { ImageBitmap = Bitmap { - File = "regno.bmp" ; + File = "regno.png" ; }; }; Image BMP_REGRESSION_LINEAR { ImageBitmap = Bitmap { - File = "reglin.bmp" ; + File = "reglin.png" ; }; }; Image BMP_REGRESSION_LOG { ImageBitmap = Bitmap { - File = "reglog.bmp" ; + File = "reglog.png" ; }; }; Image BMP_REGRESSION_EXP { ImageBitmap = Bitmap { - File = "regexp.bmp" ; + File = "regexp.png" ; }; }; Image BMP_REGRESSION_POWER { ImageBitmap = Bitmap { - File = "regpow.bmp" ; + File = "regpow.png" ; }; }; //--------------------- diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc deleted file mode 100644 index 16bffd0cf86d..000000000000 --- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc +++ /dev/null @@ -1,213 +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) - -// hide-button for range-choosing -#define IMG_SELECTRANGE_HC (RID_SCH_START + 100) diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src deleted file mode 100644 index 738c133483e1..000000000000 --- a/chart2/source/controller/dialogs/Bitmaps_HC.src +++ /dev/null @@ -1,543 +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" ; - }; -}; -//--------------------- -Image IMG_SELECTRANGE_HC -{ - ImageBitmap = Bitmap - { - File = "selectrange.png"; - }; - MaskColor = SC_HC_MASKCOLOR; -}; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 60c2d87ec784..0c7a1f10fb06 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,16 +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 )) - -/* - ( C2U( "com.sun.star.chart2.template.Surface" ), CHSTYLE_3D_SURFACE) - ( C2U( "com.sun.star.chart2.template.Addin" ), CHSTYLE_ADDIN) -*/ - ChartTypeParameter::ChartTypeParameter() : nSubTypeIndex( 1 ) , bXAxisWithValues( false ) @@ -146,7 +135,7 @@ ChartTypeDialogController::ChartTypeDialogController() ChartTypeDialogController::~ChartTypeDialogController() { } -Image ChartTypeDialogController::getImage( bool /*bIsHighContrast*/ ) +Image ChartTypeDialogController::getImage() { return Image(); } @@ -372,7 +361,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame } return false; } -void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool /*bIsHighContrast*/, const ChartTypeParameter& /*rParameter*/ ) +void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); } @@ -454,9 +443,9 @@ String ColumnChartDialogController::getName() { return String( SchResId( STR_TYPE_COLUMN )); } -Image ColumnChartDialogController::getImage( bool bIsHighContrast ) +Image ColumnChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_COLUMN ); + return Image( SchResId( IMG_TYPE_COLUMN )); } const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const { @@ -472,7 +461,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem ; return m_aTemplateMap; } -void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -481,36 +470,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 )) ); @@ -531,9 +520,9 @@ String BarChartDialogController::getName() { return String( SchResId( STR_TYPE_BAR )); } -Image BarChartDialogController::getImage( bool bIsHighContrast ) +Image BarChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_BAR ); + return Image( SchResId( IMG_TYPE_BAR )); } const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const { @@ -549,7 +538,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla ; return m_aTemplateMap; } -void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -558,36 +547,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 )) ); @@ -607,9 +596,9 @@ String PieChartDialogController::getName() { return String( SchResId( STR_TYPE_PIE )); } -Image PieChartDialogController::getImage( bool bIsHighContrast ) +Image PieChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_PIE ); + return Image( SchResId( IMG_TYPE_PIE )); } const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const { @@ -626,29 +615,30 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla ; return m_aTemplateMap; } -void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); 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 )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED )) ); + rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) ); + rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) ); + rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) ); + rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) ); } + bool PieChartDialogController::shouldShow_3DLookControl() const { return true; @@ -669,9 +659,9 @@ String LineChartDialogController::getName() { return String( SchResId( STR_TYPE_LINE )); } -Image LineChartDialogController::getImage( bool bIsHighContrast ) +Image LineChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_LINE ); + return Image( SchResId( IMG_TYPE_LINE )); } const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const { @@ -688,7 +678,6 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl ( C2U( "com.sun.star.chart2.template.StackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) //------------------------------------------------------- - //( C2U( "com.sun.star.chart2.template.ThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_NONE,false,true) ) ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) @@ -696,7 +685,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl ; return m_aTemplateMap; } -void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -705,34 +694,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 ))); } } @@ -802,9 +791,9 @@ String XYChartDialogController::getName() { return String( SchResId( STR_TYPE_XY )); } -Image XYChartDialogController::getImage( bool bIsHighContrast ) +Image XYChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_XY ); + return Image( SchResId( IMG_TYPE_XY )); } const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const { @@ -818,24 +807,24 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat ; return m_aTemplateMap; } -void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); 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 )) ); @@ -889,9 +878,9 @@ String AreaChartDialogController::getName() { return String( SchResId( STR_TYPE_AREA )); } -Image AreaChartDialogController::getImage( bool bIsHighContrast ) +Image AreaChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_AREA ); + return Image( SchResId( IMG_TYPE_AREA )); } bool AreaChartDialogController::shouldShow_3DLookControl() const { @@ -910,21 +899,21 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl ; return m_aTemplateMap; } -void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); 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 )) ); @@ -972,9 +961,9 @@ String NetChartDialogController::getName() { return String( SchResId( STR_TYPE_NET )); } -Image NetChartDialogController::getImage( bool bIsHighContrast ) +Image NetChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_NET ); + return Image( SchResId( IMG_TYPE_NET )); } bool NetChartDialogController::shouldShow_StackingControl() const { @@ -1003,23 +992,23 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla ; return m_aTemplateMap; } -void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) +void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); 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 )) ); @@ -1058,17 +1047,20 @@ StockChartDialogController::StockChartDialogController() { bSupports3D = false; } + StockChartDialogController::~StockChartDialogController() { } + String StockChartDialogController::getName() { return String( SchResId( STR_TYPE_STOCK )); } -Image StockChartDialogController::getImage( bool bIsHighContrast ) +Image StockChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_STOCK ); + return Image( SchResId( IMG_TYPE_STOCK )); } + const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = @@ -1080,13 +1072,13 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp ; return m_aTemplateMap; } -void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ ) +void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, 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 )) ); @@ -1105,6 +1097,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController() { bSupports3D = false; } + CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() { if(m_pFT_NumberOfLines) @@ -1112,14 +1105,17 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() if(m_pMF_NumberOfLines) delete m_pMF_NumberOfLines; } + String CombiColumnLineChartDialogController::getName() { return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } -Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast ) + +Image CombiColumnLineChartDialogController::getImage( ) { - return SELECT_IMAGE( IMG_TYPE_COLUMN_LINE ); + return Image( SchResId( IMG_TYPE_COLUMN_LINE ) ); } + const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = @@ -1129,11 +1125,11 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle ; return m_aTemplateMap; } -void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ ) +void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, 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 )) ); @@ -1256,9 +1252,9 @@ String BubbleChartDialogController::getName() { return String( SchResId( STR_TYPE_BUBBLE )); } -Image BubbleChartDialogController::getImage( bool bIsHighContrast ) +Image BubbleChartDialogController::getImage() { - return SELECT_IMAGE( IMG_TYPE_BUBBLE ); + return Image( SchResId( IMG_TYPE_BUBBLE )); } const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const { @@ -1267,10 +1263,10 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem ( C2U( "com.sun.star.chart2.template.Bubble" ), ChartTypeParameter(1,true) ) ; return m_aTemplateMap; } -void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ ) +void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, 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/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index fea77c753291..787189149fb7 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -103,9 +103,9 @@ public: virtual ~ChartTypeDialogController(); virtual String getName()=0; - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual bool shouldShow_XAxisTypeControl() const; virtual bool shouldShow_3DLookControl() const; @@ -159,9 +159,9 @@ public: virtual ~ColumnChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); }; class BarChartDialogController : public ColumnOrBarChartDialogController_Base @@ -171,9 +171,9 @@ public: virtual ~BarChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); }; class PieChartDialogController : public ChartTypeDialogController @@ -183,9 +183,9 @@ public: virtual ~PieChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual bool shouldShow_3DLookControl() const; @@ -198,9 +198,9 @@ public: virtual ~LineChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); @@ -216,9 +216,9 @@ public: virtual ~XYChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual bool shouldShow_SplineControl() const; @@ -232,9 +232,9 @@ public: virtual ~AreaChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); @@ -248,9 +248,9 @@ public: virtual ~NetChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual bool shouldShow_StackingControl() const; @@ -263,9 +263,9 @@ public: virtual ~StockChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); }; @@ -276,9 +276,9 @@ public: virtual ~CombiColumnLineChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ); @@ -304,9 +304,9 @@ public: virtual ~BubbleChartDialogController(); virtual String getName(); - virtual Image getImage( bool bIsHighContrast ); + virtual Image getImage(); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); }; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 4c098c9e759e..0e333b0e7627 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 @@ -91,7 +88,6 @@ // with shift up/down, and entering non-editable cells would be problematic, // e.g. the first cell, or when being in read-only mode - using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -143,6 +139,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) : m_nStartColumn( 0 ), m_bShowWarningBox( false ) {} + SeriesHeaderEdit::~SeriesHeaderEdit() {} @@ -179,8 +176,7 @@ public: void SetPos( const Point & rPos ); void SetWidth( sal_Int32 nWidth ); void SetChartType( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis, - bool bIsHighContrast ); + bool bSwapXAndYAxis ); void SetSeriesName( const String & rName ); void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol ); @@ -216,11 +212,10 @@ private: DECL_LINK( SeriesNameChanged, void * ); DECL_LINK( SeriesNameEdited, void * ); - /// @param bHC </TRUE> for hight-contrast image static Image GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis, - bool bHC ); + bool bSwapXAndYAxis + ); sal_Int32 m_nStartCol, m_nEndCol; sal_Int32 m_nWidth; @@ -311,7 +306,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth ) SetPos( m_aPos ); } - void SeriesHeader::SetPixelPosX( sal_Int32 nPos ) { Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT )); @@ -326,10 +320,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth ) void SeriesHeader::SetChartType( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis, - bool bIsHighContrast ) + bool bSwapXAndYAxis +) { - m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis, bIsHighContrast )); + m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) ); } void SeriesHeader::SetSeriesName( const String & rName ) @@ -388,11 +382,10 @@ bool SeriesHeader::HasFocus() const return m_spSeriesName->HasFocus(); } -// static Image SeriesHeader::GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis, - bool bHC ) + bool bSwapXAndYAxis +) { Image aResult; if( !xChartType.is()) @@ -401,40 +394,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; @@ -627,7 +620,6 @@ void DataBrowser::RenewTable() const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders()); Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus )); Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged )); - bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false; for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin()); aIt != aHeaders.end(); ++aIt ) @@ -639,7 +631,7 @@ void DataBrowser::RenewTable() if( xSeriesProp.is() && ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) spHeader->SetColor( Color( nColor )); - spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast ); + spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( String( DataSeriesHelper::getDataSeriesLabel( aIt->m_xDataSeries, @@ -1020,19 +1012,6 @@ void DataBrowser::PaintCell( if( ! bEnabled ) rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() ); - // TEST -// if( nColumnId == 1 ) -// // categories -// rDev.SetFillColor( Color( 0xff, 0xff, 0xff )); -// else if( nColumnId == 2 ) -// // x-values -// rDev.SetFillColor( Color( 0xf0, 0xf0, 0xff )); -// else -// // y-values -// rDev.SetFillColor( Color( 0xff, 0xff, 0xf0 )); - -// rDev.DrawRect( rRect ); - // draw the text rDev.DrawText( aPos, aText ); @@ -1245,7 +1224,6 @@ void DataBrowser::RenewSeriesHeaders() DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders()); Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus )); Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged )); - bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false; for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin()); aIt != aHeaders.end(); ++aIt ) @@ -1256,7 +1234,7 @@ void DataBrowser::RenewSeriesHeaders() if( xSeriesProp.is() && ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) spHeader->SetColor( Color( nColor )); - spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast ); + spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( String( DataSeriesHelper::getDataSeriesLabel( aIt->m_xDataSeries, diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 1a84ec0be18a..a5d56b81e4f6 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -317,7 +317,6 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural } break; case OBJECTTYPE_DATA_STOCK_RANGE: - //aRet=String(SchResId()); break; case OBJECTTYPE_DATA_STOCK_LOSS: aRet=String(SchResId(STR_OBJECT_STOCK_LOSS)); @@ -659,11 +658,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel ); sal_Unicode aDecimalSep( '.' ); - // replace average value -// SvtSysLocale aSysLocale; -// OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep()); -// if( aSep.getLength() == 1 ) -// aDecimalSep = aSep.toChar(); sal_Int32 nIndex = -1; OUString aWildcard( C2U("%AVERAGE_VALUE") ); @@ -783,7 +777,6 @@ rtl::OUString ObjectNameProvider::getNameForCID( return getGridName( rObjectCID, xModel ); case OBJECTTYPE_DATA_SERIES: return lcl_getFullSeriesName( rObjectCID, xModel ); - //case OBJECTTYPE_LEGEND_ENTRY: case OBJECTTYPE_DATA_POINT: case OBJECTTYPE_DATA_LABELS: case OBJECTTYPE_DATA_LABEL: diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 30b1a0a33fb5..cea3192bacab 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" @@ -43,8 +42,7 @@ namespace chart RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { - SetModeImage( Image( SchResId(IMG_SELECTRANGE) ), BMP_COLOR_NORMAL ); - SetModeImage( Image( SchResId(IMG_SELECTRANGE_HC) ), BMP_COLOR_HIGHCONTRAST ); + SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) ); this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE)); } diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 2ab544c77ab1..b2f79fc09148 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 @@ -56,7 +53,6 @@ #define TP_LEGEND_POS 900 #define TP_DATA_DESCR 901 #define TP_ALIGNMENT 902 -//#define TP_SYMBOL 906 #define TP_LAYOUT 907 #define TP_OPTIONS 908 #define TP_POLAROPTIONS 909 diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b4cec65426e..cf189b1b82bf 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -121,11 +121,6 @@ String STR_PAGE_POSITIONING Text [ en-US ] = "Positioning" ; }; -// String STR_PAGE_STATISTICS -// { -// Text [ en-US ] = "Statistics" ; -// }; - String STR_PAGE_TRENDLINE_TYPE { Text[ en-US ] = "Type"; diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 1f445083738f..697f700d4de9 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.hrc @@ -31,21 +31,11 @@ //see attrib.hrc in old chart -//#define TP_LEGEND_POS 900 #define GRP_LEGEND 1 #define FL_LEGEND_TEXTORIENT 2 #define FT_LEGEND_TEXTDIR 3 #define LB_LEGEND_TEXTDIR 4 -//#define TP_DATA_DESCR 901 - -//#define TP_ALIGNMENT 902 -////#define FL_ORDER 2 -////#define RBT_SIDEBYSIDE 1 -////#define RBT_UPDOWN 2 -////#define RBT_DOWNUP 3 -////#define RBT_AUTOORDER 4 - #define FL_TEXTBREAK 3 #define CBX_TEXTBREAK 2 #define CBX_TEXTOVERLAP 4 @@ -62,32 +52,10 @@ #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 -/* -//Symbol-Tabpage (zum Teil sehr Aehnlich der SVX_AREA_TABPAGE) (obsolete) -//#define TP_SYMBOL 906 -#define RBT_COLOR 1 -#define RBT_GRADIENT 2 -#define RBT_HATCHING 3 -#define RBT_BITMAP 4 -#define RBT_INVISIBLE 5 -#define LB_COLOR 1 -#define LB_GRADIENT 2 -#define LB_HATCHING 3 -#define LB_BITMAP 4 - -#define GRP_FILL 1 -#define CTL_BITMAP_PREVIEW 6 -*/ - //------------ //from old chart tplabel.hrc -//#define TP_AXIS_LABEL 920 - #define CB_AXIS_LABEL_SCHOW_DESCR 1 - -//#define FL_AXIS_LABEL_FORMATTING 2 - #define FL_AXIS_LABEL_ORIENTATION 3 #define CT_AXIS_LABEL_DIAL 4 #define PB_AXIS_LABEL_TEXTSTACKED 5 @@ -107,12 +75,8 @@ #define RB_AXIS_LABEL_AUTOORDER 17 #define FL_SEPARATOR 18 - #define FT_AXIS_TEXTDIR 19 #define LB_AXIS_TEXTDIR 20 - -//#define TP_SCALE 903 - #define FL_SCALE 1 #define TXT_MIN 1 @@ -135,9 +99,6 @@ #define EDT_ORIGIN 4 #define MT_STEPHELP 10 - -//#define TP_AXIS_POSITIONS 904 - #define FL_AXIS_LINE 1 #define FL_LABELS 2 #define FL_TICKS 3 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 8225feba7a16..f2073c4e52e8 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -69,8 +69,7 @@ DataEditor::DataEditor( m_aTbxData( this, SchResId( TBX_DATA )), m_xChartDoc( xChartDoc ), m_xContext( xContext ), - m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )), - m_aToolboxImageListHighContrast( SchResId( IL_HC_DIAGRAM_DATA )) + m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )) { FreeResource(); @@ -116,8 +115,6 @@ DataEditor::DataEditor( SetOutputSizePixel( aWinSize ); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); - // allow travelling to toolbar with F6 notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::AddWindow )); } @@ -216,83 +213,11 @@ IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG ) return 0; } -// IMPL_LINK( DataEditor, BrowserColumnResized, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - -// IMPL_LINK( DataEditor, BrowserContentScrolled, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - void DataEditor::UpdateData() { m_apBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); } -// react on the change of the underlying document by displaying the new data -// void DataEditor::SFX_NOTIFY( -// SfxBroadcaster& rBC, -// const TypeId& rBCType, -// const SfxHint& rHint, -// const TypeId& rHintType ) -// { -// if( rHint.Type() == TYPE(SfxSimpleHint) ) -// { -// // note: if dynamic_cast works this should be changed -// switch( static_cast< const SfxSimpleHint & >( rHint ).GetId()) -// { -// case SFX_HINT_DOCCHANGED: -// UpdateData(); -// break; - -// case SFX_HINT_DYING: -// break; -// } -// } -// } - -// { -// BOOL bRet = TRUE; - -// // confirm changes currently made and not saved -// m_apBrwData->EndEditing(); - -// if( m_apBrwData->IsDirty() ) -// { -// QueryBox aSafetyQuery( this, WB_YES_NO_CANCEL | WB_DEF_YES, -// String( SchResId( STR_DIAGRAM_DATA_SAFETY_QUERY ))); -// long nQueryResult = aSafetyQuery.Execute(); - -// bRet = ( nQueryResult != RET_CANCEL ); - -// if( nQueryResult == RET_YES ) -// { -// // save changes -// ApplyChangesToModel(); -// } -// } - -// if( bRet ) -// { -// // close child window -// SfxBoolItem aItem( SID_DIAGRAM_DATA, FALSE ); -// if( m_pBindings ) -// { -// SfxDispatcher* pDisp = m_pBindings->GetDispatcher(); -// if( pDisp ) -// pDisp->Execute( SID_DIAGRAM_DATA, SFX_CALLMODE_ASYNCHRON, &aItem, 0L); -// else -// DBG_ERROR( "Couldn't dispatch command" ); -// } -// } - -// return ( bRet? SfxFloatingWindow::Close(): FALSE ); -// } - void DataEditor::AdaptBrowseBoxSize() { Size aSize( PixelToLogic( GetResizeOutputSizePixel(), MAP_APPFONT )); @@ -308,7 +233,6 @@ void DataEditor::Resize() { Dialog::Resize(); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); } BOOL DataEditor::Close() @@ -327,13 +251,7 @@ bool DataEditor::ApplyChangesToModel() // sets the correct toolbar icons depending on the current mode (e.g. high contrast) 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 d2675c5bb29e..340fc814a439 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 dadd1ac3098d..4f4d33ebb832 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.src @@ -31,8 +31,6 @@ // Mask Color for standard images #define IMAGE_BUTTON_STD_MASK_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; } -// Mask Color for high-contrast images -#define IMAGE_BUTTON_HC_MASK_COLOR IMAGE_BUTTON_STD_MASK_COLOR #define ADDITIONAL_SPACE_ABOVE_TABLE 17 @@ -138,11 +136,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/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index cef864201c49..0ca0a2abc497 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -113,7 +113,6 @@ SchAxisDlg::SchAxisDlg( Window* pWindow aCbSecondaryZ.Hide(); Size aSize( GetSizePixel() ); - //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height(); aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() ); SetSizePixel(aSize); } diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..91d995b5231c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src @@ -36,7 +36,6 @@ ModalDialog DLG_AXIS_OR_GRID HelpID = SID_INSERT_AXIS ; OutputSize = TRUE ; SVLook = TRUE ; - //Size = MAP_APPFONT ( 160 , 99 ) ; Size = MAP_APPFONT ( 160 , 113 ) ; Moveable = TRUE ; diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..f7a61cf1e283 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -33,7 +33,6 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..24704f0d0c7c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src @@ -45,4 +45,3 @@ ModalDialog DLG_DATA_TRENDLINE BUTTONS_OK_CANCEL_HELP_STACKED( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES ) RESOURCE_TRENDLINE( DLG_DATA_TRENDLINE_RES_WIDTH, 22 ) }; - diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 88f8b43401ce..a7f30165c0c2 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -324,7 +324,6 @@ uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDoc return m_xChartDocument; } -//const USHORT nNoArrowDlg = 1100; const USHORT nNoArrowNoShadowDlg = 1101; //------------------------------------------------------------------- @@ -529,7 +528,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage) aSet.Put(SvxGraphicItem(SID_GRAPHIC,*m_pAutoSymbolGraphic)); } rPage.PageCreated(aSet); - //rPage.ActivatePage(*GetInputSetImpl()); //what for? break; case RID_SVXPAGE_AREA: @@ -540,7 +538,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage) aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,nPageType)); aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType)); rPage.PageCreated(aSet); - //rPage.ActivatePage(*GetInputSetImpl()); //what for? break; case RID_SVXPAGE_TRANSPARENCE: diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..0f1fb639d326 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.src @@ -45,4 +45,3 @@ TabDialog DLG_3D_VIEW }; BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3) }; - diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk index d22f5c83b081..cc6927476e64 100644 --- a/chart2/source/controller/dialogs/makefile.mk +++ b/chart2/source/controller/dialogs/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -40,7 +40,7 @@ GEN_HID_OTHER=TRUE # i26518 the gcc-3.0.4 requires to enhance the template-depth # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore -.IF "$(COM)"=="GCC" +.IF "$(COM)"=="GCC" CFLAGS+=-ftemplate-depth-128 .ENDIF @@ -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 \ @@ -159,7 +154,7 @@ SRC1FILES= \ SRS1NAME=$(TARGET) # --- Targets ----------------------------------------------------------------- -LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc +LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc .INCLUDE: target.mk $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_DataLabel.hrc $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_LegendPosition.hrc @@ -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 \ @@ -197,9 +191,5 @@ $(SRS)$/chcdialogs.srs: \ tp_RangeChooser.hrc \ tp_Wizard_TitlesAndObjects.hrc -# res_DataLabel.hrc \ -# res_LegendPosition.hrc \ -# res_Statistic.hrc \ - #$(SRS)$/chcdialogs.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 9a24eb06aa44..6f3531818ef4 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 ) ) ); } } @@ -728,8 +716,6 @@ void ErrorBarResources::listeningFinished( // rNewRange becomes invalid after removing the listener ::rtl::OUString aRange( rNewRange ); -// m_rDialogModel.startControllerLockTimer(); - // stop listening m_apRangeSelectionHelper->stopRangeListening(); diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 46435152be8c..dadfd998940a 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 > @@ -86,21 +81,22 @@ enum StatTrendLine TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs, bool bNoneAvailable ) : m_aFLType( pParent, SchResId( FL_TYPE )), - m_aRBNone( pParent, SchResId( RB_NONE )), - m_aRBLinear( pParent, SchResId( RB_LINEAR )), + m_aRBNone( pParent, SchResId( RB_NONE )), + m_aRBLinear( pParent, SchResId( RB_LINEAR )), m_aRBLogarithmic( pParent, SchResId( RB_LOGARITHMIC )), m_aRBExponential( pParent, SchResId( RB_EXPONENTIAL )), - m_aRBPower( pParent, SchResId( RB_POWER )), + m_aRBPower( pParent, SchResId( RB_POWER )), - m_aFINone( pParent, SchResId( FI_NONE )), - m_aFILinear( pParent, SchResId( FI_LINEAR )), + m_aFINone( pParent, SchResId( FI_NONE )), + m_aFILinear( pParent, SchResId( FI_LINEAR )), m_aFILogarithmic( pParent, SchResId( FI_LOGARITHMIC )), m_aFIExponential( pParent, SchResId( FI_EXPONENTIAL )), - m_aFIPower( pParent, SchResId( FI_POWER )), + m_aFIPower( pParent, SchResId( FI_POWER )), - m_aFLEquation( pParent, SchResId( FL_EQUATION )), - m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), + m_aFLEquation( pParent, SchResId( FL_EQUATION )), + m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), m_aCBShowCorrelationCoeff( pParent, SchResId( CB_SHOW_CORRELATION_COEFF )), + m_eTrendLineType( CHREGRESS_NONE ), m_bNoneAvailable( bNoneAvailable ), m_bTrendLineUnique( true ) @@ -260,14 +256,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_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..e9b4887da21a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -95,4 +95,3 @@ TabPage TP_3D_SCENEAPPEARANCE Text [ en-US ] = "~Rounded edges" ; }; }; - diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 35ae7ee8a1b3..b280f0476357 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -48,7 +48,6 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -//using namespace ::com::sun::star::chart2; namespace { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..85b306523960 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -144,4 +144,3 @@ TabPage TP_3D_SCENEGEOMETRY CustomUnitText = "%" ; }; }; - diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 3ccbe844bc97..dcf70f841db7 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" @@ -64,8 +63,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight : ImageButton( pParent, rResId ) , m_bLightOn(false) { - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ), BMP_COLOR_NORMAL ); - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST ); + SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) ); rtl::OUString aTipHelp( aTipHelpStr ); @@ -78,9 +76,11 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight } this->SetQuickHelpText( String( aTipHelp ) ); } + LightButton::~LightButton() { } + void LightButton::switchLightOn(bool bOn) { if( m_bLightOn==bOn ) @@ -88,15 +88,14 @@ void LightButton::switchLightOn(bool bOn) m_bLightOn = bOn; if(m_bLightOn) { - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ), BMP_COLOR_NORMAL ); - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON_H) ), BMP_COLOR_HIGHCONTRAST ); + SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ) ); } else { - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ), BMP_COLOR_NORMAL ); - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST ); + SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); } } + bool LightButton::isLightOn() const { return m_bLightOn; @@ -107,11 +106,10 @@ bool LightButton::isLightOn() const ColorButton::ColorButton( Window* pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ), BMP_COLOR_NORMAL ); - SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG_H) ), BMP_COLOR_HIGHCONTRAST ); - + SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) ); this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) ); } + ColorButton::~ColorButton() { } @@ -148,12 +146,14 @@ LightSourceInfo::LightSourceInfo() aLightSource.aDirection = drawing::Direction3D(1,1,1); aLightSource.bIsEnabled = sal_False; } + void LightSourceInfo::initButtonFromSource() { if(!pButton) return; - pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF ) ), BMP_COLOR_NORMAL ); - pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON_H : RID_SVXIMAGE_LIGHT_OFF_H ) ), BMP_COLOR_HIGHCONTRAST ); + pButton->SetModeImage( Image( SVX_RES( + aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF + ) ) ); } //----------------------------------------------------------------------------- @@ -353,8 +353,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); - //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 987812bea7c2..61fb13ecedd3 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -35,7 +35,6 @@ #include <vcl/button.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> -//class SvNumberFormatter; //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index d82879a93080..728e7e6cf443 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() @@ -850,8 +841,6 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent m_aSubTypeList.SetColCount(4); m_aSubTypeList.SetLineCount(1); - bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() ); - bool bDisableComplexChartTypes = false; uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY ); if ( xProps.is() ) @@ -887,7 +876,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( ; aIter != aEnd; aIter++ ) { - m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage( bIsHighContrast ) ); + m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() ); (*aIter)->setChangeListener( this ); } @@ -1085,10 +1074,7 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo { m_nChangingCalls++; if( m_pCurrentMainType && bAlsoResetSubTypeList ) - { - bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() ); - m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, bIsHighContrast, rParameter ); - } + m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, rParameter ); m_aSubTypeList.SelectItem( static_cast<USHORT>( rParameter.nSubTypeIndex) ); m_pAxisTypeResourceGroup->fillControls( rParameter ); m_pDim3DLookResourceGroup->fillControls( rParameter ); diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..aede04751907 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -31,7 +31,6 @@ TabPage TP_YERRORBAR { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_ERRORBARS( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..54b1065259df 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.src @@ -34,12 +34,14 @@ TabPage TP_LEGEND_POS HelpID = HID_SCH_LEGEND_POS ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; + FixedLine GRP_LEGEND { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Position" ; }; + RESOURCE_LEGENDPOSITION( 12, 14 ) FixedLine FL_LEGEND_TEXTORIENT @@ -48,12 +50,14 @@ TabPage TP_LEGEND_POS Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Text orientation" ; }; + FixedText FT_LEGEND_TEXTDIR { Pos = MAP_APPFONT ( 12 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 19 ) ; Size = MAP_APPFONT ( 64 , 8 ) ; Text [ en-US ] = "Te~xt direction" ; }; + ListBox LB_LEGEND_TEXTDIR { Pos = MAP_APPFONT ( 78 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 17 ) ; diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..6b8c75a25b29 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.src @@ -53,16 +53,16 @@ TabPage TP_LOCATION { Pos = MAP_APPFONT ( WIZ_POSX1 , WIZ_POSY1 ) ; Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Place chart" ; }; + FixedText FT_TABLE { Pos = MAP_APPFONT ( WIZ_POSX2 , WIZ_POSY2 ) ; Size = MAP_APPFONT ( TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "~Insert in sheet" ; }; + ListBox LB_TABLE { Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..39e1e1e9e21d 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -30,7 +30,6 @@ TabPage TP_LAYOUT { Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 4235a7bfcdc4..083dd668a1ff 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -186,9 +186,7 @@ void RangeChooserTabPage::initControlsFromModel() m_nChangingControlCalls++; if(m_pTemplateProvider) - { m_xCurrentChartTypeTemplate = m_pTemplateProvider->getCurrentTemplate(); - } bool bUseColumns = ! m_aRB_Rows.IsChecked(); bool bFirstCellAsLabel = bUseColumns ? m_aCB_FirstRowAsLabel.IsChecked() : m_aCB_FirstColumnAsLabel.IsChecked(); diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..e0705fc32083 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.src @@ -56,12 +56,14 @@ TabPage TP_SCALE Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Scale" ; }; + FixedText TXT_MIN { Pos = MAP_APPFONT ( X2 , Y1 ) ; Size = MAP_APPFONT ( LABELWIDTH , 8 ) ; Text [ en-US ] = "~Minimum:" ; }; + SpinField EDT_MIN { Border = TRUE ; @@ -70,6 +72,7 @@ TabPage TP_SCALE Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; TabStop = TRUE ; }; + CheckBox CBX_AUTO_MIN { Pos = MAP_APPFONT ( X4 , Y1-1 ) ; @@ -84,6 +87,7 @@ TabPage TP_SCALE Size = MAP_APPFONT ( LABELWIDTH , 8 ) ; Text [ en-US ] = "Ma~ximum:" ; }; + SpinField EDT_MAX { Border = TRUE ; @@ -92,6 +96,7 @@ TabPage TP_SCALE Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; TabStop = TRUE ; }; + CheckBox CBX_AUTO_MAX { Pos = MAP_APPFONT ( X4 , Y2-1 ) ; @@ -99,12 +104,14 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "A~utomatic" ; }; + FixedText TXT_STEP_MAIN { Pos = MAP_APPFONT ( X2 , Y3 ) ; Size = MAP_APPFONT ( LABELWIDTH , 8 ) ; Text [ en-US ] = "Ma~jor interval:" ; }; + SpinField EDT_STEP_MAIN { Border = TRUE ; @@ -112,6 +119,7 @@ TabPage TP_SCALE Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; TabStop = TRUE ; }; + CheckBox CBX_AUTO_STEP_MAIN { Pos = MAP_APPFONT ( X4 , Y3-1 ) ; @@ -119,12 +127,14 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Au~tomatic" ; }; + FixedText TXT_STEP_HELP { Pos = MAP_APPFONT ( X2 , Y4 ) ; Size = MAP_APPFONT ( LABELWIDTH , 8 ) ; Text [ en-US ] = "Minor interval ~count:" ; }; + MetricField MT_STEPHELP { Border = TRUE ; @@ -141,6 +151,7 @@ TabPage TP_SCALE Last = 100 ; SpinSize = 1 ; }; + CheckBox CBX_AUTO_STEP_HELP { Pos = MAP_APPFONT ( X4 , Y4-1 ) ; @@ -155,6 +166,7 @@ TabPage TP_SCALE Size = MAP_APPFONT ( LABELWIDTH , 8 ) ; Text [ en-US ] = "Reference ~value:" ; }; + SpinField EDT_ORIGIN { Border = TRUE ; @@ -186,5 +198,4 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Reverse direction" ; }; - }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index 7dab3449cb32..0d67feb22cee 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -30,15 +30,16 @@ TabPage TP_OPTIONS { Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; + FixedLine 1 { Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Align data series to"; }; + RadioButton RBT_OPT_AXIS_1 { Pos = MAP_APPFONT ( 12 , 20 ) ; @@ -46,6 +47,7 @@ TabPage TP_OPTIONS TabStop = TRUE ; Text [ en-US ] = "Primary Y axis"; }; + RadioButton RBT_OPT_AXIS_2 { Pos = MAP_APPFONT ( 12 , 34 ) ; @@ -60,6 +62,7 @@ TabPage TP_OPTIONS Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Settings"; }; + FixedText FT_OVERLAP { Pos = MAP_APPFONT ( 12 , 80 ) ; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src index 2ac0355d39af..c77d915fa583 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.src +++ b/chart2/source/controller/dialogs/tp_TitleRotation.src @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "HelpIds.hrc" #include "TabPages.hrc" @@ -90,4 +91,3 @@ TabPage TP_ALIGNMENT DropDown = TRUE; }; }; - diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index efa11d3e2d67..f7a3fa33a6d8 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -31,7 +31,6 @@ TabPage TP_TRENDLINE { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_TRENDLINE( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc index 44c340139782..c7802d403aef 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc @@ -27,19 +27,6 @@ #include "ResourceIds.hrc" -/* -#define ED_MAINTITLE 1 -#define ED_SUBTITLE 2 -#define ED_X_AXIS 3 -#define ED_Y_AXIS 4 -#define ED_Z_AXIS 5 -#define FT_MAINTITLE 1 -#define FT_SUBTITLE 2 -#define FT_TITLE_X_AXIS 3 -#define FT_TITLE_Y_AXIS 4 -#define FT_TITLE_Z_AXIS 5 -*/ - #define FT_TITLEDESCRIPTION 30 #define FL_VERTICAL 3 |