diff options
| -rw-r--r-- | chart2/AllLangResTarget_chartcontroller.mk | 4 | ||||
| -rw-r--r-- | chart2/inc/bitmaps.hlst | 136 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/Bitmaps.hrc | 207 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/Bitmaps.src | 552 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 228 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 20 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/ResourceIds.hrc | 2 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/res_ErrorBar.cxx | 14 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/res_Trendline.cxx | 14 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 2 | ||||
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 1 | ||||
| -rw-r--r-- | vcl/inc/bitmaps.hlst | 2 |
13 files changed, 281 insertions, 907 deletions
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 61aab696c817..9d9cddb3f974 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -32,8 +32,4 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/Strings_Statistic.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\ - chart2/source/controller/dialogs/Bitmaps.src \ -)) - # vim: set noet sw=4 ts=4: diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst new file mode 100644 index 000000000000..ac6f1d26c138 --- /dev/null +++ b/chart2/inc/bitmaps.hlst @@ -0,0 +1,136 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_CHART2_INC_BITMAPS_HRC +#define INCLUDED_CHART2_INC_BITMAPS_HRC + +#define BMP_TYPE_COLUMN "chart2/res/typecolumn_16.png" +#define BMP_TYPE_BAR "chart2/res/typebar_16.png" +#define BMP_TYPE_PIE "chart2/res/typepie_16.png" +#define BMP_TYPE_LINE "chart2/res/typepointline_16.png" +#define BMP_TYPE_XY "chart2/res/typexy_16.png" +#define BMP_TYPE_AREA "chart2/res/typearea_16.png" +#define BMP_TYPE_NET "chart2/res/typenet_16.png" +#define BMP_TYPE_STOCK "chart2/res/typestock_16.png" +#define BMP_TYPE_COLUMN_LINE "chart2/res/typecolumnline_16.png" +#define BMP_TYPE_BUBBLE "chart2/res/typebubble_16.png" +#define BMP_TYPE_GL3D_BAR "chart2/res/typegl3dbar_16.png" +#define BMP_BUBBLE_1 "chart2/res/bubble_52x60.png" +#define BMP_GL3D_BAR_ROUNDRECT "chart2/res/gl3dbar_roundrect.png" +#define BMP_AREAS_2D "chart2/res/areas_52x60.png" +#define BMP_AREAS_2D_1 "chart2/res/areaspiled_52x60.png" +#define BMP_AREAS_2D_3 "chart2/res/areasfull_52x60.png" +#define BMP_AREAS_3D "chart2/res/areaspiled3d_52x60.png" +#define BMP_AREAS_3D_1 "chart2/res/areas3d_52x60.png" +#define BMP_AREAS_3D_2 "chart2/res/areasfull3d_52x60.png" +#define BMP_BARS_2D_1 "chart2/res/bar_52x60.png" +#define BMP_BARS_2D_2 "chart2/res/barstack_52x60.png" +#define BMP_BARS_2D_3 "chart2/res/barpercent_52x60.png" +#define BMP_BARS_3D "chart2/res/bar3ddeep_52x60.png" +#define BMP_BARS_3D_1 "chart2/res/bar3d_52x60.png" +#define BMP_BARS_3D_2 "chart2/res/barstack3d_52x60.png" +#define BMP_BARS_3D_3 "chart2/res/barpercent3d_52x60.png" +#define BMP_CIRCLES_2D "chart2/res/pie_52x60.png" +#define BMP_CIRCLES_2D_EXPLODED "chart2/res/pieexploded_52x60.png" +#define BMP_CIRCLES_3D "chart2/res/pie3d_52x60.png" +#define BMP_CIRCLES_3D_EXPLODED "chart2/res/pie3dexploded_52x60.png" +#define BMP_DONUT_2D "chart2/res/donut_52x60.png" +#define BMP_DONUT_2D_EXPLODED "chart2/res/donutexploded_52x60.png" +#define BMP_DONUT_3D "chart2/res/donut3d_52x60.png" +#define BMP_DONUT_3D_EXPLODED "chart2/res/donut3dexploded_52x60.png" +#define BMP_COLUMNS_2D_1 "chart2/res/columns_52x60.png" +#define BMP_COLUMNS_2D_2 "chart2/res/columnstack_52x60.png" +#define BMP_COLUMNS_2D_3 "chart2/res/columnpercent_52x60.png" +#define BMP_COLUMN_LINE "chart2/res/columnline_52x60.png" +#define BMP_COLUMN_LINE_STACKED "chart2/res/columnstackline_52x60.png" +#define BMP_COLUMNS_3D "chart2/res/columns3ddeep_52x60.png" +#define BMP_COLUMNS_3D_1 "chart2/res/columns3d_52x60.png" +#define BMP_COLUMNS_3D_2 "chart2/res/columnstack3d_52x60.png" +#define BMP_COLUMNS_3D_3 "chart2/res/columnpercent3d_52x60.png" +#define BMP_KEGELQ_3D_1 "chart2/res/conehori_52x60.png" +#define BMP_KEGELQ_3D_2 "chart2/res/conehoristack_52x60.png" +#define BMP_KEGELQ_3D_3 "chart2/res/conehoripercent_52x60.png" +#define BMP_KEGELQ_3D_4 "chart2/res/conehorideep_52x60.png" +#define BMP_KEGEL_3D_1 "chart2/res/cone_52x60.png" +#define BMP_KEGEL_3D_2 "chart2/res/conestack_52x60.png" +#define BMP_KEGEL_3D_3 "chart2/res/conepercent_52x60.png" +#define BMP_KEGEL_3D_4 "chart2/res/conedeep_52x60.png" +#define BMP_POINTS_XVALUES "chart2/res/valueaxisdirectpoints_52x60.png" +#define BMP_POINTS_XCATEGORY "chart2/res/nostackdirectpoints_52x60.png" +#define BMP_POINTS_STACKED "chart2/res/stackdirectpoints_52x60.png" +#define BMP_LINE_P_XVALUES "chart2/res/valueaxisdirectboth_52x60.png" +#define BMP_LINE_O_XVALUES "chart2/res/valueaxisdirectlines_52x60.png" +#define BMP_LINE3D_XVALUES "chart2/res/valueaxisdirect3d_52x60.png" +#define BMP_LINE_P_XCATEGORY "chart2/res/nostackdirectboth_52x60.png" +#define BMP_LINE_O_XCATEGORY "chart2/res/nostackdirectlines_52x60.png" +#define BMP_LINE3D_XCATEGORY "chart2/res/nostackdirect3d_52x60.png" +#define BMP_LINE_P_STACKED "chart2/res/stackdirectboth_52x60.png" +#define BMP_LINE_O_STACKED "chart2/res/stackdirectlines_52x60.png" +#define BMP_LINE3D_STACKED "chart2/res/stackdirect3d_52x60.png" +#define BMP_LINE_P_XVALUES_SMOOTH "chart2/res/valueaxissmoothboth_52x60.png" +#define BMP_LINE_O_XVALUES_SMOOTH "chart2/res/valueaxissmoothlines_52x60.png" +#define BMP_LINE3D_XVALUES_SMOOTH "chart2/res/valueaxissmooth3d_52x60.png" +#define BMP_LINE_P_XCATEGORY_SMOOTH "chart2/res/nostacksmoothboth_52x60.png" +#define BMP_LINE_O_XCATEGORY_SMOOTH "chart2/res/nostacksmoothlines_52x60.png" +#define BMP_LINE3D_XCATEGORY_SMOOTH "chart2/res/nostacksmooth3d_52x60.png" +#define BMP_LINE_P_STACKED_SMOOTH "chart2/res/stacksmoothboth_52x60.png" +#define BMP_LINE_O_STACKED_SMOOTH "chart2/res/stacksmoothlines_52x60.png" +#define BMP_LINE3D_STACKED_SMOOTH "chart2/res/stacksmooth3d_52x60.png" +#define BMP_LINE_P_XVALUES_STEPPED "chart2/res/valueaxissteppedboth_52x60.png" +#define BMP_LINE_O_XVALUES_STEPPED "chart2/res/valueaxissteppedlines_52x60.png" +#define BMP_LINE3D_XVALUES_STEPPED "chart2/res/valueaxisstepped3d_52x60.png" +#define BMP_LINE_P_XCATEGORY_STEPPED "chart2/res/nostacksteppedboth_52x60.png" +#define BMP_LINE_O_XCATEGORY_STEPPED "chart2/res/nostacksteppedlines_52x60.png" +#define BMP_LINE3D_XCATEGORY_STEPPED "chart2/res/nostackstepped3d_52x60.png" +#define BMP_LINE_P_STACKED_STEPPED "chart2/res/stacksteppedboth_52x60.png" +#define BMP_LINE_O_STACKED_STEPPED "chart2/res/stacksteppedlines_52x60.png" +#define BMP_LINE3D_STACKED_STEPPED "chart2/res/stackstepped3d_52x60.png" +#define BMP_NET "chart2/res/net_52x60.png" +#define BMP_NET_STACK "chart2/res/netstack_52x60.png" +#define BMP_NET_SYMB "chart2/res/netpoint_52x60.png" +#define BMP_NET_SYMB_STACK "chart2/res/netpointstack_52x60.png" +#define BMP_NET_LINESYMB "chart2/res/netlinepoint_52x60.png" +#define BMP_NET_LINESYMB_STACK "chart2/res/netlinepointstack_52x60.png" +#define BMP_NET_FILL "chart2/res/netfill_52x60.png" +#define BMP_NET_FILL_STACK "chart2/res/netstackfill_52x60.png" +#define BMP_PYRAMIDQ_3D_1 "chart2/res/pyramindhori_52x60.png" +#define BMP_PYRAMIDQ_3D_2 "chart2/res/pyramindhoristack_52x60.png" +#define BMP_PYRAMIDQ_3D_3 "chart2/res/pyramindhoripercent_52x60.png" +#define BMP_PYRAMIDQ_3D_4 "chart2/res/pyramindhorideep_52x60.png" +#define BMP_PYRAMID_3D_1 "chart2/res/pyramind_52x60.png" +#define BMP_PYRAMID_3D_2 "chart2/res/pyramindstack_52x60.png" +#define BMP_PYRAMID_3D_3 "chart2/res/pyramindpercent_52x60.png" +#define BMP_PYRAMID_3D_4 "chart2/res/pyraminddeep_52x60.png" +#define BMP_ROEHRE_3D_1 "chart2/res/cylinderhori_52x60.png" +#define BMP_ROEHRE_3D_2 "chart2/res/cylinderhoristack_52x60.png" +#define BMP_ROEHRE_3D_3 "chart2/res/cylinderhoriprocent_52x60.png" +#define BMP_ROEHRE_3D_4 "chart2/res/cylinderhorideep_52x60.png" +#define BMP_SAEULE_3D_1 "chart2/res/cylinder_52x60.png" +#define BMP_SAEULE_3D_2 "chart2/res/cylinderstack_52x60.png" +#define BMP_SAEULE_3D_3 "chart2/res/cylinderpercent_52x60.png" +#define BMP_SAEULE_3D_4 "chart2/res/cylinderdeep_52x60.png" +#define BMP_STOCK_1 "chart2/res/stock_52x60.png" +#define BMP_STOCK_2 "chart2/res/stockblock_52x60.png" +#define BMP_STOCK_3 "chart2/res/stockcolumns_52x60.png" +#define BMP_STOCK_4 "chart2/res/stockcolumnsattach_52x60.png" +#define BMP_INDICATE_BOTH_VERTI "chart2/res/errorbothverti_30.png" +#define BMP_INDICATE_DOWN "chart2/res/errordown_30.png" +#define BMP_INDICATE_UP "chart2/res/errorup_30.png" +#define BMP_INDICATE_BOTH_HORI "chart2/res/errorbothhori_30.png" +#define BMP_INDICATE_RIGHT "chart2/res/errorright_30.png" +#define BMP_INDICATE_LEFT "chart2/res/errorleft_30.png" +#define BMP_REGRESSION_LINEAR "chart2/res/reglin.png" +#define BMP_REGRESSION_LOG "chart2/res/reglog.png" +#define BMP_REGRESSION_EXP "chart2/res/regexp.png" +#define BMP_REGRESSION_POWER "chart2/res/regpow.png" +#define BMP_REGRESSION_POLYNOMIAL "chart2/res/regpoly.png" +#define BMP_REGRESSION_MOVING_AVERAGE "chart2/res/regavg.png" +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc deleted file mode 100644 index 40cc8e81c2bc..000000000000 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ /dev/null @@ -1,207 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef CHART_BITMAPS_HRC -#define CHART_BITMAPS_HRC - -#include <svl/solar.hrc> - -//Chart Subtypes -// Bitmaps: - -// Column Chart Subtypes -#define BMP_COLUMNS_2D_1 (RID_APP_START + 1) -#define BMP_COLUMNS_2D_2 (RID_APP_START + 2) -#define BMP_COLUMNS_2D_3 (RID_APP_START + 3) - -#define BMP_COLUMNS_3D (RID_APP_START + 4) -#define BMP_COLUMNS_3D_1 (RID_APP_START + 5) -#define BMP_COLUMNS_3D_2 (RID_APP_START + 6) -#define BMP_COLUMNS_3D_3 (RID_APP_START + 7) - -#define BMP_SAEULE_3D_1 (RID_APP_START + 8) -#define BMP_SAEULE_3D_2 (RID_APP_START + 9) -#define BMP_SAEULE_3D_3 (RID_APP_START + 10) -#define BMP_SAEULE_3D_4 (RID_APP_START + 11) - -#define BMP_KEGEL_3D_1 (RID_APP_START + 12) -#define BMP_KEGEL_3D_2 (RID_APP_START + 13) -#define BMP_KEGEL_3D_3 (RID_APP_START + 14) -#define BMP_KEGEL_3D_4 (RID_APP_START + 15) - -#define BMP_PYRAMID_3D_1 (RID_APP_START + 16) -#define BMP_PYRAMID_3D_2 (RID_APP_START + 17) -#define BMP_PYRAMID_3D_3 (RID_APP_START + 18) -#define BMP_PYRAMID_3D_4 (RID_APP_START + 19) - -// Bar Chart Subtypes - -#define BMP_BARS_2D_1 (RID_APP_START + 20) -#define BMP_BARS_2D_2 (RID_APP_START + 21) -#define BMP_BARS_2D_3 (RID_APP_START + 22) - -#define BMP_BARS_3D (RID_APP_START + 23) -#define BMP_BARS_3D_1 (RID_APP_START + 24) -#define BMP_BARS_3D_2 (RID_APP_START + 25) -#define BMP_BARS_3D_3 (RID_APP_START + 26) - -#define BMP_ROEHRE_3D_1 (RID_APP_START + 27) -#define BMP_ROEHRE_3D_2 (RID_APP_START + 28) -#define BMP_ROEHRE_3D_3 (RID_APP_START + 29) -#define BMP_ROEHRE_3D_4 (RID_APP_START + 30) - -#define BMP_KEGELQ_3D_1 (RID_APP_START + 31) -#define BMP_KEGELQ_3D_2 (RID_APP_START + 32) -#define BMP_KEGELQ_3D_3 (RID_APP_START + 33) -#define BMP_KEGELQ_3D_4 (RID_APP_START + 34) - -#define BMP_PYRAMIDQ_3D_1 (RID_APP_START + 35) -#define BMP_PYRAMIDQ_3D_2 (RID_APP_START + 36) -#define BMP_PYRAMIDQ_3D_3 (RID_APP_START + 37) -#define BMP_PYRAMIDQ_3D_4 (RID_APP_START + 38) - -// Pie and Donut Chart Subtypes - -#define BMP_CIRCLES_2D (RID_APP_START + 39) -#define BMP_CIRCLES_2D_EXPLODED (RID_APP_START + 40) -#define BMP_CIRCLES_3D (RID_APP_START + 41) -#define BMP_CIRCLES_3D_EXPLODED (RID_APP_START + 42) -#define BMP_DONUT_2D (RID_APP_START + 43) -#define BMP_DONUT_2D_EXPLODED (RID_APP_START + 44) -#define BMP_DONUT_3D (RID_APP_START + 45) -#define BMP_DONUT_3D_EXPLODED (RID_APP_START + 46) - -// Points and Lines Chart Subtypes - -#define BMP_POINTS_XVALUES (RID_APP_START + 47) -#define BMP_POINTS_XCATEGORY (RID_APP_START + 48) -#define BMP_POINTS_STACKED (RID_APP_START + 49) -#define BMP_POINTS_STACKED (RID_APP_START + 49) - -#define BMP_LINE_P_XVALUES (RID_APP_START + 50) -#define BMP_LINE_O_XVALUES (RID_APP_START + 51) -#define BMP_LINE3D_XVALUES (RID_APP_START + 52) - -#define BMP_LINE_P_XCATEGORY (RID_APP_START + 53) -#define BMP_LINE_O_XCATEGORY (RID_APP_START + 54) -#define BMP_LINE3D_XCATEGORY (RID_APP_START + 55) - -#define BMP_LINE_P_STACKED (RID_APP_START + 56) -#define BMP_LINE_O_STACKED (RID_APP_START + 57) -#define BMP_LINE3D_STACKED (RID_APP_START + 58) - -#define BMP_LINE_P_XVALUES_SMOOTH (RID_APP_START + 59) -#define BMP_LINE_O_XVALUES_SMOOTH (RID_APP_START + 60) -#define BMP_LINE3D_XVALUES_SMOOTH (RID_APP_START + 61) - -#define BMP_LINE_P_XCATEGORY_SMOOTH (RID_APP_START + 62) -#define BMP_LINE_O_XCATEGORY_SMOOTH (RID_APP_START + 63) -#define BMP_LINE3D_XCATEGORY_SMOOTH (RID_APP_START + 64) - -#define BMP_LINE_P_STACKED_SMOOTH (RID_APP_START + 65) -#define BMP_LINE_O_STACKED_SMOOTH (RID_APP_START + 66) -#define BMP_LINE3D_STACKED_SMOOTH (RID_APP_START + 67) - -#define BMP_LINE_P_XVALUES_STEPPED (RID_APP_START + 97) -#define BMP_LINE_O_XVALUES_STEPPED (RID_APP_START + 98) -#define BMP_LINE3D_XVALUES_STEPPED (RID_APP_START + 99) - -#define BMP_LINE_P_XCATEGORY_STEPPED (RID_APP_START + 100) -#define BMP_LINE_O_XCATEGORY_STEPPED (RID_APP_START + 101) -#define BMP_LINE3D_XCATEGORY_STEPPED (RID_APP_START + 102) - -#define BMP_LINE_P_STACKED_STEPPED (RID_APP_START + 103) -#define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104) -#define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105) - -// Area Chart Subtypes - -#define BMP_AREAS_2D (RID_APP_START + 68) -#define BMP_AREAS_2D_1 (RID_APP_START + 69) -#define BMP_AREAS_2D_3 (RID_APP_START + 70) -#define BMP_AREAS_3D (RID_APP_START + 71) -#define BMP_AREAS_3D_1 (RID_APP_START + 72) -#define BMP_AREAS_3D_2 (RID_APP_START + 73) - -// Net Chart Subtypes - -#define BMP_NET (RID_APP_START + 74) -#define BMP_NET_STACK (RID_APP_START + 75) -#define BMP_NET_SYMB (RID_APP_START + 76) -#define BMP_NET_SYMB_STACK (RID_APP_START + 77) -#define BMP_NET_LINESYMB (RID_APP_START + 78) -#define BMP_NET_LINESYMB_STACK (RID_APP_START + 79) -#define BMP_NET_FILL (RID_APP_START + 80) -#define BMP_NET_FILL_STACK (RID_APP_START + 81) - -// Stock Chart Subtypes - -#define BMP_STOCK_1 (RID_APP_START + 82) -#define BMP_STOCK_2 (RID_APP_START + 83) -#define BMP_STOCK_3 (RID_APP_START + 84) -#define BMP_STOCK_4 (RID_APP_START + 85) - -// Column + Line Chart Subtypes - -#define BMP_COLUMN_LINE (RID_APP_START + 86) -#define BMP_COLUMN_LINE_STACKED (RID_APP_START + 87) - -// Bubble Chart Subtypes -#define BMP_BUBBLE_1 (RID_APP_START + 88) - -// GL3D Bar Chart subtypes. -#define BMP_GL3D_BAR_ROUNDRECT (RID_APP_START + 106) - -//further Images: - -//SchStatisticTabPage and SchDataStatisticsDlg part 2 -#define BMP_REGRESSION_LINEAR (RID_APP_START + 93) -#define BMP_REGRESSION_LOG (RID_APP_START + 94) -#define BMP_REGRESSION_EXP (RID_APP_START + 95) -#define BMP_REGRESSION_POWER (RID_APP_START + 96) -#define BMP_REGRESSION_POLYNOMIAL (RID_APP_START + 110) -#define BMP_REGRESSION_MOVING_AVERAGE (RID_APP_START + 111) - -// chart types -// Images: - -#define BMP_TYPE_COLUMN (RID_APP_START + 112) -#define BMP_TYPE_BAR (RID_APP_START + 113) -#define BMP_TYPE_PIE (RID_APP_START + 114) -#define BMP_TYPE_AREA (RID_APP_START + 115) -#define BMP_TYPE_LINE (RID_APP_START + 116) -#define BMP_TYPE_XY (RID_APP_START + 117) -#define BMP_TYPE_BUBBLE (RID_APP_START + 118) -#define BMP_TYPE_NET (RID_APP_START + 119) -#define BMP_TYPE_STOCK (RID_APP_START + 120) -#define BMP_TYPE_COLUMN_LINE (RID_APP_START + 131) -#define BMP_TYPE_GL3D_BAR (RID_APP_START + 132) - -//SchStatisticTabPage and SchDataStatisticsDlg part 1 -#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 137) -#define BMP_INDICATE_UP (RID_APP_START + 138) -#define BMP_INDICATE_DOWN (RID_APP_START + 139) -#define BMP_INDICATE_BOTH_HORI (RID_APP_START + 140) -#define BMP_INDICATE_RIGHT (RID_APP_START + 141) -#define BMP_INDICATE_LEFT (RID_APP_START + 142) - - -// CHART_BITMAPS_HRC -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src deleted file mode 100644 index 710afc916b7d..000000000000 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ /dev/null @@ -1,552 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "Bitmaps.hrc" - -Bitmap BMP_TYPE_COLUMN -{ - File = "typecolumn_16.png"; -}; - -Bitmap BMP_TYPE_BAR -{ - File = "typebar_16.png"; -}; - -Bitmap BMP_TYPE_PIE -{ - File = "typepie_16.png"; -}; - -Bitmap BMP_TYPE_LINE -{ - File = "typepointline_16.png"; -}; - -Bitmap BMP_TYPE_XY -{ - File = "typexy_16.png"; -}; - -Bitmap BMP_TYPE_AREA -{ - File = "typearea_16.png"; -}; - -Bitmap BMP_TYPE_NET -{ - File = "typenet_16.png"; -}; - -Bitmap BMP_TYPE_STOCK -{ - File = "typestock_16.png"; -}; - -Bitmap BMP_TYPE_COLUMN_LINE -{ - File = "typecolumnline_16.png"; -}; - -Bitmap BMP_TYPE_BUBBLE -{ - File = "typebubble_16.png"; -}; - -Bitmap BMP_TYPE_GL3D_BAR -{ - File = "typegl3dbar_16.png"; -}; - -Bitmap BMP_BUBBLE_1 -{ - File = "bubble_52x60.png" ; -}; - -Bitmap BMP_GL3D_BAR_ROUNDRECT -{ - File = "gl3dbar_roundrect.png"; -}; - -Bitmap BMP_AREAS_2D -{ - File = "areas_52x60.png" ; -}; -Bitmap BMP_AREAS_2D_1 -{ - File = "areaspiled_52x60.png" ; -}; -Bitmap BMP_AREAS_2D_3 -{ - File = "areasfull_52x60.png" ; -}; -Bitmap BMP_AREAS_3D -{ - File = "areaspiled3d_52x60.png" ; -}; -Bitmap BMP_AREAS_3D_1 -{ - File = "areas3d_52x60.png" ; -}; -Bitmap BMP_AREAS_3D_2 -{ - File = "areasfull3d_52x60.png" ; -}; - -Bitmap BMP_BARS_2D_1 -{ - File = "bar_52x60.png" ; -}; -Bitmap BMP_BARS_2D_2 -{ - File = "barstack_52x60.png" ; -}; -Bitmap BMP_BARS_2D_3 -{ - File = "barpercent_52x60.png" ; -}; -Bitmap BMP_BARS_3D -{ - File = "bar3ddeep_52x60.png" ; -}; -Bitmap BMP_BARS_3D_1 -{ - File = "bar3d_52x60.png" ; -}; -Bitmap BMP_BARS_3D_2 -{ - File = "barstack3d_52x60.png" ; -}; -Bitmap BMP_BARS_3D_3 -{ - File = "barpercent3d_52x60.png" ; -}; - -Bitmap BMP_CIRCLES_2D -{ - File = "pie_52x60.png" ; -}; -Bitmap BMP_CIRCLES_2D_EXPLODED -{ - File = "pieexploded_52x60.png" ; -}; -Bitmap BMP_CIRCLES_3D -{ - File = "pie3d_52x60.png" ; -}; -Bitmap BMP_CIRCLES_3D_EXPLODED -{ - File = "pie3dexploded_52x60.png" ; -}; - -Bitmap BMP_DONUT_2D -{ - File = "donut_52x60.png" ; -}; -Bitmap BMP_DONUT_2D_EXPLODED -{ - File = "donutexploded_52x60.png" ; -}; -Bitmap BMP_DONUT_3D -{ - File = "donut3d_52x60.png" ; -}; -Bitmap BMP_DONUT_3D_EXPLODED -{ - File = "donut3dexploded_52x60.png" ; -}; - -Bitmap BMP_COLUMNS_2D_1 -{ - File = "columns_52x60.png" ; -}; - -Bitmap BMP_COLUMNS_2D_2 -{ - File = "columnstack_52x60.png" ; -}; -Bitmap BMP_COLUMNS_2D_3 -{ - File = "columnpercent_52x60.png" ; -}; -Bitmap BMP_COLUMN_LINE -{ - File = "columnline_52x60.png" ; -}; -Bitmap BMP_COLUMN_LINE_STACKED -{ - File = "columnstackline_52x60.png" ; -}; - -Bitmap BMP_COLUMNS_3D -{ - File = "columns3ddeep_52x60.png" ; -}; -Bitmap BMP_COLUMNS_3D_1 -{ - File = "columns3d_52x60.png" ; -}; -Bitmap BMP_COLUMNS_3D_2 -{ - File = "columnstack3d_52x60.png" ; -}; -Bitmap BMP_COLUMNS_3D_3 -{ - File = "columnpercent3d_52x60.png" ; -}; - -Bitmap BMP_KEGELQ_3D_1 -{ - File = "conehori_52x60.png" ; -}; -Bitmap BMP_KEGELQ_3D_2 -{ - File = "conehoristack_52x60.png" ; -}; -Bitmap BMP_KEGELQ_3D_3 -{ - File = "conehoripercent_52x60.png" ; -}; -Bitmap BMP_KEGELQ_3D_4 -{ - File = "conehorideep_52x60.png" ; -}; -Bitmap BMP_KEGEL_3D_1 -{ - File = "cone_52x60.png" ; -}; -Bitmap BMP_KEGEL_3D_2 -{ - File = "conestack_52x60.png" ; -}; -Bitmap BMP_KEGEL_3D_3 -{ - File = "conepercent_52x60.png" ; -}; -Bitmap BMP_KEGEL_3D_4 -{ - File = "conedeep_52x60.png" ; -}; - -Bitmap BMP_POINTS_XVALUES -{ - File = "valueaxisdirectpoints_52x60.png" ; -}; -Bitmap BMP_POINTS_XCATEGORY -{ - File = "nostackdirectpoints_52x60.png" ; -}; -Bitmap BMP_POINTS_STACKED -{ - File = "stackdirectpoints_52x60.png" ; -}; - -Bitmap BMP_LINE_P_XVALUES -{ - File = "valueaxisdirectboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XVALUES -{ - File = "valueaxisdirectlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XVALUES -{ - File = "valueaxisdirect3d_52x60.png" ; -}; - -Bitmap BMP_LINE_P_XCATEGORY -{ - File = "nostackdirectboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XCATEGORY -{ - File = "nostackdirectlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XCATEGORY -{ - File = "nostackdirect3d_52x60.png" ; -}; - -Bitmap BMP_LINE_P_STACKED -{ - File = "stackdirectboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_STACKED -{ - File = "stackdirectlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_STACKED -{ - File = "stackdirect3d_52x60.png" ; -}; - -Bitmap BMP_LINE_P_XVALUES_SMOOTH -{ - File = "valueaxissmoothboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XVALUES_SMOOTH -{ - File = "valueaxissmoothlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XVALUES_SMOOTH -{ - File = "valueaxissmooth3d_52x60.png" ; -}; -Bitmap BMP_LINE_P_XCATEGORY_SMOOTH -{ - File = "nostacksmoothboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XCATEGORY_SMOOTH -{ - File = "nostacksmoothlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XCATEGORY_SMOOTH -{ - File = "nostacksmooth3d_52x60.png" ; -}; -Bitmap BMP_LINE_P_STACKED_SMOOTH -{ - File = "stacksmoothboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_STACKED_SMOOTH -{ - File = "stacksmoothlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_STACKED_SMOOTH -{ - File = "stacksmooth3d_52x60.png" ; -}; - -Bitmap BMP_LINE_P_XVALUES_STEPPED -{ - File = "valueaxissteppedboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XVALUES_STEPPED -{ - File = "valueaxissteppedlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XVALUES_STEPPED -{ - File = "valueaxisstepped3d_52x60.png" ; -}; -Bitmap BMP_LINE_P_XCATEGORY_STEPPED -{ - File = "nostacksteppedboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_XCATEGORY_STEPPED -{ - File = "nostacksteppedlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_XCATEGORY_STEPPED -{ - File = "nostackstepped3d_52x60.png" ; -}; -Bitmap BMP_LINE_P_STACKED_STEPPED -{ - File = "stacksteppedboth_52x60.png" ; -}; -Bitmap BMP_LINE_O_STACKED_STEPPED -{ - File = "stacksteppedlines_52x60.png" ; -}; -Bitmap BMP_LINE3D_STACKED_STEPPED -{ - File = "stackstepped3d_52x60.png" ; -}; - -Bitmap BMP_NET -{ - File = "net_52x60.png" ; -}; -Bitmap BMP_NET_STACK -{ - File = "netstack_52x60.png" ; -}; -Bitmap BMP_NET_SYMB -{ - File = "netpoint_52x60.png" ; -}; -Bitmap BMP_NET_SYMB_STACK -{ - File = "netpointstack_52x60.png" ; -}; -Bitmap BMP_NET_LINESYMB -{ - File = "netlinepoint_52x60.png" ; -}; -Bitmap BMP_NET_LINESYMB_STACK -{ - File = "netlinepointstack_52x60.png" ; -}; -Bitmap BMP_NET_FILL -{ - File = "netfill_52x60.png" ; -}; -Bitmap BMP_NET_FILL_STACK -{ - File = "netstackfill_52x60.png" ; -}; - -Bitmap BMP_PYRAMIDQ_3D_1 -{ - File = "pyramindhori_52x60.png" ; -}; -Bitmap BMP_PYRAMIDQ_3D_2 -{ - File = "pyramindhoristack_52x60.png" ; -}; -Bitmap BMP_PYRAMIDQ_3D_3 -{ - File = "pyramindhoripercent_52x60.png" ; -}; -Bitmap BMP_PYRAMIDQ_3D_4 -{ - File = "pyramindhorideep_52x60.png" ; -}; -Bitmap BMP_PYRAMID_3D_1 -{ - File = "pyramind_52x60.png" ; -}; -Bitmap BMP_PYRAMID_3D_2 -{ - File = "pyramindstack_52x60.png" ; -}; -Bitmap BMP_PYRAMID_3D_3 -{ - File = "pyramindpercent_52x60.png" ; -}; -Bitmap BMP_PYRAMID_3D_4 -{ - File = "pyraminddeep_52x60.png" ; -}; - -Bitmap BMP_ROEHRE_3D_1 -{ - File = "cylinderhori_52x60.png" ; -}; -Bitmap BMP_ROEHRE_3D_2 -{ - File = "cylinderhoristack_52x60.png" ; -}; -Bitmap BMP_ROEHRE_3D_3 -{ - File = "cylinderhoriprocent_52x60.png" ; -}; -Bitmap BMP_ROEHRE_3D_4 -{ - File = "cylinderhorideep_52x60.png" ; -}; - -Bitmap BMP_SAEULE_3D_1 -{ - File = "cylinder_52x60.png" ; -}; -Bitmap BMP_SAEULE_3D_2 -{ - File = "cylinderstack_52x60.png" ; -}; -Bitmap BMP_SAEULE_3D_3 -{ - File = "cylinderpercent_52x60.png" ; -}; -Bitmap BMP_SAEULE_3D_4 -{ - File = "cylinderdeep_52x60.png" ; -}; - -Bitmap BMP_STOCK_1 -{ - File = "stock_52x60.png" ; -}; -Bitmap BMP_STOCK_2 -{ - File = "stockblock_52x60.png" ; -}; -Bitmap BMP_STOCK_3 -{ - File = "stockcolumns_52x60.png" ; -}; -Bitmap BMP_STOCK_4 -{ - File = "stockcolumnsattach_52x60.png" ; -}; - -//error indicator -Bitmap BMP_INDICATE_BOTH_VERTI -{ - File = "errorbothverti_30.png" ; -}; - -Bitmap BMP_INDICATE_DOWN -{ - File = "errordown_30.png" ; -}; - -Bitmap BMP_INDICATE_UP -{ - File = "errorup_30.png" ; -}; - -Bitmap BMP_INDICATE_BOTH_HORI -{ - File = "errorbothhori_30.png" ; -}; - -Bitmap BMP_INDICATE_RIGHT -{ - File = "errorright_30.png" ; -}; - -Bitmap BMP_INDICATE_LEFT -{ - File = "errorleft_30.png" ; -}; - -//regression curves - -Bitmap BMP_REGRESSION_LINEAR -{ - File = "reglin.png" ; -}; - -Bitmap BMP_REGRESSION_LOG -{ - File = "reglog.png" ; -}; - -Bitmap BMP_REGRESSION_EXP -{ - File = "regexp.png" ; -}; - -Bitmap BMP_REGRESSION_POWER -{ - File = "regpow.png" ; -}; - -Bitmap BMP_REGRESSION_POLYNOMIAL -{ - File = "regpoly.png" ; -}; - -Bitmap BMP_REGRESSION_MOVING_AVERAGE -{ - File = "regavg.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index ff8f8292c085..fef91252fe4b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -21,7 +21,7 @@ #include "ResId.hxx" #include "HelpIds.hrc" #include "Strings.hrc" -#include "Bitmaps.hrc" +#include "bitmaps.hlst" #include "macros.hxx" #include "ChartModelHelper.hxx" #include "DiagramHelper.hxx" @@ -440,7 +440,7 @@ OUString ColumnChartDialogController::getName() Image ColumnChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN))); + return Image(BitmapEx(BMP_TYPE_COLUMN)); } const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const @@ -464,36 +464,36 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const switch(rParameter.nGeometry3D) { case DataPointGeometry3D::CYLINDER: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_SAEULE_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_SAEULE_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_SAEULE_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_SAEULE_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_SAEULE_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_SAEULE_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_SAEULE_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_SAEULE_3D_4))); break; case DataPointGeometry3D::CONE: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_KEGEL_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_KEGEL_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_KEGEL_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_KEGEL_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_KEGEL_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_KEGEL_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_KEGEL_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_KEGEL_3D_4))); break; case DataPointGeometry3D::PYRAMID: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_PYRAMID_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_PYRAMID_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_PYRAMID_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_PYRAMID_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_PYRAMID_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_PYRAMID_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_PYRAMID_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_PYRAMID_3D_4))); break; default: //DataPointGeometry3D::CUBOID: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_COLUMNS_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_COLUMNS_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_COLUMNS_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_COLUMNS_3D)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMNS_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMNS_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_COLUMNS_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_COLUMNS_3D))); break; } } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_COLUMNS_2D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_COLUMNS_2D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_COLUMNS_2D_3)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMNS_2D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMNS_2D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_COLUMNS_2D_3))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); @@ -517,7 +517,7 @@ OUString BarChartDialogController::getName() Image BarChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_BAR))); + return Image(BitmapEx(BMP_TYPE_BAR)); } const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const @@ -541,36 +541,36 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch switch(rParameter.nGeometry3D) { case DataPointGeometry3D::CYLINDER: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_ROEHRE_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_ROEHRE_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_ROEHRE_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_ROEHRE_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_ROEHRE_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_ROEHRE_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_ROEHRE_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_ROEHRE_3D_4))); break; case DataPointGeometry3D::CONE: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_KEGELQ_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_KEGELQ_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_KEGELQ_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_KEGELQ_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_KEGELQ_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_KEGELQ_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_KEGELQ_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_KEGELQ_3D_4))); break; case DataPointGeometry3D::PYRAMID: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_PYRAMIDQ_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_PYRAMIDQ_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_PYRAMIDQ_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_PYRAMIDQ_3D_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_PYRAMIDQ_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_PYRAMIDQ_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_PYRAMIDQ_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_PYRAMIDQ_3D_4))); break; default: //DataPointGeometry3D::CUBOID: - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_BARS_3D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_BARS_3D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_BARS_3D_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_BARS_3D)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BARS_3D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_BARS_3D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_BARS_3D_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_BARS_3D))); break; } } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_BARS_2D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_BARS_2D_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_BARS_2D_3)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BARS_2D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_BARS_2D_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_BARS_2D_3))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); @@ -590,7 +590,7 @@ OUString PieChartDialogController::getName() } Image PieChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_PIE))); + return Image(BitmapEx(BMP_TYPE_PIE)); } const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const { @@ -611,17 +611,17 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch if( rParameter.b3DLook ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_CIRCLES_3D)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_CIRCLES_3D_EXPLODED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_DONUT_3D)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_DONUT_3D_EXPLODED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_CIRCLES_3D))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_CIRCLES_3D_EXPLODED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_DONUT_3D))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_DONUT_3D_EXPLODED))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_CIRCLES_2D)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_CIRCLES_2D_EXPLODED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_DONUT_2D)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_DONUT_2D_EXPLODED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_CIRCLES_2D))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_CIRCLES_2D_EXPLODED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_DONUT_2D))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_DONUT_2D_EXPLODED))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_PIE_EXPLODED ) ); @@ -651,7 +651,7 @@ OUString LineChartDialogController::getName() Image LineChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_LINE))); + return Image(BitmapEx(BMP_TYPE_LINE)); } const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const @@ -681,17 +681,17 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C case CurveStyle_B_SPLINES: if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XCATEGORY)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XCATEGORY_SMOOTH)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XCATEGORY_SMOOTH)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XCATEGORY_SMOOTH)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY_SMOOTH))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY_SMOOTH))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY_SMOOTH))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_STACKED)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_STACKED_SMOOTH)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_STACKED_SMOOTH)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_STACKED_SMOOTH)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED_SMOOTH))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED_SMOOTH))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED_SMOOTH))); } break; case CurveStyle_STEP_START: @@ -700,34 +700,34 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C case CurveStyle_STEP_CENTER_Y: if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XCATEGORY)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XCATEGORY_STEPPED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XCATEGORY_STEPPED)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XCATEGORY_STEPPED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY_STEPPED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY_STEPPED))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY_STEPPED))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_STACKED)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_STACKED_STEPPED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_STACKED_STEPPED)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_STACKED_STEPPED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED_STEPPED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED_STEPPED))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED_STEPPED))); } break; default: // includes CurveStyle_LINES //direct lines if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XCATEGORY)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XCATEGORY)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XCATEGORY)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XCATEGORY)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_STACKED)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_STACKED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_STACKED)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_STACKED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED))); } } @@ -802,7 +802,7 @@ OUString XYChartDialogController::getName() Image XYChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_XY))); + return Image(BitmapEx(BMP_TYPE_XY)); } const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const @@ -824,10 +824,10 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha case CurveStyle_CUBIC_SPLINES: case CurveStyle_B_SPLINES: { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XVALUES)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XVALUES_SMOOTH)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XVALUES_SMOOTH)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XVALUES_SMOOTH)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES_SMOOTH))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES_SMOOTH))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES_SMOOTH))); break; } case CurveStyle_STEP_START: @@ -835,17 +835,17 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha case CurveStyle_STEP_CENTER_X: case CurveStyle_STEP_CENTER_Y: { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XVALUES)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XVALUES_STEPPED)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XVALUES_STEPPED)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XVALUES_STEPPED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES_STEPPED))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES_STEPPED))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES_STEPPED))); break; } default: // includes CurveStyle_LINES - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_POINTS_XVALUES)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_LINE_P_XVALUES)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_LINE_O_XVALUES)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_LINE3D_XVALUES)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); @@ -905,7 +905,7 @@ OUString AreaChartDialogController::getName() Image AreaChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_AREA))); + return Image(BitmapEx(BMP_TYPE_AREA)); } bool AreaChartDialogController::shouldShow_3DLookControl() const @@ -931,15 +931,15 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C if( rParameter.b3DLook ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_AREAS_3D)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_AREAS_3D_1)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_AREAS_3D_2)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_AREAS_3D))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_AREAS_3D_1))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_AREAS_3D_2))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_AREAS_2D_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_AREAS_2D)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_AREAS_2D_3)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_AREAS_2D_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_AREAS_2D))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_AREAS_2D_3))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) ); @@ -992,7 +992,7 @@ OUString NetChartDialogController::getName() Image NetChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_NET))); + return Image(BitmapEx(BMP_TYPE_NET)); } bool NetChartDialogController::shouldShow_StackingControl() const @@ -1027,17 +1027,17 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch if( GlobalStackMode_NONE == rParameter.eStackMode ) { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_NET_SYMB)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_NET_LINESYMB)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_NET)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_NET_FILL)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_NET_SYMB))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_NET_LINESYMB))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_NET))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_NET_FILL))); } else { - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_NET_SYMB_STACK)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_NET_LINESYMB_STACK)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_NET_STACK)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_NET_FILL_STACK)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_NET_SYMB_STACK))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_NET_LINESYMB_STACK))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_NET_STACK))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_NET_FILL_STACK))); } rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); @@ -1087,7 +1087,7 @@ OUString StockChartDialogController::getName() Image StockChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_STOCK))); + return Image(BitmapEx(BMP_TYPE_STOCK)); } const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const @@ -1103,10 +1103,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_STOCK_1)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_STOCK_2)))); - rSubTypeList.InsertItem(3, Image(Bitmap(SchResId(BMP_STOCK_3)))); - rSubTypeList.InsertItem(4, Image(Bitmap(SchResId(BMP_STOCK_4)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_STOCK_1))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_STOCK_2))); + rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_STOCK_3))); + rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_STOCK_4))); rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_STOCK_1) ); rSubTypeList.SetItemText( 2, SCH_RESSTR(STR_STOCK_2) ); @@ -1134,7 +1134,7 @@ OUString CombiColumnLineChartDialogController::getName() Image CombiColumnLineChartDialogController::getImage( ) { - return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN_LINE))); + return Image(BitmapEx(BMP_TYPE_COLUMN_LINE)); } const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const @@ -1148,8 +1148,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_COLUMN_LINE)))); - rSubTypeList.InsertItem(2, Image(Bitmap(SchResId(BMP_COLUMN_LINE_STACKED)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMN_LINE))); + rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMN_LINE_STACKED))); rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN)); rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN)); @@ -1268,7 +1268,7 @@ OUString BubbleChartDialogController::getName() Image BubbleChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE))); + return Image(BitmapEx(BMP_TYPE_BUBBLE)); } const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const @@ -1280,7 +1280,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_BUBBLE_1)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BUBBLE_1))); rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_BUBBLE_1) ); } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 678f26cab127..0ed15d33058c 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -31,7 +31,7 @@ #include "NumberFormatterWrapper.hxx" #include "servicenames_charttypes.hxx" #include "ResId.hxx" -#include "Bitmaps.hrc" +#include "bitmaps.hlst" #include "HelpIds.hrc" #include <vcl/fixed.hxx> @@ -353,40 +353,40 @@ Image SeriesHeader::GetChartTypeImage( if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_AREA ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_AREA))); + aResult = Image(BitmapEx(BMP_TYPE_AREA)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) { if( bSwapXAndYAxis ) - aResult = Image(BitmapEx(SchResId(BMP_TYPE_BAR))); + aResult = Image(BitmapEx(BMP_TYPE_BAR)); else - aResult = Image(BitmapEx(SchResId(BMP_TYPE_COLUMN))); + aResult = Image(BitmapEx(BMP_TYPE_COLUMN)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_LINE ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_LINE)) ); + aResult = Image(BitmapEx(BMP_TYPE_LINE)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_XY))); + aResult = Image(BitmapEx(BMP_TYPE_XY)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_PIE ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_PIE))); + aResult = Image(BitmapEx(BMP_TYPE_PIE)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_NET || aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_NET))); + aResult = Image(BitmapEx(BMP_TYPE_NET)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ) { // @todo: correct image for candle-stick type - aResult = Image(BitmapEx(SchResId(BMP_TYPE_STOCK))); + aResult = Image(BitmapEx(BMP_TYPE_STOCK)); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ) { - aResult = Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE))); + aResult = Image(BitmapEx(BMP_TYPE_BUBBLE)); } return aResult; diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx index 57c9a081e547..56d788d1afc9 100644 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx +++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx @@ -9,7 +9,7 @@ #include "GL3DBarChartDialogController.hxx" #include <Strings.hrc> -#include <Bitmaps.hrc> +#include <bitmaps.hlst> #include <ResId.hxx> #include <svtools/valueset.hxx> @@ -32,7 +32,7 @@ OUString GL3DBarChartDialogController::getName() Image GL3DBarChartDialogController::getImage() { - return Image(BitmapEx(SchResId(BMP_TYPE_GL3D_BAR))); + return Image(BitmapEx(BMP_TYPE_GL3D_BAR)); } const tTemplateServiceChartTypeParameterMap& @@ -48,7 +48,7 @@ void GL3DBarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(Bitmap(SchResId(BMP_GL3D_BAR_ROUNDRECT)))); + rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_GL3D_BAR_ROUNDRECT))); rSubTypeList.SetItemText(1, SchResId(STR_GL3D_BAR).toString()); } diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 829b64c382a8..dd027e2b025d 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -21,7 +21,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC //for strings see Strings.hrc -//for Bitmaps see Bitmaps.hrc +//for Bitmaps see bitmaps.hlst //TabPage Ids: #define TP_LEGEND_POS 900 diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 6eb0b10bc772..97b5d31a4fe5 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -19,7 +19,7 @@ #include "res_ErrorBar.hxx" #include "ResId.hxx" -#include "Bitmaps.hrc" +#include "bitmaps.hlst" #include "RangeSelectionHelper.hxx" #include "TabPageNotifiable.hxx" #include "macros.hxx" @@ -665,15 +665,15 @@ void ErrorBarResources::FillValueSets() { if( m_eErrorBarType == ERROR_BAR_Y ) { - m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_DOWN)))); - m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_UP)))); - m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_VERTI)))); + m_pFiNegative->SetImage(Image(BitmapEx(BMP_INDICATE_DOWN))); + m_pFiPositive->SetImage(Image(BitmapEx(BMP_INDICATE_UP))); + m_pFiBoth->SetImage(Image(BitmapEx(BMP_INDICATE_BOTH_VERTI))); } else if( m_eErrorBarType == ERROR_BAR_X ) { - m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_LEFT)))); - m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_RIGHT)))); - m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_HORI)))); + m_pFiNegative->SetImage(Image(BitmapEx(BMP_INDICATE_LEFT))); + m_pFiPositive->SetImage(Image(BitmapEx(BMP_INDICATE_RIGHT))); + m_pFiBoth->SetImage(Image(BitmapEx(BMP_INDICATE_BOTH_HORI))); } } diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 13fb61398a39..e09db092fece 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -20,7 +20,7 @@ #include "res_Trendline.hxx" #include "ResId.hxx" #include "Strings.hrc" -#include "Bitmaps.hrc" +#include "bitmaps.hlst" #include "chartview/ChartSfxItemIds.hxx" #include <svl/intitem.hxx> @@ -312,12 +312,12 @@ bool TrendlineResources::FillItemSet(SfxItemSet* rOutAttrs) const void TrendlineResources::FillValueSets() { - m_pFI_Linear->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LINEAR)))); - m_pFI_Logarithmic->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LOG)))); - m_pFI_Exponential->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_EXP)))); - m_pFI_Power->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POWER)))); - m_pFI_Polynomial->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POLYNOMIAL)))); - m_pFI_MovingAverage->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_MOVING_AVERAGE)))); + m_pFI_Linear->SetImage(Image(BitmapEx(BMP_REGRESSION_LINEAR))); + m_pFI_Logarithmic->SetImage(Image(BitmapEx(BMP_REGRESSION_LOG))); + m_pFI_Exponential->SetImage(Image(BitmapEx(BMP_REGRESSION_EXP))); + m_pFI_Power->SetImage(Image(BitmapEx(BMP_REGRESSION_POWER))); + m_pFI_Polynomial->SetImage(Image(BitmapEx(BMP_REGRESSION_POLYNOMIAL))); + m_pFI_MovingAverage->SetImage(Image(BitmapEx(BMP_REGRESSION_MOVING_AVERAGE))); } void TrendlineResources::UpdateControlStates() diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 59e6108abe63..5068e984a8e5 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -19,7 +19,7 @@ #include "tp_3D_SceneIllumination.hxx" #include "ResId.hxx" -#include "Bitmaps.hrc" +#include "bitmaps.hlst" #include "CommonConverters.hxx" #include <svx/colorbox.hxx> diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index cb4c8e2fa175..e22de73f036c 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -52,6 +52,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/basctl/inc/bitmaps.hlst \ $(SRCDIR)/connectivity/inc/bitmaps.hlst \ $(SRCDIR)/cui/inc/bitmaps.hlst \ + $(SRCDIR)/chart2/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \ $(SRCDIR)/vcl/inc/bitmaps.hlst grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst index e096f92e65fa..03ea8a9bd63a 100644 --- a/vcl/inc/bitmaps.hlst +++ b/vcl/inc/bitmaps.hlst @@ -99,6 +99,6 @@ #define SPINNER_64_12 "vcl/res/spinner-64-12.png" //end, Throbber::getDefaultImageURLs -#endif // INCLUDED_VCL_INC_BITMAPS_HRC +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |