postprocess/CustomTarget_images.mk | 1
sc/AllLangResTarget_sc.mk | 8
sc/inc/bitmaps.hlst | 126 ++++++++++
sc/inc/document.hxx | 2
sc/inc/scres.hrc | 57 ----
sc/source/core/data/colorscale.cxx | 61 ++--
sc/source/ui/app/inputwin.cxx | 25 +-
sc/source/ui/app/scmod.cxx | 5
sc/source/ui/cctrl/checklistmenu.cxx | 5
sc/source/ui/cctrl/checklistmenu.src | 10
sc/source/ui/dbgui/outline.src | 60 ----
sc/source/ui/inc/iconsets.hrc | 67 -----
sc/source/ui/inc/olinewin.hxx | 4
sc/source/ui/navipi/content.cxx | 16 +
sc/source/ui/navipi/navipi.cxx | 11
sc/source/ui/navipi/navipi.src | 70 -----
sc/source/ui/pagedlg/areasdlg.cxx | 1
sc/source/ui/pagedlg/pagedlg.hrc | 27 --
sc/source/ui/pagedlg/pagedlg.src | 31 --
sc/source/ui/pagedlg/tptable.cxx | 4
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 21 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 75 ------
sc/source/ui/src/iconsets.src | 237 -------------------
sc/source/ui/src/sc.src | 4
sc/source/ui/src/toolbox.src | 25 --
sc/source/ui/styleui/scstyles.src | 10
sc/source/ui/unoobj/targuno.cxx | 15 +
sc/source/ui/view/olinewin.cxx | 31 +-
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 7
29 files changed, 255 insertions(+), 761 deletions(-)
New commits:
commit 6022a17e79e2cc0a483122bf7f73fcb3e246caf6
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 26 12:46:39 2017 +0100
remove sc bitmaps from .src files
Change-Id: I351b67616b240e3c0c91ea31d8f14ecfa6de8b4a
Reviewed-on: https://gerrit.libreoffice.org/36991
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index be74d4a28c75..fa889db67b65 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -61,6 +61,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/fpicker/inc/bitmaps.hlst \
$(SRCDIR)/framework/inc/bitmaps.hlst \
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
+ $(SRCDIR)/sc/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \
$(SRCDIR)/svtools/inc/bitmaps.hlst \
$(SRCDIR)/vcl/inc/bitmaps.hlst \
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index c14e169ebd52..05e0d4550341 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/source/ui/navipi \
-I$(SRCDIR)/sc/source/ui/docshell \
- -I$(SRCDIR)/sc/source/ui/pagedlg \
-I$(SRCDIR)/sc/source/ui/dbgui \
-I$(SRCDIR)/sc/source/ui/formdlg \
))
@@ -41,15 +40,8 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/miscdlgs/retypepassdlg.src \
sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/acredlin.src \
- sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src \
sc/source/core/src/compiler.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sc/res,\
- sc/source/ui/src/iconsets.src \
- sc/source/ui/pagedlg/pagedlg.src \
- sc/source/ui/dbgui/outline.src \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/bitmaps.hlst b/sc/inc/bitmaps.hlst
new file mode 100644
index 000000000000..58a91c184503
--- /dev/null
+++ b/sc/inc/bitmaps.hlst
@@ -0,0 +1,126 @@
+/* -*- 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_SC_INC_BITMAPS_HRC
+#define INCLUDED_SC_INC_BITMAPS_HRC
+
+#define RID_BMP_LEVEL1 "sc/res/ou01.png"
+#define RID_BMP_LEVEL2 "sc/res/ou02.png"
+#define RID_BMP_LEVEL3 "sc/res/ou03.png"
+#define RID_BMP_LEVEL4 "sc/res/ou04.png"
+#define RID_BMP_LEVEL5 "sc/res/ou05.png"
+#define RID_BMP_LEVEL6 "sc/res/ou06.png"
+#define RID_BMP_LEVEL7 "sc/res/ou07.png"
+#define RID_BMP_LEVEL8 "sc/res/ou08.png"
+#define RID_BMP_PLUS "sc/res/ou09.png"
+#define RID_BMP_MINUS "sc/res/ou010.png"
+#define RID_BMP_NOTPRESSED "sc/res/ou011.png"
+#define RID_BMP_PRESSED "sc/res/ou012.png"
+
+#define RID_BMP_SELECT_CURRENT
"sc/res/popup_select_current.png"
+#define RID_BMP_UNSELECT_CURRENT
"sc/res/popup_unselect_current.png"
+
+#define RID_BMP_CONTENT_TABLE "sc/res/nc01.png"
+#define RID_BMP_CONTENT_RANGENAME "sc/res/nc02.png"
+#define RID_BMP_CONTENT_DBAREA "sc/res/nc03.png"
+#define RID_BMP_CONTENT_GRAPHIC "sc/res/nc04.png"
+#define RID_BMP_CONTENT_OLEOBJECT "sc/res/nc05.png"
+#define RID_BMP_CONTENT_NOTE "sc/res/nc06.png"
+#define RID_BMP_CONTENT_AREALINK "sc/res/nc07.png"
+#define RID_BMP_CONTENT_DRAWING "sc/res/nc08.png"
+#define RID_BMP_DROP_URL "sc/res/dropurl.png"
+#define RID_BMP_DROP_LINK "sc/res/droplink.png"
+#define RID_BMP_DROP_COPY "sc/res/dropcopy.png"
+#define RID_BMP_ELEMENT_DEFAULT "sc/res/xml_element.png"
+#define RID_BMP_ELEMENT_REPEAT "sc/res/xml_element_repeat.png"
+#define RID_BMP_ELEMENT_ATTRIBUTE "sc/res/xml_attribute.png"
+
+#define BMP_LEFTRIGHT "sc/res/lftrgt.png"
+#define BMP_TOPDOWN "sc/res/topdown.png"
+
+#define RID_BMP_CELL_BORDER "sc/res/sidebar/CellBorder.png"
+#define RID_BMP_LINE_STYLE1
"sc/res/sidebar/CellBorderLineStyle_005.png"
+#define RID_BMP_LINE_STYLE2
"sc/res/sidebar/CellBorderLineStyle_250.png"
+#define RID_BMP_LINE_STYLE3
"sc/res/sidebar/CellBorderLineStyle_400.png"
+#define RID_BMP_LINE_STYLE4
"sc/res/sidebar/CellBorderLineStyle_500.png"
+#define RID_BMP_LINE_STYLE5
"sc/res/sidebar/CellBorderLineStyle_110.png"
+#define RID_BMP_LINE_STYLE6
"sc/res/sidebar/CellBorderLineStyle_260.png"
+#define RID_BMP_LINE_STYLE7
"sc/res/sidebar/CellBorderLineStyle_450.png"
+#define RID_BMP_LINE_STYLE8
"sc/res/sidebar/CellBorderLineStyle_505.png"
+#define RID_BMP_LINE_STYLE9
"sc/res/sidebar/CellBorderLineStyle_750.png"
+
+#define RID_BMP_INPUT_FUNCTION "sc/res/sc26047.png"
+#define RID_BMP_INPUT_SUM "sc/res/sc26048.png"
+#define RID_BMP_INPUT_EQUAL "sc/res/sc26049.png"
+#define RID_BMP_INPUT_CANCEL "sc/res/sc26050.png"
+#define RID_BMP_INPUT_OK "sc/res/sc26051.png"
+
+#define BMP_STYLES_FAMILY_CELL "sc/res/sf01.png"
+#define BMP_STYLES_FAMILY_PAGE "sc/res/sf02.png"
+
+#define BMP_ICON_SET_CIRCLES1_GRAY
"sc/res/icon-set-circles1-gray.png"
+#define BMP_ICON_SET_CIRCLES1_GREEN
"sc/res/icon-set-circles1-green.png"
+#define BMP_ICON_SET_CIRCLES1_YELLOW
"sc/res/icon-set-circles1-yellow.png"
+#define BMP_ICON_SET_CIRCLES1_RED
"sc/res/icon-set-circles1-red.png"
+#define BMP_ICON_SET_BARS_EMPTY
"sc/res/icon-set-bars-empty.png"
+#define BMP_ICON_SET_BARS_ONE_QUARTER
"sc/res/icon-set-bars-one-quarter.png"
+#define BMP_ICON_SET_BARS_HALF "sc/res/icon-set-bars-half.png"
+#define BMP_ICON_SET_BARS_THREE_QUARTER
"sc/res/icon-set-bars-three-quarters.png"
+#define BMP_ICON_SET_BARS_FULL "sc/res/icon-set-bars-full.png"
+#define BMP_ICON_SET_CIRCLES2_DARK_GRAY
"sc/res/icon-set-circles2-dark-gray.png"
+#define BMP_ICON_SET_CIRCLES2_LIGHT_GRAY
"sc/res/icon-set-circles2-light-gray.png"
+#define BMP_ICON_SET_CIRCLES2_LIGHT_RED
"sc/res/icon-set-circles2-light-red.png"
+#define BMP_ICON_SET_CIRCLES2_DARK_RED
"sc/res/icon-set-circles2-dark-red.png"
+#define BMP_ICON_SET_COLORARROWS_DOWN
"sc/res/icon-set-colorarrows-down.png"
+#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN
"sc/res/icon-set-colorarrows-slightly-down.png"
+#define BMP_ICON_SET_COLORARROWS_SAME
"sc/res/icon-set-colorarrows-same.png"
+#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP
"sc/res/icon-set-colorarrows-slightly-up.png"
+#define BMP_ICON_SET_COLORARROWS_UP
"sc/res/icon-set-colorarrows-up.png"
+#define BMP_ICON_SET_FLAGS_RED "sc/res/icon-set-flags-red.png"
+#define BMP_ICON_SET_FLAGS_YELLOW
"sc/res/icon-set-flags-yellow.png"
+#define BMP_ICON_SET_FLAGS_GREEN
"sc/res/icon-set-flags-green.png"
+#define BMP_ICON_SET_GRAYARROWS_DOWN
"sc/res/icon-set-grayarrows-down.png"
+#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN
"sc/res/icon-set-grayarrows-slightly-down.png"
+#define BMP_ICON_SET_GRAYARROWS_SAME
"sc/res/icon-set-grayarrows-same.png"
+#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP
"sc/res/icon-set-grayarrows-slightly-up.png"
+#define BMP_ICON_SET_GRAYARROWS_UP
"sc/res/icon-set-grayarrows-up.png"
+#define BMP_ICON_SET_PIES_EMPTY
"sc/res/icon-set-pies-empty.png"
+#define BMP_ICON_SET_PIES_ONE_QUARTER
"sc/res/icon-set-pies-one-quarter.png"
+#define BMP_ICON_SET_PIES_HALF "sc/res/icon-set-pies-half.png"
+#define BMP_ICON_SET_PIES_THREE_QUARTER
"sc/res/icon-set-pies-three-quarters.png"
+#define BMP_ICON_SET_PIES_FULL "sc/res/icon-set-pies-full.png"
+#define BMP_ICON_SET_SHAPES_CIRCLE
"sc/res/icon-set-shapes-circle.png"
+#define BMP_ICON_SET_SHAPES_TRIANGLE
"sc/res/icon-set-shapes-triangle"
+#define BMP_ICON_SET_SHAPES_DIAMOND
"sc/res/icon-set-shapes-diamond.png"
+#define BMP_ICON_SET_SQUARES_EMPTY
"sc/res/icon-set-squares-empty.png"
+#define BMP_ICON_SET_SQUARES_ONE_QUARTER
"sc/res/icon-set-squares-one-quarter.png"
+#define BMP_ICON_SET_SQUARES_HALF
"sc/res/icon-set-squares-half.png"
+#define BMP_ICON_SET_SQUARES_THREE_QUARTER
"sc/res/icon-set-squares-three-quarters.png"
+#define BMP_ICON_SET_SQUARES_FULL
"sc/res/icon-set-squares-full.png"
+#define BMP_ICON_SET_STARS_EMPTY
"sc/res/icon-set-stars-empty.png"
+#define BMP_ICON_SET_STARS_HALF
"sc/res/icon-set-stars-half.png"
+#define BMP_ICON_SET_STARS_FULL
"sc/res/icon-set-stars-full.png"
+#define BMP_ICON_SET_SYMBOLS1_CHECK
"sc/res/icon-set-symbols1-check.png"
+#define BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK
"sc/res/icon-set-symbols1-exclamation-mark.png"
+#define BMP_ICON_SET_SYMBOLS1_CROSS
"sc/res/icon-set-symbols1-cross.png"
+#define BMP_ICON_SET_TRAFFICLIGHTS_RED
"sc/res/icon-set-trafficlights-red.png"
+#define BMP_ICON_SET_TRAFFICLIGHTS_YELLOW
"sc/res/icon-set-trafficlights-yellow.png"
+#define BMP_ICON_SET_TRAFFICLIGHTS_GREEN
"sc/res/icon-set-trafficlights-green.png"
+#define BMP_ICON_SET_TRIANGLES_DOWN
"sc/res/icon-set-triangles-down.png"
+#define BMP_ICON_SET_TRIANGLES_SAME
"sc/res/icon-set-triangles-same.png"
+#define BMP_ICON_SET_TRIANGLES_UP
"sc/res/icon-set-triangles-up.png"
+#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE
"sc/res/icon-set-positive-green-smilie.png"
+#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE
"sc/res/icon-set-neutral-yellow-smilie.png"
+#define BMP_ICON_SET_NEGATIVE_RED_SMILIE
"sc/res/icon-set-negative-red-smilie.png"
+#define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
"sc/res/icon-set-positive-yellow-smilie.png"
+#define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
"sc/res/icon-set-negative-yellow-smilie.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2751c6ab79ce..2a39544cb7a7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -199,7 +199,7 @@ class BitmapEx;
namespace sc {
-typedef std::map<sal_Int32, BitmapEx> IconSetBitmapMap;
+typedef std::map<OUString, BitmapEx> IconSetBitmapMap;
}
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index 9bf03fa7a163..3f942cbd033c 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -369,60 +369,7 @@
#define STR_END (STR_EDIT_SEARCH_ITEMS)
-#define BMP_START (STR_END)
-
-// navigator
-#define RID_BMP_DROP_URL (BMP_START + 2)
-#define RID_BMP_DROP_LINK (BMP_START + 3)
-#define RID_BMP_DROP_COPY (BMP_START + 4)
-#define RID_BMP_SELECT_CURRENT (BMP_START + 8)
-#define RID_BMP_UNSELECT_CURRENT (BMP_START + 9)
-
-#define RID_BMP_CELL_BORDER (BMP_START + 10)
-#define RID_BMP_LINE_STYLE1 (BMP_START + 11)
-#define RID_BMP_LINE_STYLE2 (BMP_START + 12)
-#define RID_BMP_LINE_STYLE3 (BMP_START + 13)
-#define RID_BMP_LINE_STYLE4 (BMP_START + 14)
-#define RID_BMP_LINE_STYLE5 (BMP_START + 15)
-#define RID_BMP_LINE_STYLE6 (BMP_START + 16)
-#define RID_BMP_LINE_STYLE7 (BMP_START + 17)
-#define RID_BMP_LINE_STYLE8 (BMP_START + 18)
-#define RID_BMP_LINE_STYLE9 (BMP_START + 19)
-#define RID_BMP_ELEMENT_DEFAULT (BMP_START + 20)
-#define RID_BMP_ELEMENT_REPEAT (BMP_START + 21)
-#define RID_BMP_ELEMENT_ATTRIBUTE (BMP_START + 22)
-#define RID_BMP_LEVEL1 (BMP_START + 23)
-#define RID_BMP_LEVEL2 (BMP_START + 24)
-#define RID_BMP_LEVEL3 (BMP_START + 25)
-#define RID_BMP_LEVEL4 (BMP_START + 26)
-#define RID_BMP_LEVEL5 (BMP_START + 27)
-#define RID_BMP_LEVEL6 (BMP_START + 28)
-#define RID_BMP_LEVEL7 (BMP_START + 29)
-#define RID_BMP_LEVEL8 (BMP_START + 30)
-#define RID_BMP_PLUS (BMP_START + 31)
-#define RID_BMP_MINUS (BMP_START + 32)
-#define RID_BMP_NOTPRESSED (BMP_START + 33)
-#define RID_BMP_PRESSED (BMP_START + 34)
-#define RID_BMP_INPUT_FUNCTION (BMP_START + 35)
-#define RID_BMP_INPUT_SUM (BMP_START + 36)
-#define RID_BMP_INPUT_EQUAL (BMP_START + 37)
-#define RID_BMP_INPUT_CANCEL (BMP_START + 38)
-#define RID_BMP_INPUT_OK (BMP_START + 39)
-
-// navigator - in the same order as SC_CONTENT_...
-#define RID_BMP_CONTENT_ROOT (BMP_START + 40)
-#define RID_BMP_CONTENT_TABLE (BMP_START + 41)
-#define RID_BMP_CONTENT_RANGENAME (BMP_START + 42)
-#define RID_BMP_CONTENT_DBAREA (BMP_START + 43)
-#define RID_BMP_CONTENT_GRAPHIC (BMP_START + 44)
-#define RID_BMP_CONTENT_OLEOBJECT (BMP_START + 45)
-#define RID_BMP_CONTENT_NOTE (BMP_START + 46)
-#define RID_BMP_CONTENT_AREALINK (BMP_START + 47)
-#define RID_BMP_CONTENT_DRAWING (BMP_START + 48)
-
-#define BMP_END (BMP_START + 100)
-
-#define SC_DIALOGS_START (BMP_END)
+#define SC_DIALOGS_START (STR_END + 100)
#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46)
#define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48)
@@ -443,8 +390,6 @@
#define RID_CELLSTYLEFAMILY (SC_DIALOGS_START + 138)
#define RID_PAGESTYLEFAMILY (SC_DIALOGS_START + 139)
-#define BMP_STYLES_FAMILY_CELL (SC_DIALOGS_START + 140)
-#define BMP_STYLES_FAMILY_PAGE (SC_DIALOGS_START + 141)
#define WID_CONDFRMT_REF (SC_DIALOGS_START + 163)
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 009cbd9f9bbe..cfa93309ec63 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -12,7 +12,7 @@
#include "document.hxx"
#include "formulacell.hxx"
#include "fillinfo.hxx"
-#include "iconsets.hrc"
+#include "bitmaps.hlst"
#include "scresid.hxx"
#include "tokenarray.hxx"
#include "refupdatecontext.hxx"
@@ -1142,102 +1142,102 @@ size_t ScIconSetFormat::size() const
namespace {
-const sal_Int32 a3TrafficLights1[] = {
+const OUStringLiteral a3TrafficLights1[] = {
BMP_ICON_SET_CIRCLES1_RED, BMP_ICON_SET_CIRCLES1_YELLOW,
BMP_ICON_SET_CIRCLES1_GREEN
};
-const sal_Int32 a3TrafficLights2[] = {
+const OUStringLiteral a3TrafficLights2[] = {
BMP_ICON_SET_TRAFFICLIGHTS_RED, BMP_ICON_SET_TRAFFICLIGHTS_YELLOW,
BMP_ICON_SET_TRAFFICLIGHTS_GREEN
};
-const sal_Int32 a3Arrows[] = {
+const OUStringLiteral a3Arrows[] = {
BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SAME,
BMP_ICON_SET_COLORARROWS_UP
};
-const sal_Int32 a3ArrowsGray[] = {
+const OUStringLiteral a3ArrowsGray[] = {
BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SAME,
BMP_ICON_SET_GRAYARROWS_UP
};
-const sal_Int32 a3Flags[] = {
+const OUStringLiteral a3Flags[] = {
BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
};
-const sal_Int32 a3Smilies[] = {
+const OUStringLiteral a3Smilies[] = {
BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
};
-const sal_Int32 a3ColorSmilies[] = {
+const OUStringLiteral a3ColorSmilies[] = {
BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_RED_SMILIE
};
-const sal_Int32 a3Stars[] = {
+const OUStringLiteral a3Stars[] = {
BMP_ICON_SET_STARS_EMPTY, BMP_ICON_SET_STARS_HALF, BMP_ICON_SET_STARS_FULL
};
-const sal_Int32 a3Triangles[] = {
+const OUStringLiteral a3Triangles[] = {
BMP_ICON_SET_TRIANGLES_DOWN, BMP_ICON_SET_TRIANGLES_SAME,
BMP_ICON_SET_TRIANGLES_UP
};
-const sal_Int32 a4Arrows[] = {
+const OUStringLiteral a4Arrows[] = {
BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
};
-const sal_Int32 a4ArrowsGray[] = {
+const OUStringLiteral a4ArrowsGray[] = {
BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP
};
-const sal_Int32 a5Arrows[] = {
+const OUStringLiteral a5Arrows[] = {
BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP,
BMP_ICON_SET_COLORARROWS_UP
};
-const sal_Int32 a5ArrowsGray[] = {
+const OUStringLiteral a5ArrowsGray[] = {
BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP,
BMP_ICON_SET_GRAYARROWS_UP
};
-const sal_Int32 a4TrafficLights[] = {
+const OUStringLiteral a4TrafficLights[] = {
BMP_ICON_SET_CIRCLES1_GRAY, BMP_ICON_SET_CIRCLES1_RED,
BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
};
-const sal_Int32 a5Quarters[] = {
+const OUStringLiteral a5Quarters[] = {
BMP_ICON_SET_PIES_EMPTY, BMP_ICON_SET_PIES_ONE_QUARTER,
BMP_ICON_SET_PIES_HALF,
BMP_ICON_SET_PIES_THREE_QUARTER, BMP_ICON_SET_PIES_FULL,
};
-const sal_Int32 a5Boxes[] = {
+const OUStringLiteral a5Boxes[] = {
BMP_ICON_SET_SQUARES_EMPTY, BMP_ICON_SET_SQUARES_ONE_QUARTER,
BMP_ICON_SET_SQUARES_HALF, BMP_ICON_SET_SQUARES_THREE_QUARTER,
BMP_ICON_SET_SQUARES_FULL
};
-const sal_Int32 a3Symbols1[] = {
+const OUStringLiteral a3Symbols1[] = {
BMP_ICON_SET_SYMBOLS1_CROSS, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK,
BMP_ICON_SET_SYMBOLS1_CHECK
};
-const sal_Int32 a3Signs[] = {
+const OUStringLiteral a3Signs[] = {
BMP_ICON_SET_SHAPES_DIAMOND, BMP_ICON_SET_SHAPES_TRIANGLE,
BMP_ICON_SET_SHAPES_CIRCLE
};
-const sal_Int32 a4RedToBlack[] = {
+const OUStringLiteral a4RedToBlack[] = {
BMP_ICON_SET_CIRCLES2_DARK_GRAY, BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
BMP_ICON_SET_CIRCLES2_LIGHT_RED, BMP_ICON_SET_CIRCLES2_DARK_RED
};
-const sal_Int32 a4Ratings[] = {
+const OUStringLiteral a4Ratings[] = {
BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF,
BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
};
-const sal_Int32 a5Ratings[] = {
+const OUStringLiteral a5Ratings[] = {
BMP_ICON_SET_BARS_EMPTY, BMP_ICON_SET_BARS_ONE_QUARTER,
BMP_ICON_SET_BARS_HALF,
BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
};
struct ScIconSetBitmapMap {
ScIconSetType eType;
- const sal_Int32* nBitmaps;
+ const OUStringLiteral* pBitmaps;
};
static const ScIconSetBitmapMap aBitmapMap[] = {
@@ -1270,25 +1270,26 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
BitmapEx& ScIconSetFormat::getBitmap(sc::IconSetBitmapMap & rIconSetBitmapMap,
ScIconSetType const eType, sal_Int32 const nIndex)
{
- sal_Int32 nBitmap = -1;
+ OUString sBitmap;
for(const ScIconSetBitmapMap & i : aBitmapMap)
{
if(i.eType == eType)
{
- nBitmap = *(i.nBitmaps + nIndex);
+ sBitmap = *(i.pBitmaps + nIndex);
break;
}
}
- assert( nBitmap != -1 );
- std::map<sal_Int32, BitmapEx>::iterator itr =
rIconSetBitmapMap.find(nBitmap);
+ assert(!sBitmap.isEmpty());
+
+ std::map<OUString, BitmapEx>::iterator itr =
rIconSetBitmapMap.find(sBitmap);
if (itr != rIconSetBitmapMap.end())
return itr->second;
- BitmapEx aBitmap = BitmapEx(ScResId(nBitmap));
- std::pair<sal_Int32, BitmapEx> aPair( nBitmap, aBitmap );
- std::pair<std::map<sal_Int32, BitmapEx>::iterator, bool> itrNew =
rIconSetBitmapMap.insert(aPair);
+ BitmapEx aBitmap = BitmapEx(sBitmap);
+ std::pair<OUString, BitmapEx> aPair(sBitmap, aBitmap);
+ std::pair<std::map<OUString, BitmapEx>::iterator, bool> itrNew =
rIconSetBitmapMap.insert(aPair);
assert(itrNew.second);
return itrNew.first->second;
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 8325302b79da..15dd433c418a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -49,6 +49,7 @@
#include "scresid.hxx"
#include "scres.hrc"
#include "globstr.hrc"
+#include "bitmaps.hlst"
#include "reffact.hxx"
#include "editutil.hxx"
#include "inputhdl.hxx"
@@ -186,9 +187,9 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent,
SfxBindings* pBind ) :
// Position window, 3 buttons, input window
InsertWindow (1, aWndPos.get(), ToolBoxItemBits::NONE, 0);
InsertSeparator (1);
- InsertItem (SID_INPUT_FUNCTION,
Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))), ToolBoxItemBits::NONE, 2);
- InsertItem (SID_INPUT_SUM,
Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))), ToolBoxItemBits::NONE, 3);
- InsertItem (SID_INPUT_EQUAL,
Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4);
+ InsertItem (SID_INPUT_FUNCTION,
Image(BitmapEx(RID_BMP_INPUT_FUNCTION)), ToolBoxItemBits::NONE, 2);
+ InsertItem (SID_INPUT_SUM, Image(BitmapEx(RID_BMP_INPUT_SUM)),
ToolBoxItemBits::NONE, 3);
+ InsertItem (SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL)),
ToolBoxItemBits::NONE, 4);
InsertSeparator (5);
InsertWindow (7, &aTextWindow, ToolBoxItemBits::NONE, 6);
@@ -505,8 +506,8 @@ void ScInputWindow::SetOkCancelMode()
{
RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
RemoveItem( 3 );
- InsertItem( SID_INPUT_CANCEL,
Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))), ToolBoxItemBits::NONE, 3 );
- InsertItem( SID_INPUT_OK,
Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))), ToolBoxItemBits::NONE, 4 );
+ InsertItem( SID_INPUT_CANCEL, Image(BitmapEx(RID_BMP_INPUT_CANCEL)),
ToolBoxItemBits::NONE, 3 );
+ InsertItem( SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK)),
ToolBoxItemBits::NONE, 4 );
SetItemText ( SID_INPUT_CANCEL, aTextCancel );
SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
SetItemText ( SID_INPUT_OK, aTextOk );
@@ -526,8 +527,8 @@ void ScInputWindow::SetSumAssignMode()
// Remove SID_INPUT_CANCEL, and SID_INPUT_OK
RemoveItem( 3 );
RemoveItem( 3 );
- InsertItem( SID_INPUT_SUM,
Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))), ToolBoxItemBits::NONE, 3 );
- InsertItem( SID_INPUT_EQUAL,
Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4 );
+ InsertItem( SID_INPUT_SUM, Image(BitmapEx(RID_BMP_INPUT_SUM)),
ToolBoxItemBits::NONE, 3 );
+ InsertItem( SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL)),
ToolBoxItemBits::NONE, 4 );
SetItemText ( SID_INPUT_SUM, aTextSum );
SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
SetItemText ( SID_INPUT_EQUAL, aTextEqual );
@@ -622,16 +623,16 @@ void ScInputWindow::DataChanged( const DataChangedEvent&
rDCEvt )
if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
// update item images
- SetItemImage(SID_INPUT_FUNCTION,
Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))));
+ SetItemImage(SID_INPUT_FUNCTION,
Image(BitmapEx(RID_BMP_INPUT_FUNCTION)));
if ( bIsOkCancelMode )
{
- SetItemImage(SID_INPUT_CANCEL,
Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))));
- SetItemImage(SID_INPUT_OK,
Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))));
+ SetItemImage(SID_INPUT_CANCEL,
Image(BitmapEx(RID_BMP_INPUT_CANCEL)));
+ SetItemImage(SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK)));
}
else
{
- SetItemImage(SID_INPUT_SUM,
Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))));
- SetItemImage(SID_INPUT_EQUAL,
Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))));
+ SetItemImage(SID_INPUT_SUM, Image(BitmapEx(RID_BMP_INPUT_SUM)));
+ SetItemImage(SID_INPUT_EQUAL,
Image(BitmapEx(RID_BMP_INPUT_EQUAL)));
}
}
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 2c65b5c69944..5778f38725ff 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -88,6 +88,7 @@
#include "uiitems.hxx"
#include "globstr.hrc"
#include "scres.hrc"
+#include "bitmaps.hlst"
#include "cfgids.hxx"
#include "inputhdl.hxx"
#include "inputwin.hxx"
@@ -2281,12 +2282,12 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies()
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL),
-
Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_CELL))),
+
Image(BitmapEx(BMP_STYLES_FAMILY_CELL)),
ScResId(RID_CELLSTYLEFAMILY)));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE),
-
Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_PAGE))),
+
Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
ScResId(RID_PAGESTYLEFAMILY)));
return pStyleFamilies;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index a7f8508b0942..6012c606efae 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -21,6 +21,7 @@
#include "globstr.hrc"
#include "scresid.hxx"
#include "scres.hrc"
+#include "bitmaps.hlst"
#include <vcl/decoview.hxx>
#include <vcl/settings.hxx>
@@ -1102,7 +1103,7 @@ void ScCheckListMenuWindow::packWindow()
float fScaleFactor = GetDPIScaleFactor();
- BitmapEx aSingleSelectBmp(ScResId(RID_BMP_SELECT_CURRENT));
+ BitmapEx aSingleSelectBmp(RID_BMP_SELECT_CURRENT);
if (fScaleFactor > 1)
aSingleSelectBmp.Scale(fScaleFactor, fScaleFactor, BmpScaleFlag::Fast);
Image aSingleSelect(aSingleSelectBmp);
@@ -1114,7 +1115,7 @@ void ScCheckListMenuWindow::packWindow()
maBtnSelectSingle->SetClickHdl( LINK(this, ScCheckListMenuWindow,
ButtonHdl) );
maBtnSelectSingle->Show();
- BitmapEx aSingleUnselectBmp(ScResId(RID_BMP_UNSELECT_CURRENT));
+ BitmapEx aSingleUnselectBmp(RID_BMP_UNSELECT_CURRENT);
if (fScaleFactor > 1)
aSingleUnselectBmp.Scale(fScaleFactor, fScaleFactor,
BmpScaleFlag::Fast);
Image aSingleUnselect(aSingleUnselectBmp);
diff --git a/sc/source/ui/cctrl/checklistmenu.src
b/sc/source/ui/cctrl/checklistmenu.src
index c6babeae47ad..41c4c8618c40 100644
--- a/sc/source/ui/cctrl/checklistmenu.src
+++ b/sc/source/ui/cctrl/checklistmenu.src
@@ -54,14 +54,4 @@ String STR_EDIT_SEARCH_ITEMS
Text [ en-US ] = "Search items..." ;
};
-Bitmap RID_BMP_SELECT_CURRENT
-{
- File = "popup_select_current.png";
-};
-
-Bitmap RID_BMP_UNSELECT_CURRENT
-{
- File = "popup_unselect_current.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index e799d89b7195..9c274a048016 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.src
@@ -22,64 +22,4 @@
// Image list here, so that there is no interruption during assembly
// of the "real" image list in ui.src
-Bitmap RID_BMP_LEVEL1
-{
- File = "ou01.png";
-};
-
-Bitmap RID_BMP_LEVEL2
-{
- File = "ou02.png";
-};
-
-Bitmap RID_BMP_LEVEL3
-{
- File = "ou03.png";
-};
-
-Bitmap RID_BMP_LEVEL4
-{
- File = "ou04.png";
-};
-
-Bitmap RID_BMP_LEVEL5
-{
- File = "ou05.png";
-};
-
-Bitmap RID_BMP_LEVEL6
-{
- File = "ou06.png";
-};
-
-Bitmap RID_BMP_LEVEL7
-{
- File = "ou07.png";
-};
-
-Bitmap RID_BMP_LEVEL8
-{
- File = "ou08.png";
-};
-
-Bitmap RID_BMP_PLUS
-{
- File = "ou09.png";
-};
-
-Bitmap RID_BMP_MINUS
-{
- File = "ou010.png";
-};
-
-Bitmap RID_BMP_NOTPRESSED
-{
- File = "ou011.png";
-};
-
-Bitmap RID_BMP_PRESSED
-{
- File = "ou012.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc
deleted file mode 100644
index 07ae417018ff..000000000000
--- a/sc/source/ui/inc/iconsets.hrc
+++ /dev/null
@@ -1,67 +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/.
- */
-
-#define BMP_ICON_SET_CIRCLES1_GRAY 999
-#define BMP_ICON_SET_CIRCLES1_GREEN 998
-#define BMP_ICON_SET_CIRCLES1_YELLOW 997
-#define BMP_ICON_SET_CIRCLES1_RED 996
-#define BMP_ICON_SET_BARS_EMPTY 995
-#define BMP_ICON_SET_BARS_ONE_QUARTER 994
-#define BMP_ICON_SET_BARS_HALF 993
-#define BMP_ICON_SET_BARS_THREE_QUARTER 992
-#define BMP_ICON_SET_BARS_FULL 991
-#define BMP_ICON_SET_CIRCLES2_DARK_GRAY 990
-#define BMP_ICON_SET_CIRCLES2_LIGHT_GRAY 989
-#define BMP_ICON_SET_CIRCLES2_LIGHT_RED 988
-#define BMP_ICON_SET_CIRCLES2_DARK_RED 987
-#define BMP_ICON_SET_COLORARROWS_DOWN 986
-#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN 985
-#define BMP_ICON_SET_COLORARROWS_SAME 984
-#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP 983
-#define BMP_ICON_SET_COLORARROWS_UP 982
-#define BMP_ICON_SET_FLAGS_RED 981
-#define BMP_ICON_SET_FLAGS_YELLOW 980
-#define BMP_ICON_SET_FLAGS_GREEN 979
-#define BMP_ICON_SET_GRAYARROWS_DOWN 978
-#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN 977
-#define BMP_ICON_SET_GRAYARROWS_SAME 976
-#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP 975
-#define BMP_ICON_SET_GRAYARROWS_UP 974
-#define BMP_ICON_SET_PIES_EMPTY 973
-#define BMP_ICON_SET_PIES_ONE_QUARTER 972
-#define BMP_ICON_SET_PIES_HALF 971
-#define BMP_ICON_SET_PIES_THREE_QUARTER 970
-#define BMP_ICON_SET_PIES_FULL 969
-#define BMP_ICON_SET_SHAPES_CIRCLE 968
-#define BMP_ICON_SET_SHAPES_TRIANGLE 967
-#define BMP_ICON_SET_SHAPES_DIAMOND 966
-#define BMP_ICON_SET_SQUARES_EMPTY 965
-#define BMP_ICON_SET_SQUARES_ONE_QUARTER 964
-#define BMP_ICON_SET_SQUARES_HALF 963
-#define BMP_ICON_SET_SQUARES_THREE_QUARTER 962
-#define BMP_ICON_SET_SQUARES_FULL 961
-#define BMP_ICON_SET_STARS_EMPTY 960
-#define BMP_ICON_SET_STARS_HALF 959
-#define BMP_ICON_SET_STARS_FULL 958
-#define BMP_ICON_SET_SYMBOLS1_CHECK 957
-#define BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK 956
-#define BMP_ICON_SET_SYMBOLS1_CROSS 955
-#define BMP_ICON_SET_TRAFFICLIGHTS_RED 954
-#define BMP_ICON_SET_TRAFFICLIGHTS_YELLOW 953
-#define BMP_ICON_SET_TRAFFICLIGHTS_GREEN 952
-#define BMP_ICON_SET_TRIANGLES_DOWN 951
-#define BMP_ICON_SET_TRIANGLES_SAME 950
-#define BMP_ICON_SET_TRIANGLES_UP 949
-#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE 948
-#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE 947
-#define BMP_ICON_SET_NEGATIVE_RED_SMILIE 946
-#define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE 945
-#define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE 944
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index 6e8cc64417ca..f94a95cc04a9 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -193,9 +193,9 @@ private:
long nLevelStart, long nEntryStart,
long nLevelEnd, long nEntryEnd );
/** Draws the specified image unpressed. */
- void DrawImageRel( long nLevelPos, long nEntryPos,
sal_uInt16 nId );
+ void DrawImageRel(long nLevelPos, long nEntryPos,
const OUString& rId);
/** Draws a pressed or unpressed border. */
- void DrawBorderRel( size_t nLevel, size_t nEntry,
bool bPressed );
+ void DrawBorderRel(size_t nLevel, size_t nEntry,
bool bPressed);
/** Draws the focus rectangle into the focused button. */
void ShowFocus();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 2cf0cec52da3..8fd837c3c5b5 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -51,6 +51,7 @@
#include "scres.hrc"
#include "scresid.hxx"
#include "globstr.hrc"
+#include "bitmaps.hlst"
#include "arealink.hxx"
#include "navicfg.hxx"
#include "navsett.hxx"
@@ -77,6 +78,18 @@ static const ScContentId pTypeList[(int)ScContentId::LAST +
1] =
ScContentId::DRAWING
};
+static const OUStringLiteral aContentBmps[]=
+{
+ RID_BMP_CONTENT_TABLE,
+ RID_BMP_CONTENT_RANGENAME,
+ RID_BMP_CONTENT_DBAREA,
+ RID_BMP_CONTENT_GRAPHIC,
+ RID_BMP_CONTENT_OLEOBJECT,
+ RID_BMP_CONTENT_NOTE,
+ RID_BMP_CONTENT_AREALINK,
+ RID_BMP_CONTENT_DRAWING
+};
+
bool ScContentTree::bIsInDrag = false;
ScDocShell* ScContentTree::GetManualOrCurrent()
@@ -224,7 +237,8 @@ void ScContentTree::InitRoot( ScContentId nType )
return;
}
- Image aImage(BitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nType)));
+ BitmapEx aBitmap(aContentBmps[(int)nType - 1]);
+ Image aImage(aBitmap);
OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType));
// wieder an die richtige Position:
sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 87b3cf6c401a..a3f07db46431 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -38,6 +38,7 @@
#include "rangenam.hxx"
#include "rangeutl.hxx"
#include "scres.hrc"
+#include "bitmaps.hlst"
#include "scresid.hxx"
#include "scmod.hxx"
#include "navicfg.hxx"
@@ -409,20 +410,20 @@ void ScNavigatorDlg::UpdateButtons()
aTbxCmd->CheckItem(nChangeRootId, bRootSet);
}
- sal_uInt16 nImageId = 0;
+ OUString sImageId;
switch (nDropMode)
{
case SC_DROPMODE_URL:
- nImageId = RID_BMP_DROP_URL;
+ sImageId = RID_BMP_DROP_URL;
break;
case SC_DROPMODE_LINK:
- nImageId = RID_BMP_DROP_LINK;
+ sImageId = RID_BMP_DROP_LINK;
break;
case SC_DROPMODE_COPY:
- nImageId = RID_BMP_DROP_COPY;
+ sImageId = RID_BMP_DROP_COPY;
break;
}
- aTbxCmd->SetItemImage(nDragModeId, Image(BitmapEx(ScResId(nImageId))));
+ aTbxCmd->SetItemImage(nDragModeId, Image(BitmapEx(sImageId)));
}
ScNavigatorSettings::ScNavigatorSettings()
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 4da7b17d911b..1838bb535788 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -19,76 +19,6 @@
#include "scres.hrc"
-Bitmap RID_BMP_CONTENT_TABLE
-{
- File = "nc01.png";
-};
-
-Bitmap RID_BMP_CONTENT_RANGENAME
-{
- File = "nc02.png";
-};
-
-Bitmap RID_BMP_CONTENT_DBAREA
-{
- File = "nc03.png";
-};
-
-Bitmap RID_BMP_CONTENT_GRAPHIC
-{
- File = "nc04.png";
-};
-
-Bitmap RID_BMP_CONTENT_OLEOBJECT
-{
- File = "nc05.png";
-};
-
-Bitmap RID_BMP_CONTENT_NOTE
-{
- File = "nc06.png";
-};
-
-Bitmap RID_BMP_CONTENT_AREALINK
-{
- File = "nc07.png";
-};
-
-Bitmap RID_BMP_CONTENT_DRAWING
-{
- File = "nc08.png";
-};
-
-Bitmap RID_BMP_DROP_URL
-{
- File = "dropurl.png";
-};
-
-Bitmap RID_BMP_DROP_LINK
-{
- File = "droplink.png";
-};
-
-Bitmap RID_BMP_DROP_COPY
-{
- File = "dropcopy.png";
-};
-
-Bitmap RID_BMP_ELEMENT_DEFAULT
-{
- File = "xml_element.png";
-};
-
-Bitmap RID_BMP_ELEMENT_REPEAT
-{
- File = "xml_element_repeat.png";
-};
-
-Bitmap RID_BMP_ELEMENT_ATTRIBUTE
-{
- File = "xml_attribute.png";
-};
-
// content description strings are also used in ScLinkTargetsObj
String SCSTR_CONTENT_ROOT
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index 4649fe2dabf7..628f2c6ce216 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -33,7 +33,6 @@
#include "tabvwsh.hxx"
#include "docsh.hxx"
#include "globstr.hrc"
-#include "pagedlg.hrc"
#include "compiler.hxx"
#include "markdata.hxx"
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
deleted file mode 100644
index f975939af8a8..000000000000
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ /dev/null
@@ -1,27 +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 "scres.hrc"
-
-// TabPage: Tabelle
-
-#define BMP_LEFTRIGHT (SC_DIALOGS_START + 43 + 23)
-#define BMP_TOPDOWN (SC_DIALOGS_START + 43 + 24)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
deleted file mode 100644
index 16972ce51921..000000000000
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ /dev/null
@@ -1,31 +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 "pagedlg.hrc"
-
-Bitmap BMP_LEFTRIGHT
-{
- File = "lftrgt.png";
-};
-
-Bitmap BMP_TOPDOWN
-{
- File = "topdown.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 5b3dbff4a43d..1190ef82fbc7 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -28,7 +28,7 @@
#include "attrib.hxx"
#include "scresid.hxx"
#include "sc.hrc"
-#include "pagedlg.hrc"
+#include "bitmaps.hlst"
// Static Data
@@ -117,7 +117,7 @@ ScTablePage::ScTablePage( vcl::Window* pParent, const
SfxItemSet& rCoreAttrs ) :
void ScTablePage::ShowImage()
{
- Image aImg(BitmapEx(ScResId((m_pBtnLeftRight->IsChecked()) ? BMP_LEFTRIGHT
: BMP_TOPDOWN)));
+ Image aImg(BitmapEx(m_pBtnLeftRight->IsChecked() ? OUString(BMP_LEFTRIGHT)
: OUString(BMP_TOPDOWN)));
m_pBmpPageDir->SetImage( aImg );
m_pBmpPageDir->SetOutputSizePixel( aImg.GetSizePixel() );
}
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index e622b08c716e..b50292dca6b5 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -21,6 +21,7 @@
#include <sfx2/sidebar/ControlFactory.hxx>
#include "CellAppearancePropertyPanel.hxx"
#include "scres.hrc"
+#include "bitmaps.hlst"
#include "scresid.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -58,16 +59,16 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
maBorderTLBRControl(SID_ATTR_BORDER_DIAG_TLBR, *pBindings, *this),
maBorderBLTRControl(SID_ATTR_BORDER_DIAG_BLTR, *pBindings, *this),
- maIMGCellBorder(BitmapEx(ScResId(RID_BMP_CELL_BORDER))),
- maIMGLineStyle1(BitmapEx(ScResId(RID_BMP_LINE_STYLE1))),
- maIMGLineStyle2(BitmapEx(ScResId(RID_BMP_LINE_STYLE2))),
- maIMGLineStyle3(BitmapEx(ScResId(RID_BMP_LINE_STYLE3))),
- maIMGLineStyle4(BitmapEx(ScResId(RID_BMP_LINE_STYLE4))),
- maIMGLineStyle5(BitmapEx(ScResId(RID_BMP_LINE_STYLE5))),
- maIMGLineStyle6(BitmapEx(ScResId(RID_BMP_LINE_STYLE6))),
- maIMGLineStyle7(BitmapEx(ScResId(RID_BMP_LINE_STYLE7))),
- maIMGLineStyle8(BitmapEx(ScResId(RID_BMP_LINE_STYLE8))),
- maIMGLineStyle9(BitmapEx(ScResId(RID_BMP_LINE_STYLE9))),
+ maIMGCellBorder(BitmapEx(RID_BMP_CELL_BORDER)),
+ maIMGLineStyle1(BitmapEx(RID_BMP_LINE_STYLE1)),
+ maIMGLineStyle2(BitmapEx(RID_BMP_LINE_STYLE2)),
+ maIMGLineStyle3(BitmapEx(RID_BMP_LINE_STYLE3)),
+ maIMGLineStyle4(BitmapEx(RID_BMP_LINE_STYLE4)),
+ maIMGLineStyle5(BitmapEx(RID_BMP_LINE_STYLE5)),
+ maIMGLineStyle6(BitmapEx(RID_BMP_LINE_STYLE6)),
+ maIMGLineStyle7(BitmapEx(RID_BMP_LINE_STYLE7)),
+ maIMGLineStyle8(BitmapEx(RID_BMP_LINE_STYLE8)),
+ maIMGLineStyle9(BitmapEx(RID_BMP_LINE_STYLE9)),
mnIn(0),
mnOut(0),
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
deleted file mode 100644
index 48bab6f36bdc..000000000000
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ /dev/null
@@ -1,75 +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 "scres.hrc"
-#include "helpids.h"
-
-Bitmap RID_BMP_CELL_BORDER
-{
- File = "sidebar/CellBorder.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE1
-{
- File = "sidebar/CellBorderLineStyle_005.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE2
-{
- File = "sidebar/CellBorderLineStyle_250.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE3
-{
- File = "sidebar/CellBorderLineStyle_400.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE4
-{
- File = "sidebar/CellBorderLineStyle_500.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE5
-{
- File = "sidebar/CellBorderLineStyle_110.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE6
-{
- File = "sidebar/CellBorderLineStyle_260.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE7
-{
- File = "sidebar/CellBorderLineStyle_450.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE8
-{
- File = "sidebar/CellBorderLineStyle_505.png";
-};
-
-Bitmap RID_BMP_LINE_STYLE9
-{
- File = "sidebar/CellBorderLineStyle_750.png";
-};
-
-// cell border style popup
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
deleted file mode 100644
index 4fb56fde9ad4..000000000000
--- a/sc/source/ui/src/iconsets.src
+++ /dev/null
@@ -1,237 +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/.
- */
-
-#include "iconsets.hrc"
-
-Bitmap BMP_ICON_SET_CIRCLES1_GRAY
-{
- File = "icon-set-circles1-gray.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES1_GREEN
-{
- File = "icon-set-circles1-green.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES1_YELLOW
-{
- File = "icon-set-circles1-yellow.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES1_RED
-{
- File = "icon-set-circles1-red.png";
-};
-Bitmap BMP_ICON_SET_BARS_EMPTY
-{
- File = "icon-set-bars-empty.png";
-};
-Bitmap BMP_ICON_SET_BARS_ONE_QUARTER
-{
- File = "icon-set-bars-one-quarter.png";
-};
-Bitmap BMP_ICON_SET_BARS_HALF
-{
- File = "icon-set-bars-half.png";
-};
-Bitmap BMP_ICON_SET_BARS_THREE_QUARTER
-{
- File = "icon-set-bars-three-quarters.png";
-};
-Bitmap BMP_ICON_SET_BARS_FULL
-{
- File = "icon-set-bars-full.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES2_DARK_GRAY
-{
- File = "icon-set-circles2-dark-gray.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_GRAY
-{
- File = "icon-set-circles2-light-gray.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_RED
-{
- File = "icon-set-circles2-light-red.png";
-};
-Bitmap BMP_ICON_SET_CIRCLES2_DARK_RED
-{
- File = "icon-set-circles2-dark-red.png";
-};
-Bitmap BMP_ICON_SET_COLORARROWS_DOWN
-{
- File = "icon-set-colorarrows-down.png";
-};
-Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN
-{
- File = "icon-set-colorarrows-slightly-down.png";
-};
-Bitmap BMP_ICON_SET_COLORARROWS_SAME
-{
- File = "icon-set-colorarrows-same.png";
-};
-Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP
-{
- File = "icon-set-colorarrows-slightly-up.png";
-};
-Bitmap BMP_ICON_SET_COLORARROWS_UP
-{
- File = "icon-set-colorarrows-up.png";
-};
-Bitmap BMP_ICON_SET_FLAGS_RED
-{
- File = "icon-set-flags-red.png";
-};
-Bitmap BMP_ICON_SET_FLAGS_YELLOW
-{
- File = "icon-set-flags-yellow.png";
-};
-Bitmap BMP_ICON_SET_FLAGS_GREEN
-{
- File = "icon-set-flags-green.png";
-};
-Bitmap BMP_ICON_SET_GRAYARROWS_DOWN
-{
- File = "icon-set-grayarrows-down.png";
-};
-Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN
-{
- File = "icon-set-grayarrows-slightly-down.png";
-};
-Bitmap BMP_ICON_SET_GRAYARROWS_SAME
-{
- File = "icon-set-grayarrows-same.png";
-};
-Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP
-{
- File = "icon-set-grayarrows-slightly-up.png";
-};
-Bitmap BMP_ICON_SET_GRAYARROWS_UP
-{
- File = "icon-set-grayarrows-up.png";
-};
-Bitmap BMP_ICON_SET_PIES_EMPTY
-{
- File = "icon-set-pies-empty.png";
-};
-Bitmap BMP_ICON_SET_PIES_ONE_QUARTER
-{
- File = "icon-set-pies-one-quarter.png";
-};
-Bitmap BMP_ICON_SET_PIES_HALF
-{
- File = "icon-set-pies-half.png";
-};
-Bitmap BMP_ICON_SET_PIES_THREE_QUARTER
-{
- File = "icon-set-pies-three-quarters.png";
-};
-Bitmap BMP_ICON_SET_PIES_FULL
-{
- File = "icon-set-pies-full.png";
-};
-Bitmap BMP_ICON_SET_SHAPES_CIRCLE
-{
- File = "icon-set-shapes-circle.png";
-};
-Bitmap BMP_ICON_SET_SHAPES_TRIANGLE
-{
- File = "icon-set-shapes-triangle";
-};
-Bitmap BMP_ICON_SET_SHAPES_DIAMOND
-{
- File = "icon-set-shapes-diamond.png";
-};
-Bitmap BMP_ICON_SET_SQUARES_EMPTY
-{
- File = "icon-set-squares-empty.png";
-};
-Bitmap BMP_ICON_SET_SQUARES_ONE_QUARTER
-{
- File = "icon-set-squares-one-quarter.png";
-};
-Bitmap BMP_ICON_SET_SQUARES_HALF
-{
- File = "icon-set-squares-half.png";
-};
-Bitmap BMP_ICON_SET_SQUARES_THREE_QUARTER
-{
- File = "icon-set-squares-three-quarters.png";
-};
-Bitmap BMP_ICON_SET_SQUARES_FULL
-{
- File = "icon-set-squares-full.png";
-};
-Bitmap BMP_ICON_SET_STARS_EMPTY
-{
- File = "icon-set-stars-empty.png";
-};
-Bitmap BMP_ICON_SET_STARS_HALF
-{
- File = "icon-set-stars-half.png";
-};
-Bitmap BMP_ICON_SET_STARS_FULL
-{
- File = "icon-set-stars-full.png";
-};
-Bitmap BMP_ICON_SET_SYMBOLS1_CHECK
-{
- File = "icon-set-symbols1-check.png";
-};
-Bitmap BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK
-{
- File = "icon-set-symbols1-exclamation-mark.png";
-};
-Bitmap BMP_ICON_SET_SYMBOLS1_CROSS
-{
- File = "icon-set-symbols1-cross.png";
-};
-Bitmap BMP_ICON_SET_TRAFFICLIGHTS_RED
-{
- File = "icon-set-trafficlights-red.png";
-};
-Bitmap BMP_ICON_SET_TRAFFICLIGHTS_YELLOW
-{
- File = "icon-set-trafficlights-yellow.png";
-};
-Bitmap BMP_ICON_SET_TRAFFICLIGHTS_GREEN
-{
- File = "icon-set-trafficlights-green.png";
-};
-Bitmap BMP_ICON_SET_TRIANGLES_DOWN
-{
- File = "icon-set-triangles-down.png";
-};
-Bitmap BMP_ICON_SET_TRIANGLES_SAME
-{
- File = "icon-set-triangles-same.png";
-};
-Bitmap BMP_ICON_SET_TRIANGLES_UP
-{
- File = "icon-set-triangles-up.png";
-};
-Bitmap BMP_ICON_SET_POSITIVE_GREEN_SMILIE
-{
- File = "icon-set-positive-green-smilie.png";
-};
-Bitmap BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE
-{
- File = "icon-set-neutral-yellow-smilie.png";
-};
-Bitmap BMP_ICON_SET_NEGATIVE_RED_SMILIE
-{
- File = "icon-set-negative-red-smilie.png";
-};
-Bitmap BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
-{
- File = "icon-set-positive-yellow-smilie.png";
-};
-Bitmap BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
-{
- File = "icon-set-negative-yellow-smilie.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index 9c79709a52ec..7cc96981288f 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -19,10 +19,6 @@
#include "sc.hrc"
- // About-Dialog --------------------------------------------------------------
-
- // Icons & Bitmaps: ----------------------------------------------------------
-
// ???
String 30001 { Text = "Dummy1" ; };
String 30002 { Text = "Dummy2" ; };
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 59af091d3f82..9cc4f70a0218 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -64,29 +64,4 @@ String SCSTR_QHELP_COLLAPSE_FORMULA
Text [ en-US ] = "Collapse Formula Bar" ;
};
-Bitmap RID_BMP_INPUT_FUNCTION
-{
- File = "sc26047.png";
-};
-
-Bitmap RID_BMP_INPUT_SUM
-{
- File = "sc26048.png";
-};
-
-Bitmap RID_BMP_INPUT_EQUAL
-{
- File = "sc26049.png";
-};
-
-Bitmap RID_BMP_INPUT_CANCEL
-{
- File = "sc26050.png";
-};
-
-Bitmap RID_BMP_INPUT_OK
-{
- File = "sc26051.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/styleui/scstyles.src
b/sc/source/ui/styleui/scstyles.src
index 900bd9873e3b..45e7c6073da2 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -41,14 +41,4 @@ StringArray RID_PAGESTYLEFAMILY
};
};
-Bitmap BMP_STYLES_FAMILY_CELL
-{
- File = "sf01.png";
-};
-
-Bitmap BMP_STYLES_FAMILY_PAGE
-{
- File = "sf02.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index f6d7277393d5..ad58594f95e0 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -35,6 +35,7 @@
#include "content.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "bitmaps.hlst"
#include "unonames.hxx"
using namespace ::com::sun::star;
@@ -199,6 +200,18 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const
OUString& /* aProperty
//! exception?
}
+static const OUStringLiteral aContentBmps[]=
+{
+ RID_BMP_CONTENT_TABLE,
+ RID_BMP_CONTENT_RANGENAME,
+ RID_BMP_CONTENT_DBAREA,
+ RID_BMP_CONTENT_GRAPHIC,
+ RID_BMP_CONTENT_OLEOBJECT,
+ RID_BMP_CONTENT_NOTE,
+ RID_BMP_CONTENT_AREALINK,
+ RID_BMP_CONTENT_DRAWING
+};
+
void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16
nType )
{
ScContentId nImgId = ScContentId::ROOT;
@@ -216,7 +229,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any&
rRet, sal_uInt16 nType
}
if (nImgId != ScContentId::ROOT)
{
- BitmapEx aBitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nImgId));
+ BitmapEx aBitmapEx(aContentBmps[(int)nImgId -1 ]);
rRet <<= uno::Reference< awt::XBitmap >
(VCLUnoHelper::CreateBitmap(aBitmapEx));
}
}
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index daa983f18e11..6e1d9174dd4d 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -27,6 +27,7 @@
#include "dbfunc.hxx"
#include "scres.hrc"
#include "scresid.hxx"
+#include "bitmaps.hlst"
const long SC_OL_BITMAPSIZE = 12;
const long SC_OL_POSOFFSET = 2;
@@ -529,15 +530,15 @@ void ScOutlineWindow::DrawRectRel(
namespace
{
- Image GetImage(sal_uInt16 nId)
+ Image GetImage(const OUString& rId)
{
- return Image(BitmapEx(ScResId(nId)));
+ return Image(BitmapEx(rId));
}
}
-void ScOutlineWindow::DrawImageRel(long nLevelPos, long nEntryPos, sal_uInt16
nId)
+void ScOutlineWindow::DrawImageRel(long nLevelPos, long nEntryPos, const
OUString& rId)
{
- const Image& rImage = GetImage(nId);
+ const Image& rImage = GetImage(rId);
SetLineColor();
SetFillColor( GetBackground().GetColor() );
Point aPos( GetPoint( nLevelPos, nEntryPos ) );
@@ -550,11 +551,11 @@ void ScOutlineWindow::DrawBorderRel( size_t nLevel,
size_t nEntry, bool bPressed
Point aPos;
if ( GetImagePos( nLevel, nEntry, aPos ) )
{
- sal_uInt16 nId = bPressed ? RID_BMP_PRESSED : RID_BMP_NOTPRESSED;
+ OUString sId = bPressed ? OUString(RID_BMP_PRESSED) :
OUString(RID_BMP_NOTPRESSED);
bool bClip = (nEntry != SC_OL_HEADERENTRY);
if ( bClip )
SetEntryAreaClipRegion();
- DrawImage(aPos, GetImage(nId));
+ DrawImage(aPos, GetImage(sId));
if ( bClip )
SetClipRegion();
}
@@ -600,6 +601,18 @@ void ScOutlineWindow::HideFocus()
}
}
+static const OUStringLiteral aLevelBmps[]=
+{
+ RID_BMP_LEVEL1,
+ RID_BMP_LEVEL2,
+ RID_BMP_LEVEL3,
+ RID_BMP_LEVEL4,
+ RID_BMP_LEVEL5,
+ RID_BMP_LEVEL6,
+ RID_BMP_LEVEL7,
+ RID_BMP_LEVEL8
+};
+
void ScOutlineWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const
tools::Rectangle& /* rRect */ )
{
long nEntriesSign = mbMirrorEntries ? -1 : 1;
@@ -624,7 +637,7 @@ void ScOutlineWindow::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
{
long nEntryPos = GetHeaderEntryPos();
for ( size_t nLevel = 0; nLevel < nLevelCount; ++nLevel )
- DrawImageRel(GetLevelPos(nLevel), nEntryPos, RID_BMP_LEVEL1 +
nLevel);
+ DrawImageRel(GetLevelPos(nLevel), nEntryPos, aLevelBmps[nLevel]);
SetLineColor( maLineColor );
long nLinePos = mnHeaderPos + (mbMirrorEntries ? 0 : (mnHeaderSize -
1));
@@ -696,8 +709,8 @@ void ScOutlineWindow::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
// draw, if not hidden by higher levels
if ( bDraw )
{
- sal_uInt16 nImageId = pEntry->IsHidden() ? RID_BMP_PLUS :
RID_BMP_MINUS;
- DrawImageRel( nLevelPos, nImagePos, nImageId );
+ OUString sImageId = pEntry->IsHidden() ?
OUString(RID_BMP_PLUS) : OUString(RID_BMP_MINUS);
+ DrawImageRel(nLevelPos, nImagePos, sImageId);
}
}
}
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index d643879fb700..09bd3dbabc09 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -9,6 +9,7 @@
#include "xmlsourcedlg.hxx"
#include "sc.hrc"
+#include "bitmaps.hlst"
#include "scresid.hxx"
#include "document.hxx"
#include "orcusfilters.hxx"
@@ -90,9 +91,9 @@ ScXMLSourceDlg::ScXMLSourceDlg(
mpActiveEdit = mpRefEdit;
- maXMLParam.maImgElementDefault =
Image(BitmapEx(ScResId(RID_BMP_ELEMENT_DEFAULT)));
- maXMLParam.maImgElementRepeat =
Image(BitmapEx(ScResId(RID_BMP_ELEMENT_REPEAT)));
- maXMLParam.maImgAttribute =
Image(BitmapEx(ScResId(RID_BMP_ELEMENT_ATTRIBUTE)));
+ maXMLParam.maImgElementDefault = Image(BitmapEx(RID_BMP_ELEMENT_DEFAULT));
+ maXMLParam.maImgElementRepeat = Image(BitmapEx(RID_BMP_ELEMENT_REPEAT));
+ maXMLParam.maImgAttribute = Image(BitmapEx(RID_BMP_ELEMENT_ATTRIBUTE));
Link<Button*,void> aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl);
mpBtnSelectSource->SetClickHdl(aBtnHdl);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
