[Libreoffice-commits] core.git: include/svtools postprocess/CustomTarget_images.mk svtools/AllLangResTarget_svt.mk svtools/inc svtools/source
Caolán McNamara
caolanm at redhat.com
Wed Apr 26 09:40:51 UTC 2017
include/svtools/svtools.hrc | 113 -------
postprocess/CustomTarget_images.mk | 1
svtools/AllLangResTarget_svt.mk | 1
svtools/inc/bitmaps.hlst | 127 ++++++++
svtools/source/brwbox/editbrowsebox.cxx | 19 -
svtools/source/brwbox/editbrowsebox.src | 67 ----
svtools/source/contnr/fileview.cxx | 3
svtools/source/contnr/fileview.src | 10
svtools/source/contnr/foldertree.cxx | 5
svtools/source/contnr/svcontnr.src | 10
svtools/source/contnr/svimpbox.cxx | 5
svtools/source/misc/embedhlp.cxx | 5
svtools/source/misc/imagemgr.cxx | 308 +++++++++++++-------
svtools/source/misc/imagemgr.src | 492 --------------------------------
14 files changed, 357 insertions(+), 809 deletions(-)
New commits:
commit d4a4d0e978d1808aaee696381642887a6e6f63d7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 26 10:33:02 2017 +0100
remove svtools bitmaps from .src files
Change-Id: I13280315c2af2277d5c8d31c079075337b2c8f82
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index fa134e81c061..d2cc41dc5a47 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -232,119 +232,6 @@
#define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32)
#define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES)
-// bitmaps
-#define RID_BMP_TREENODE_COLLAPSED (RID_SVTOOLS_BITMAP_START + 0)
-#define RID_BMP_TREENODE_EXPANDED (RID_SVTOOLS_BITMAP_START + 1)
-#define RID_BMP_FOLDER (RID_SVTOOLS_BITMAP_START + 2)
-#define RID_BMP_FOLDER_OPEN (RID_SVTOOLS_BITMAP_START + 3)
-#define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 4)
-#define BMP_CURRENT (RID_SVTOOLS_BITMAP_START + 5)
-#define BMP_MODIFIED (RID_SVTOOLS_BITMAP_START + 6)
-#define BMP_NEW (RID_SVTOOLS_BITMAP_START + 7)
-#define BMP_DELETED (RID_SVTOOLS_BITMAP_START + 8)
-#define BMP_CURRENTNEW (RID_SVTOOLS_BITMAP_START + 9)
-#define BMP_PRIMARYKEY (RID_SVTOOLS_BITMAP_START + 10)
-#define BMP_CURRENT_PRIMARYKEY (RID_SVTOOLS_BITMAP_START + 11)
-#define BMP_FILTER (RID_SVTOOLS_BITMAP_START + 12)
-#define BMP_HEADERFOOTER (RID_SVTOOLS_BITMAP_START + 13)
-#define BMP_IMPRESS_SC (RID_SVTOOLS_BITMAP_START + 14)
-#define BMP_BITMAP_SC (RID_SVTOOLS_BITMAP_START + 15)
-#define BMP_CALC_SC (RID_SVTOOLS_BITMAP_START + 16)
-#define BMP_CALCTEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 17)
-#define BMP_DATABASE_SC (RID_SVTOOLS_BITMAP_START + 18)
-#define BMP_IMPRESSTEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 19)
-#define BMP_GIF_SC (RID_SVTOOLS_BITMAP_START + 20)
-#define BMP_HTML_SC (RID_SVTOOLS_BITMAP_START + 21)
-#define BMP_JPG_SC (RID_SVTOOLS_BITMAP_START + 22)
-#define BMP_MATH_SC (RID_SVTOOLS_BITMAP_START + 23)
-#define BMP_MATHTEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 24)
-#define BMP_FILE_SC (RID_SVTOOLS_BITMAP_START + 25)
-#define BMP_PCD_SC (RID_SVTOOLS_BITMAP_START + 26)
-#define BMP_PCT_SC (RID_SVTOOLS_BITMAP_START + 27)
-#define BMP_PCX_SC (RID_SVTOOLS_BITMAP_START + 28)
-#define BMP_SIM_SC (RID_SVTOOLS_BITMAP_START + 29)
-#define BMP_TEXTFILE_SC (RID_SVTOOLS_BITMAP_START + 30)
-#define BMP_TIFF_SC (RID_SVTOOLS_BITMAP_START + 31)
-#define BMP_WMF_SC (RID_SVTOOLS_BITMAP_START + 32)
-#define BMP_WRITER_SC (RID_SVTOOLS_BITMAP_START + 33)
-#define BMP_WRITERTEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 34)
-#define BMP_FIXEDDEV_SC (RID_SVTOOLS_BITMAP_START + 35)
-#define BMP_REMOVABLEDEV_SC (RID_SVTOOLS_BITMAP_START + 36)
-#define BMP_CDROMDEV_SC (RID_SVTOOLS_BITMAP_START + 37)
-#define BMP_NETWORKDEV_SC (RID_SVTOOLS_BITMAP_START + 38)
-#define BMP_TABLE_SC (RID_SVTOOLS_BITMAP_START + 39)
-#define BMP_DXF_SC (RID_SVTOOLS_BITMAP_START + 41)
-#define BMP_MET_SC (RID_SVTOOLS_BITMAP_START + 42)
-#define BMP_PNG_SC (RID_SVTOOLS_BITMAP_START + 43)
-#define BMP_SGF_SC (RID_SVTOOLS_BITMAP_START + 44)
-#define BMP_SGV_SC (RID_SVTOOLS_BITMAP_START + 45)
-#define BMP_SVM_SC (RID_SVTOOLS_BITMAP_START + 46)
-#define BMP_GLOBAL_DOC_SC (RID_SVTOOLS_BITMAP_START + 47)
-#define BMP_DRAW_SC (RID_SVTOOLS_BITMAP_START + 48)
-#define BMP_DRAWTEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 49)
-#define BMP_TEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 50)
-#define BMP_OO_DATABASE_DOC_SC (RID_SVTOOLS_BITMAP_START + 51)
-#define BMP_OO_DRAW_DOC_SC (RID_SVTOOLS_BITMAP_START + 52)
-#define BMP_OO_MATH_DOC_SC (RID_SVTOOLS_BITMAP_START + 53)
-#define BMP_OO_GLOBAL_DOC_SC (RID_SVTOOLS_BITMAP_START + 54)
-#define BMP_OO_IMPRESS_DOC_SC (RID_SVTOOLS_BITMAP_START + 55)
-#define BMP_OO_CALC_DOC_SC (RID_SVTOOLS_BITMAP_START + 56)
-#define BMP_OO_WRITER_DOC_SC (RID_SVTOOLS_BITMAP_START + 57)
-#define BMP_OO_DRAW_TEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 58)
-#define BMP_OO_IMPRESS_TEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 59)
-#define BMP_OO_CALC_TEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 60)
-#define BMP_OO_WRITER_TEMPLATE_SC (RID_SVTOOLS_BITMAP_START + 61)
-#define BMP_EXTENSION_SC (RID_SVTOOLS_BITMAP_START + 62)
-#define BMP_IMPRESS_LC (RID_SVTOOLS_BITMAP_START + 63)
-#define BMP_BITMAP_LC (RID_SVTOOLS_BITMAP_START + 64)
-#define BMP_CALC_LC (RID_SVTOOLS_BITMAP_START + 65)
-#define BMP_CALCTEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 66)
-#define BMP_DATABASE_LC (RID_SVTOOLS_BITMAP_START + 67)
-#define BMP_IMPRESSTEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 68)
-#define BMP_GIF_LC (RID_SVTOOLS_BITMAP_START + 69)
-#define BMP_HTML_LC (RID_SVTOOLS_BITMAP_START + 70)
-#define BMP_JPG_LC (RID_SVTOOLS_BITMAP_START + 71)
-#define BMP_MATH_LC (RID_SVTOOLS_BITMAP_START + 72)
-#define BMP_MATHTEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 73)
-#define BMP_FILE_LC (RID_SVTOOLS_BITMAP_START + 74)
-#define BMP_PCD_LC (RID_SVTOOLS_BITMAP_START + 75)
-#define BMP_PCT_LC (RID_SVTOOLS_BITMAP_START + 76)
-#define BMP_PCX_LC (RID_SVTOOLS_BITMAP_START + 77)
-#define BMP_SIM_LC (RID_SVTOOLS_BITMAP_START + 78)
-#define BMP_TEXTFILE_LC (RID_SVTOOLS_BITMAP_START + 79)
-#define BMP_TIFF_LC (RID_SVTOOLS_BITMAP_START + 80)
-#define BMP_WMF_LC (RID_SVTOOLS_BITMAP_START + 81)
-#define BMP_WRITER_LC (RID_SVTOOLS_BITMAP_START + 82)
-#define BMP_WRITERTEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 83)
-#define BMP_FIXEDDEV_LC (RID_SVTOOLS_BITMAP_START + 84)
-#define BMP_REMOVABLEDEV_LC (RID_SVTOOLS_BITMAP_START + 85)
-#define BMP_CDROMDEV_LC (RID_SVTOOLS_BITMAP_START + 86)
-#define BMP_NETWORKDEV_LC (RID_SVTOOLS_BITMAP_START + 87)
-#define BMP_TABLE_LC (RID_SVTOOLS_BITMAP_START + 88)
-#define BMP_FOLDER_LC (RID_SVTOOLS_BITMAP_START + 89)
-#define BMP_DXF_LC (RID_SVTOOLS_BITMAP_START + 90)
-#define BMP_MET_LC (RID_SVTOOLS_BITMAP_START + 91)
-#define BMP_PNG_LC (RID_SVTOOLS_BITMAP_START + 92)
-#define BMP_SGF_LC (RID_SVTOOLS_BITMAP_START + 93)
-#define BMP_SGV_LC (RID_SVTOOLS_BITMAP_START + 94)
-#define BMP_SVM_LC (RID_SVTOOLS_BITMAP_START + 95)
-#define BMP_GLOBAL_DOC_LC (RID_SVTOOLS_BITMAP_START + 96)
-#define BMP_DRAW_LC (RID_SVTOOLS_BITMAP_START + 97)
-#define BMP_DRAWTEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 98)
-#define BMP_TEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 99)
-#define BMP_OO_DATABASE_DOC_LC (RID_SVTOOLS_BITMAP_START + 100)
-#define BMP_OO_DRAW_DOC_LC (RID_SVTOOLS_BITMAP_START + 101)
-#define BMP_OO_MATH_DOC_LC (RID_SVTOOLS_BITMAP_START + 102)
-#define BMP_OO_GLOBAL_DOC_LC (RID_SVTOOLS_BITMAP_START + 103)
-#define BMP_OO_IMPRESS_DOC_LC (RID_SVTOOLS_BITMAP_START + 104)
-#define BMP_OO_CALC_DOC_LC (RID_SVTOOLS_BITMAP_START + 105)
-#define BMP_OO_WRITER_DOC_LC (RID_SVTOOLS_BITMAP_START + 106)
-#define BMP_OO_DRAW_TEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 107)
-#define BMP_OO_IMPRESS_TEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 108)
-#define BMP_OO_CALC_TEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 109)
-#define BMP_OO_WRITER_TEMPLATE_LC (RID_SVTOOLS_BITMAP_START + 110)
-#define BMP_EXTENSION_LC (RID_SVTOOLS_BITMAP_START + 111)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 6a51612653c6..be74d4a28c75 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -62,6 +62,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/framework/inc/bitmaps.hlst \
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \
+ $(SRCDIR)/svtools/inc/bitmaps.hlst \
$(SRCDIR)/vcl/inc/bitmaps.hlst \
$(SRCDIR)/xmlsecurity/inc/bitmaps.hlst
grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 780f853fa581..b0a7545da7d2 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,svt/res,\
svtools/source/misc/ehdl.src \
- svtools/source/brwbox/editbrowsebox.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
new file mode 100644
index 000000000000..8948877de62a
--- /dev/null
+++ b/svtools/inc/bitmaps.hlst
@@ -0,0 +1,127 @@
+/* -*- 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_SVTOOLS_INC_BITMAPS_HRC
+#define INCLUDED_SVTOOLS_INC_BITMAPS_HRC
+
+#define BMP_IMPRESS_SC "res/sx03123.png"
+#define BMP_BITMAP_SC "res/sx03125.png"
+#define BMP_CALC_SC "res/sx03126.png"
+#define BMP_CALCTEMPLATE_SC "res/sx03127.png"
+#define BMP_DATABASE_SC "res/sx03129.png"
+#define BMP_IMPRESSTEMPLATE_SC "res/sx03130.png"
+#define BMP_GIF_SC "res/sx03137.png"
+#define BMP_HTML_SC "res/sx03139.png"
+#define BMP_JPG_SC "res/sx03140.png"
+#define BMP_MATH_SC "res/sx03144.png"
+#define BMP_MATHTEMPLATE_SC "res/sx03145.png"
+#define BMP_FILE_SC "res/sx03150.png"
+#define BMP_PCD_SC "res/sx03152.png"
+#define BMP_PCT_SC "res/sx03153.png"
+#define BMP_PCX_SC "res/sx03154.png"
+#define BMP_SIM_SC "res/sx03155.png"
+#define BMP_TEXTFILE_SC "res/sx03156.png"
+#define BMP_TIFF_SC "res/sx03158.png"
+#define BMP_WMF_SC "res/sx03160.png"
+#define BMP_WRITER_SC "res/sx03162.png"
+#define BMP_WRITERTEMPLATE_SC "res/sx03163.png"
+#define BMP_FIXEDDEV_SC "res/sx03164.png"
+#define BMP_REMOVABLEDEV_SC "res/sx03165.png"
+#define BMP_CDROMDEV_SC "res/sx03166.png"
+#define BMP_NETWORKDEV_SC "res/sx03167.png"
+#define BMP_TABLE_SC "res/sx03188.png"
+#define BMP_DXF_SC "res/sx03217.png"
+#define BMP_MET_SC "res/sx03218.png"
+#define BMP_PNG_SC "res/sx03219.png"
+#define BMP_SGF_SC "res/sx03220.png"
+#define BMP_SGV_SC "res/sx03221.png"
+#define BMP_SVM_SC "res/sx03222.png"
+#define BMP_GLOBAL_DOC_SC "res/sx03226.png"
+#define BMP_DRAW_SC "res/sx03227.png"
+#define BMP_DRAWTEMPLATE_SC "res/sx03228.png"
+#define BMP_TEMPLATE_SC "res/sx03242.png"
+#define BMP_OO_DATABASE_DOC_SC "res/sx03245.png"
+#define BMP_OO_DRAW_DOC_SC "res/sx03246.png"
+#define BMP_OO_MATH_DOC_SC "res/sx03247.png"
+#define BMP_OO_GLOBAL_DOC_SC "res/sx03248.png"
+#define BMP_OO_IMPRESS_DOC_SC "res/sx03249.png"
+#define BMP_OO_CALC_DOC_SC "res/sx03250.png"
+#define BMP_OO_WRITER_DOC_SC "res/sx03251.png"
+#define BMP_OO_DRAW_TEMPLATE_SC "res/sx03252.png"
+#define BMP_OO_IMPRESS_TEMPLATE_SC "res/sx03253.png"
+#define BMP_OO_CALC_TEMPLATE_SC "res/sx03254.png"
+#define BMP_OO_WRITER_TEMPLATE_SC "res/sx03255.png"
+#define BMP_EXTENSION_SC "res/sx03256.png"
+#define BMP_IMPRESS_LC "res/lx03123.png"
+#define BMP_BITMAP_LC "res/lx03125.png"
+#define BMP_CALC_LC "res/lx03126.png"
+#define BMP_CALCTEMPLATE_LC "res/lx03127.png"
+#define BMP_DATABASE_LC "res/lx03129.png"
+#define BMP_IMPRESSTEMPLATE_LC "res/lx03130.png"
+#define BMP_GIF_LC "res/lx03137.png"
+#define BMP_HTML_LC "res/lx03139.png"
+#define BMP_JPG_LC "res/lx03140.png"
+#define BMP_MATH_LC "res/lx03144.png"
+#define BMP_MATHTEMPLATE_LC "res/lx03145.png"
+#define BMP_FILE_LC "res/lx03150.png"
+#define BMP_PCD_LC "res/lx03152.png"
+#define BMP_PCT_LC "res/lx03153.png"
+#define BMP_PCX_LC "res/lx03154.png"
+#define BMP_SIM_LC "res/lx03155.png"
+#define BMP_TEXTFILE_LC "res/lx03156.png"
+#define BMP_TIFF_LC "res/lx03158.png"
+#define BMP_WMF_LC "res/lx03160.png"
+#define BMP_WRITER_LC "res/lx03162.png"
+#define BMP_WRITERTEMPLATE_LC "res/lx03163.png"
+#define BMP_FIXEDDEV_LC "res/lx03164.png"
+#define BMP_REMOVABLEDEV_LC "res/lx03165.png"
+#define BMP_CDROMDEV_LC "res/lx03166.png"
+#define BMP_NETWORKDEV_LC "res/lx03167.png"
+#define BMP_TABLE_LC "res/lx03188.png"
+#define BMP_FOLDER_LC "res/lx03189.png"
+#define BMP_DXF_LC "res/lx03217.png"
+#define BMP_MET_LC "res/lx03218.png"
+#define BMP_PNG_LC "res/lx03219.png"
+#define BMP_SGF_LC "res/lx03220.png"
+#define BMP_SGV_LC "res/lx03221.png"
+#define BMP_SVM_LC "res/lx03222.png"
+#define BMP_GLOBAL_DOC_LC "res/lx03226.png"
+#define BMP_DRAW_LC "res/lx03227.png"
+#define BMP_DRAWTEMPLATE_LC "res/lx03228.png"
+#define BMP_TEMPLATE_LC "res/lx03242.png"
+#define BMP_OO_DATABASE_DOC_LC "res/lx03245.png"
+#define BMP_OO_DRAW_DOC_LC "res/lx03246.png"
+#define BMP_OO_MATH_DOC_LC "res/lx03247.png"
+#define BMP_OO_GLOBAL_DOC_LC "res/lx03248.png"
+#define BMP_OO_IMPRESS_DOC_LC "res/lx03249.png"
+#define BMP_OO_CALC_DOC_LC "res/lx03250.png"
+#define BMP_OO_WRITER_DOC_LC "res/lx03251.png"
+#define BMP_OO_DRAW_TEMPLATE_LC "res/lx03252.png"
+#define BMP_OO_IMPRESS_TEMPLATE_LC "res/lx03253.png"
+#define BMP_OO_CALC_TEMPLATE_LC "res/lx03254.png"
+#define BMP_OO_WRITER_TEMPLATE_LC "res/lx03255.png"
+#define BMP_EXTENSION_LC "res/lx03256.png"
+#define BMP_PLUGIN "res/plugin.png"
+#define RID_BMP_FOLDER "res/folder.png"
+#define RID_BMP_FOLDER_OPEN "res/folderop.png"
+#define RID_BMP_TREENODE_COLLAPSED "res/plus.png"
+#define RID_BMP_TREENODE_EXPANDED "res/minus.png"
+#define BMP_CURRENT "svtools/res/ed01.png"
+#define BMP_MODIFIED "svtools/res/ed02.png"
+#define BMP_NEW "svtools/res/ed03.png"
+#define BMP_DELETED "svtools/res/ed04.png"
+#define BMP_CURRENTNEW "svtools/res/ed05.png"
+#define BMP_PRIMARYKEY "svtools/res/ed06.png"
+#define BMP_CURRENT_PRIMARYKEY "svtools/res/ed07.png"
+#define BMP_FILTER "svtools/res/ed08.png"
+#define BMP_HEADERFOOTER "svtools/res/ed09.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 691aefe7da10..d5dfefab7c94 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -30,6 +30,7 @@
#include <svtools/svtresid.hxx>
#include <svtools/svtools.hrc>
+#include "bitmaps.hlst"
#include <algorithm>
#include <tools/multisel.hxx>
@@ -257,32 +258,32 @@ namespace svt
switch (eStatus)
{
case CURRENT:
- aBitmap = BitmapEx(SvtResId((BMP_CURRENT)));
+ aBitmap = BitmapEx(BMP_CURRENT);
break;
case CURRENTNEW:
- aBitmap = BitmapEx(SvtResId((BMP_CURRENTNEW)));
+ aBitmap = BitmapEx(BMP_CURRENTNEW);
break;
case MODIFIED:
- aBitmap = BitmapEx(SvtResId((BMP_MODIFIED)));
+ aBitmap = BitmapEx(BMP_MODIFIED);
bNeedMirror = false; // the pen is not mirrored
break;
case NEW:
- aBitmap = BitmapEx(SvtResId((BMP_NEW)));
+ aBitmap = BitmapEx(BMP_NEW);
break;
case DELETED:
- aBitmap = BitmapEx(SvtResId((BMP_DELETED)));
+ aBitmap = BitmapEx(BMP_DELETED);
break;
case PRIMARYKEY:
- aBitmap = BitmapEx(SvtResId((BMP_PRIMARYKEY)));
+ aBitmap = BitmapEx(BMP_PRIMARYKEY);
break;
case CURRENT_PRIMARYKEY:
- aBitmap = BitmapEx(SvtResId((BMP_CURRENT_PRIMARYKEY)));
+ aBitmap = BitmapEx(BMP_CURRENT_PRIMARYKEY);
break;
case FILTER:
- aBitmap = BitmapEx(SvtResId((BMP_FILTER)));
+ aBitmap = BitmapEx(BMP_FILTER);
break;
case HEADERFOOTER:
- aBitmap = BitmapEx(SvtResId((BMP_HEADERFOOTER)));
+ aBitmap = BitmapEx(BMP_HEADERFOOTER);
break;
case CLEAN:
break;
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
deleted file mode 100644
index 32e0ac7eade4..000000000000
--- a/svtools/source/brwbox/editbrowsebox.src
+++ /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/.
- *
- * 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 <svtools/svtools.hrc>
-
-Bitmap BMP_CURRENT
-{
- File = "ed01.png";
-};
-
-Bitmap BMP_MODIFIED
-{
- File = "ed02.png";
-};
-
-Bitmap BMP_NEW
-{
- File = "ed03.png";
-};
-
-Bitmap BMP_DELETED
-{
- File = "ed04.png";
-};
-
-Bitmap BMP_CURRENTNEW
-{
- File = "ed05.png";
-};
-
-Bitmap BMP_PRIMARYKEY
-{
- File = "ed06.png";
-};
-
-Bitmap BMP_CURRENT_PRIMARYKEY
-{
- File = "ed07.png";
-};
-
-Bitmap BMP_FILTER
-{
- File = "ed08.png";
-};
-
-Bitmap BMP_HEADERFOOTER
-{
- File = "ed09.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 0d7d75bdb158..64c7b2a7ebfe 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -28,6 +28,7 @@
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/svtools.hrc>
+#include "bitmaps.hlst"
#include <svtools/viewdataentry.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include "contentenumeration.hxx"
@@ -1456,7 +1457,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
,mnSuspendSelectCallback ( 0 )
,mbIsFirstResort ( true )
,aIntlWrapper ( Application::GetSettings().GetLanguageTag() )
- ,maFolderImage (BitmapEx(SvtResId(RID_BMP_FOLDER)))
+ ,maFolderImage (BitmapEx(RID_BMP_FOLDER))
,mxCmdEnv ( xEnv )
{
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index 7e933e12d3f2..73ab0a340842 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -62,14 +62,4 @@ String STR_SVT_GB
Text [ en-US ] = "GB" ;
};
-Bitmap RID_BMP_FOLDER
-{
- File = "folder.png";
-};
-
-Bitmap RID_BMP_FOLDER_OPEN
-{
- File = "folderop.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index 0ea1a21ff10b..b8f7f7b17d5d 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -11,11 +11,12 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/dialog.hxx>
#include "contentenumeration.hxx"
+#include "bitmaps.hlst"
FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
: SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP )
- , m_aFolderImage(BitmapEx(SvtResId(RID_BMP_FOLDER)))
- , m_aFolderExpandedImage(BitmapEx(SvtResId(RID_BMP_FOLDER_OPEN)))
+ , m_aFolderImage(BitmapEx(RID_BMP_FOLDER))
+ , m_aFolderExpandedImage(BitmapEx(RID_BMP_FOLDER_OPEN))
{
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xInteractionHandler(
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index 12f83cdb542c..d486cb6e3eb7 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -19,16 +19,6 @@
#include <svtools/svtools.hrc>
-Bitmap RID_BMP_TREENODE_COLLAPSED
-{
- File = "plus.png";
-};
-
-Bitmap RID_BMP_TREENODE_EXPANDED
-{
- File = "minus.png";
-};
-
// descriptions of accessible objects
String STR_SVT_ACC_DESC_TABLISTBOX
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index f6ad77160d18..d6b3980bd9db 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -35,6 +35,7 @@
#include <svtools/svtresid.hxx>
#include <tools/wintypes.hxx>
#include <svtools/svtools.hrc>
+#include "bitmaps.hlst"
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -3336,8 +3337,8 @@ void SvImpLBox::implInitDefaultNodeImages()
// assume that all or nothing is initialized
return;
- s_pDefCollapsed = new Image(BitmapEx(SvtResId(RID_BMP_TREENODE_COLLAPSED)));
- s_pDefExpanded = new Image(BitmapEx(SvtResId(RID_BMP_TREENODE_EXPANDED)));
+ s_pDefCollapsed = new Image(BitmapEx(RID_BMP_TREENODE_COLLAPSED));
+ s_pDefExpanded = new Image(BitmapEx(RID_BMP_TREENODE_EXPANDED));
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 2c5ddc63be30..9900317a05b1 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -21,6 +21,7 @@
#include <svtools/embedhlp.hxx>
#include <vcl/graphicfilter.hxx>
#include <svtools/svtools.hrc>
+#include "bitmaps.hlst"
#include <svtools/svtresid.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
@@ -667,7 +668,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const tools::Rectangle &rRect, con
break;
}
- Bitmap aBmp( SvtResId( BMP_PLUGIN ) );
+ BitmapEx aBmp(BMP_PLUGIN);
long nHeight = rRect.GetHeight() - pOut->GetTextHeight();
long nWidth = rRect.GetWidth();
if(nHeight > 0 && nWidth > 0 && aBmp.GetSizePixel().Width() > 0)
@@ -696,7 +697,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const tools::Rectangle &rRect, con
nWidth = nW;
}
- pOut->DrawBitmap( aP, Size( nWidth, nHeight ), aBmp );
+ pOut->DrawBitmap(aP, Size( nWidth, nHeight ), aBmp.GetBitmap());
}
pOut->IntersectClipRegion( rRect );
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index cb8597a3f888..7260958fdc91 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -41,6 +41,7 @@
#include <osl/mutex.hxx>
#include <vcl/lazydelete.hxx>
#include "imagemgr.hrc"
+#include "bitmaps.hlst"
// globals *******************************************************************
@@ -485,107 +486,214 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
{
- switch (nImageId)
+ if (bBig)
{
- case IMG_IMPRESS:
- return Image(BitmapEx(SvtResId(bBig ? BMP_IMPRESS_LC : BMP_IMPRESS_SC)));
- case IMG_BITMAP:
- return Image(BitmapEx(SvtResId(bBig ? BMP_BITMAP_LC : BMP_BITMAP_SC)));
- case IMG_CALC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_CALC_LC : BMP_CALC_SC)));
- case IMG_CALCTEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_CALCTEMPLATE_LC : BMP_CALCTEMPLATE_SC)));
- case IMG_DATABASE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_DATABASE_LC : BMP_DATABASE_SC)));
- case IMG_IMPRESSTEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_IMPRESSTEMPLATE_LC : BMP_IMPRESSTEMPLATE_SC)));
- case IMG_GIF:
- return Image(BitmapEx(SvtResId(bBig ? BMP_GIF_LC : BMP_GIF_SC)));
- case IMG_HTML:
- return Image(BitmapEx(SvtResId(bBig ? BMP_HTML_LC : BMP_HTML_SC)));
- case IMG_JPG:
- return Image(BitmapEx(SvtResId(bBig ? BMP_JPG_LC : BMP_JPG_SC)));
- case IMG_MATH:
- return Image(BitmapEx(SvtResId(bBig ? BMP_MATH_LC : BMP_MATH_SC)));
- case IMG_MATHTEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_MATHTEMPLATE_LC : BMP_MATHTEMPLATE_SC)));
- case IMG_FILE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_FILE_LC : BMP_FILE_SC)));
- case IMG_PCD:
- return Image(BitmapEx(SvtResId(bBig ? BMP_PCD_LC : BMP_PCD_SC)));
- case IMG_PCT:
- return Image(BitmapEx(SvtResId(bBig ? BMP_PCT_LC : BMP_PCT_SC)));
- case IMG_PCX:
- return Image(BitmapEx(SvtResId(bBig ? BMP_PCX_LC : BMP_PCX_SC)));
- case IMG_SIM:
- return Image(BitmapEx(SvtResId(bBig ? BMP_SIM_LC : BMP_SIM_SC)));
- case IMG_TEXTFILE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_TEXTFILE_LC : BMP_TEXTFILE_SC)));
- case IMG_TIFF:
- return Image(BitmapEx(SvtResId(bBig ? BMP_TIFF_LC : BMP_TIFF_SC)));
- case IMG_WMF:
- return Image(BitmapEx(SvtResId(bBig ? BMP_WMF_LC : BMP_WMF_SC)));
- case IMG_WRITER:
- return Image(BitmapEx(SvtResId(bBig ? BMP_WRITER_LC : BMP_WRITER_SC)));
- case IMG_WRITERTEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_WRITERTEMPLATE_LC : BMP_WRITERTEMPLATE_SC)));
- case IMG_FIXEDDEV:
- return Image(BitmapEx(SvtResId(bBig ? BMP_FIXEDDEV_LC : BMP_FIXEDDEV_SC)));
- case IMG_REMOVABLEDEV:
- return Image(BitmapEx(SvtResId(bBig ? BMP_REMOVABLEDEV_LC : BMP_REMOVABLEDEV_SC)));
- case IMG_CDROMDEV:
- return Image(BitmapEx(SvtResId(bBig ? BMP_CDROMDEV_LC : BMP_CDROMDEV_SC)));
- case IMG_NETWORKDEV:
- return Image(BitmapEx(SvtResId(bBig ? BMP_NETWORKDEV_LC : BMP_NETWORKDEV_SC)));
- case IMG_TABLE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_TABLE_LC : BMP_TABLE_SC)));
- case IMG_FOLDER:
- // if not bBig, then return our new small folder image (256 colors)
- return Image(BitmapEx(SvtResId(bBig ? BMP_FOLDER_LC : RID_BMP_FOLDER)));
- case IMG_DXF:
- return Image(BitmapEx(SvtResId(bBig ? BMP_DXF_LC : BMP_DXF_SC)));
- case IMG_MET:
- return Image(BitmapEx(SvtResId(bBig ? BMP_MET_LC : BMP_MET_SC)));
- case IMG_PNG:
- return Image(BitmapEx(SvtResId(bBig ? BMP_PNG_LC : BMP_PNG_SC)));
- case IMG_SGF:
- return Image(BitmapEx(SvtResId(bBig ? BMP_SGF_LC : BMP_SGF_SC)));
- case IMG_SGV:
- return Image(BitmapEx(SvtResId(bBig ? BMP_SGV_LC : BMP_SGV_SC)));
- case IMG_SVM:
- return Image(BitmapEx(SvtResId(bBig ? BMP_SVM_LC : BMP_SVM_SC)));
- case IMG_GLOBAL_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_GLOBAL_DOC_LC : BMP_GLOBAL_DOC_SC)));
- case IMG_DRAW:
- return Image(BitmapEx(SvtResId(bBig ? BMP_DRAW_LC : BMP_DRAW_SC)));
- case IMG_DRAWTEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_DRAWTEMPLATE_LC : BMP_DRAWTEMPLATE_SC)));
- case IMG_TEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_TEMPLATE_LC : BMP_TEMPLATE_SC)));
- case IMG_OO_DATABASE_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_DATABASE_DOC_LC : BMP_OO_DATABASE_DOC_SC)));
- case IMG_OO_DRAW_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_DRAW_DOC_LC : BMP_OO_DRAW_DOC_SC)));
- case IMG_OO_MATH_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_MATH_DOC_LC : BMP_OO_MATH_DOC_SC)));
- case IMG_OO_GLOBAL_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_GLOBAL_DOC_LC : BMP_OO_GLOBAL_DOC_SC)));
- case IMG_OO_IMPRESS_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_IMPRESS_DOC_LC : BMP_OO_IMPRESS_DOC_SC)));
- case IMG_OO_CALC_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_CALC_DOC_LC : BMP_OO_CALC_DOC_SC)));
- case IMG_OO_WRITER_DOC:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_WRITER_DOC_LC : BMP_OO_WRITER_DOC_SC)));
- case IMG_OO_DRAW_TEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_DRAW_TEMPLATE_LC : BMP_OO_DRAW_TEMPLATE_SC)));
- case IMG_OO_IMPRESS_TEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_IMPRESS_TEMPLATE_LC : BMP_OO_IMPRESS_TEMPLATE_SC)));
- case IMG_OO_CALC_TEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_CALC_TEMPLATE_LC : BMP_OO_CALC_TEMPLATE_SC)));
- case IMG_OO_WRITER_TEMPLATE:
- return Image(BitmapEx(SvtResId(bBig ? BMP_OO_WRITER_TEMPLATE_LC : BMP_OO_WRITER_TEMPLATE_SC)));
- case IMG_EXTENSION:
- return Image(BitmapEx(SvtResId(bBig ? BMP_EXTENSION_LC : BMP_EXTENSION_SC)));
+ switch (nImageId)
+ {
+ case IMG_IMPRESS:
+ return Image(BitmapEx(BMP_IMPRESS_LC));
+ case IMG_BITMAP:
+ return Image(BitmapEx(BMP_BITMAP_LC));
+ case IMG_CALC:
+ return Image(BitmapEx(BMP_CALC_LC));
+ case IMG_CALCTEMPLATE:
+ return Image(BitmapEx(BMP_CALCTEMPLATE_LC));
+ case IMG_DATABASE:
+ return Image(BitmapEx(BMP_DATABASE_LC));
+ case IMG_IMPRESSTEMPLATE:
+ return Image(BitmapEx(BMP_IMPRESSTEMPLATE_LC));
+ case IMG_GIF:
+ return Image(BitmapEx(BMP_GIF_LC));
+ case IMG_HTML:
+ return Image(BitmapEx(BMP_HTML_LC));
+ case IMG_JPG:
+ return Image(BitmapEx(BMP_JPG_LC));
+ case IMG_MATH:
+ return Image(BitmapEx(BMP_MATH_LC));
+ case IMG_MATHTEMPLATE:
+ return Image(BitmapEx(BMP_MATHTEMPLATE_LC));
+ case IMG_FILE:
+ return Image(BitmapEx(BMP_FILE_LC));
+ case IMG_PCD:
+ return Image(BitmapEx(BMP_PCD_LC));
+ case IMG_PCT:
+ return Image(BitmapEx(BMP_PCT_LC));
+ case IMG_PCX:
+ return Image(BitmapEx(BMP_PCX_LC));
+ case IMG_SIM:
+ return Image(BitmapEx(BMP_SIM_LC));
+ case IMG_TEXTFILE:
+ return Image(BitmapEx(BMP_TEXTFILE_LC));
+ case IMG_TIFF:
+ return Image(BitmapEx(BMP_TIFF_LC));
+ case IMG_WMF:
+ return Image(BitmapEx(BMP_WMF_LC));
+ case IMG_WRITER:
+ return Image(BitmapEx(BMP_WRITER_LC));
+ case IMG_WRITERTEMPLATE:
+ return Image(BitmapEx(BMP_WRITERTEMPLATE_LC));
+ case IMG_FIXEDDEV:
+ return Image(BitmapEx(BMP_FIXEDDEV_LC));
+ case IMG_REMOVABLEDEV:
+ return Image(BitmapEx(BMP_REMOVABLEDEV_LC));
+ case IMG_CDROMDEV:
+ return Image(BitmapEx(BMP_CDROMDEV_LC));
+ case IMG_NETWORKDEV:
+ return Image(BitmapEx(BMP_NETWORKDEV_LC));
+ case IMG_TABLE:
+ return Image(BitmapEx(BMP_TABLE_LC));
+ case IMG_FOLDER:
+ return Image(BitmapEx(BMP_FOLDER_LC));
+ case IMG_DXF:
+ return Image(BitmapEx(BMP_DXF_LC));
+ case IMG_MET:
+ return Image(BitmapEx(BMP_MET_LC));
+ case IMG_PNG:
+ return Image(BitmapEx(BMP_PNG_LC));
+ case IMG_SGF:
+ return Image(BitmapEx(BMP_SGF_LC));
+ case IMG_SGV:
+ return Image(BitmapEx(BMP_SGV_LC));
+ case IMG_SVM:
+ return Image(BitmapEx(BMP_SVM_LC));
+ case IMG_GLOBAL_DOC:
+ return Image(BitmapEx(BMP_GLOBAL_DOC_LC));
+ case IMG_DRAW:
+ return Image(BitmapEx(BMP_DRAW_LC));
+ case IMG_DRAWTEMPLATE:
+ return Image(BitmapEx(BMP_DRAWTEMPLATE_LC));
+ case IMG_TEMPLATE:
+ return Image(BitmapEx(BMP_TEMPLATE_LC));
+ case IMG_OO_DATABASE_DOC:
+ return Image(BitmapEx(BMP_OO_DATABASE_DOC_LC));
+ case IMG_OO_DRAW_DOC:
+ return Image(BitmapEx(BMP_OO_DRAW_DOC_LC));
+ case IMG_OO_MATH_DOC:
+ return Image(BitmapEx(BMP_OO_MATH_DOC_LC));
+ case IMG_OO_GLOBAL_DOC:
+ return Image(BitmapEx(BMP_OO_GLOBAL_DOC_LC));
+ case IMG_OO_IMPRESS_DOC:
+ return Image(BitmapEx(BMP_OO_IMPRESS_DOC_LC));
+ case IMG_OO_CALC_DOC:
+ return Image(BitmapEx(BMP_OO_CALC_DOC_LC));
+ case IMG_OO_WRITER_DOC:
+ return Image(BitmapEx(BMP_OO_WRITER_DOC_LC));
+ case IMG_OO_DRAW_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_DRAW_TEMPLATE_LC));
+ case IMG_OO_IMPRESS_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_IMPRESS_TEMPLATE_LC));
+ case IMG_OO_CALC_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_CALC_TEMPLATE_LC));
+ case IMG_OO_WRITER_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_WRITER_TEMPLATE_LC));
+ case IMG_EXTENSION:
+ return Image(BitmapEx(BMP_EXTENSION_LC));
+ }
+ }
+ else
+ {
+ switch (nImageId)
+ {
+ case IMG_IMPRESS:
+ return Image(BitmapEx(BMP_IMPRESS_SC));
+ case IMG_BITMAP:
+ return Image(BitmapEx(BMP_BITMAP_SC));
+ case IMG_CALC:
+ return Image(BitmapEx(BMP_CALC_SC));
+ case IMG_CALCTEMPLATE:
+ return Image(BitmapEx(BMP_CALCTEMPLATE_SC));
+ case IMG_DATABASE:
+ return Image(BitmapEx(BMP_DATABASE_SC));
+ case IMG_IMPRESSTEMPLATE:
+ return Image(BitmapEx(BMP_IMPRESSTEMPLATE_SC));
+ case IMG_GIF:
+ return Image(BitmapEx(BMP_GIF_SC));
+ case IMG_HTML:
+ return Image(BitmapEx(BMP_HTML_SC));
+ case IMG_JPG:
+ return Image(BitmapEx(BMP_JPG_SC));
+ case IMG_MATH:
+ return Image(BitmapEx(BMP_MATH_SC));
+ case IMG_MATHTEMPLATE:
+ return Image(BitmapEx(BMP_MATHTEMPLATE_SC));
+ case IMG_FILE:
+ return Image(BitmapEx(BMP_FILE_SC));
+ case IMG_PCD:
+ return Image(BitmapEx(BMP_PCD_SC));
+ case IMG_PCT:
+ return Image(BitmapEx(BMP_PCT_SC));
+ case IMG_PCX:
+ return Image(BitmapEx(BMP_PCX_SC));
+ case IMG_SIM:
+ return Image(BitmapEx(BMP_SIM_SC));
+ case IMG_TEXTFILE:
+ return Image(BitmapEx(BMP_TEXTFILE_SC));
+ case IMG_TIFF:
+ return Image(BitmapEx(BMP_TIFF_SC));
+ case IMG_WMF:
+ return Image(BitmapEx(BMP_WMF_SC));
+ case IMG_WRITER:
+ return Image(BitmapEx(BMP_WRITER_SC));
+ case IMG_WRITERTEMPLATE:
+ return Image(BitmapEx(BMP_WRITERTEMPLATE_SC));
+ case IMG_FIXEDDEV:
+ return Image(BitmapEx(BMP_FIXEDDEV_SC));
+ case IMG_REMOVABLEDEV:
+ return Image(BitmapEx(BMP_REMOVABLEDEV_SC));
+ case IMG_CDROMDEV:
+ return Image(BitmapEx(BMP_CDROMDEV_SC));
+ case IMG_NETWORKDEV:
+ return Image(BitmapEx(BMP_NETWORKDEV_SC));
+ case IMG_TABLE:
+ return Image(BitmapEx(BMP_TABLE_SC));
+ case IMG_FOLDER:
+ // if not bBig, then return our new small folder image (256 colors)
+ return Image(BitmapEx(RID_BMP_FOLDER));
+ case IMG_DXF:
+ return Image(BitmapEx(BMP_DXF_SC));
+ case IMG_MET:
+ return Image(BitmapEx(BMP_MET_SC));
+ case IMG_PNG:
+ return Image(BitmapEx(BMP_PNG_SC));
+ case IMG_SGF:
+ return Image(BitmapEx(BMP_SGF_SC));
+ case IMG_SGV:
+ return Image(BitmapEx(BMP_SGV_SC));
+ case IMG_SVM:
+ return Image(BitmapEx(BMP_SVM_SC));
+ case IMG_GLOBAL_DOC:
+ return Image(BitmapEx(BMP_GLOBAL_DOC_SC));
+ case IMG_DRAW:
+ return Image(BitmapEx(BMP_DRAW_SC));
+ case IMG_DRAWTEMPLATE:
+ return Image(BitmapEx(BMP_DRAWTEMPLATE_SC));
+ case IMG_TEMPLATE:
+ return Image(BitmapEx(BMP_TEMPLATE_SC));
+ case IMG_OO_DATABASE_DOC:
+ return Image(BitmapEx(BMP_OO_DATABASE_DOC_SC));
+ case IMG_OO_DRAW_DOC:
+ return Image(BitmapEx(BMP_OO_DRAW_DOC_SC));
+ case IMG_OO_MATH_DOC:
+ return Image(BitmapEx(BMP_OO_MATH_DOC_SC));
+ case IMG_OO_GLOBAL_DOC:
+ return Image(BitmapEx(BMP_OO_GLOBAL_DOC_SC));
+ case IMG_OO_IMPRESS_DOC:
+ return Image(BitmapEx(BMP_OO_IMPRESS_DOC_SC));
+ case IMG_OO_CALC_DOC:
+ return Image(BitmapEx(BMP_OO_CALC_DOC_SC));
+ case IMG_OO_WRITER_DOC:
+ return Image(BitmapEx(BMP_OO_WRITER_DOC_SC));
+ case IMG_OO_DRAW_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_DRAW_TEMPLATE_SC));
+ case IMG_OO_IMPRESS_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_IMPRESS_TEMPLATE_SC));
+ case IMG_OO_CALC_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_CALC_TEMPLATE_SC));
+ case IMG_OO_WRITER_TEMPLATE:
+ return Image(BitmapEx(BMP_OO_WRITER_TEMPLATE_SC));
+ case IMG_EXTENSION:
+ return Image(BitmapEx(BMP_EXTENSION_SC));
+ }
}
return Image();
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 778221b3c7d4..aeed4a10cd93 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -20,498 +20,6 @@
#include <svtools/svtools.hrc>
#include "imagemgr.hrc"
- // images ********************************************************************
-
-Bitmap BMP_IMPRESS_SC
-{
- File = "sx03123.png";
-};
-
-Bitmap BMP_BITMAP_SC
-{
- File = "sx03125.png";
-};
-
-Bitmap BMP_CALC_SC
-{
- File = "sx03126.png";
-};
-
-Bitmap BMP_CALCTEMPLATE_SC
-{
- File = "sx03127.png";
-};
-
-Bitmap BMP_DATABASE_SC
-{
- File = "sx03129.png";
-};
-
-Bitmap BMP_IMPRESSTEMPLATE_SC
-{
- File = "sx03130.png";
-};
-
-Bitmap BMP_GIF_SC
-{
- File = "sx03137.png";
-};
-
-Bitmap BMP_HTML_SC
-{
- File = "sx03139.png";
-};
-
-Bitmap BMP_JPG_SC
-{
- File = "sx03140.png";
-};
-
-Bitmap BMP_MATH_SC
-{
- File = "sx03144.png";
-};
-
-Bitmap BMP_MATHTEMPLATE_SC
-{
- File = "sx03145.png";
-};
-
-Bitmap BMP_FILE_SC
-{
- File = "sx03150.png";
-};
-
-Bitmap BMP_PCD_SC
-{
- File = "sx03152.png";
-};
-
-Bitmap BMP_PCT_SC
-{
- File = "sx03153.png";
-};
-
-Bitmap BMP_PCX_SC
-{
- File = "sx03154.png";
-};
-
-Bitmap BMP_SIM_SC
-{
- File = "sx03155.png";
-};
-
-Bitmap BMP_TEXTFILE_SC
-{
- File = "sx03156.png";
-};
-
-Bitmap BMP_TIFF_SC
-{
- File = "sx03158.png";
-};
-
-Bitmap BMP_WMF_SC
-{
- File = "sx03160.png";
-};
-
-Bitmap BMP_WRITER_SC
-{
- File = "sx03162.png";
-};
-
-Bitmap BMP_WRITERTEMPLATE_SC
-{
- File = "sx03163.png";
-};
-
-Bitmap BMP_FIXEDDEV_SC
-{
- File = "sx03164.png";
-};
-
-Bitmap BMP_REMOVABLEDEV_SC
-{
- File = "sx03165.png";
-};
-
-Bitmap BMP_CDROMDEV_SC
-{
- File = "sx03166.png";
-};
-
-Bitmap BMP_NETWORKDEV_SC
-{
- File = "sx03167.png";
-};
-
-Bitmap BMP_TABLE_SC
-{
- File = "sx03188.png";
-};
-
-Bitmap BMP_DXF_SC
-{
- File = "sx03217.png";
-};
-
-Bitmap BMP_MET_SC
-{
- File = "sx03218.png";
-};
-
-Bitmap BMP_PNG_SC
-{
- File = "sx03219.png";
-};
-
-Bitmap BMP_SGF_SC
-{
- File = "sx03220.png";
-};
-
-Bitmap BMP_SGV_SC
-{
- File = "sx03221.png";
-};
-
-Bitmap BMP_SVM_SC
-{
- File = "sx03222.png";
-};
-
-Bitmap BMP_GLOBAL_DOC_SC
-{
- File = "sx03226.png";
-};
-
-Bitmap BMP_DRAW_SC
-{
- File = "sx03227.png";
-};
-
-Bitmap BMP_DRAWTEMPLATE_SC
-{
- File = "sx03228.png";
-};
-
-Bitmap BMP_TEMPLATE_SC
-{
- File = "sx03242.png";
-};
-
-Bitmap BMP_OO_DATABASE_DOC_SC
-{
- File = "sx03245.png";
-};
-
-Bitmap BMP_OO_DRAW_DOC_SC
-{
- File = "sx03246.png";
-};
-
-Bitmap BMP_OO_MATH_DOC_SC
-{
- File = "sx03247.png";
-};
-
-Bitmap BMP_OO_GLOBAL_DOC_SC
-{
- File = "sx03248.png";
-};
-
-Bitmap BMP_OO_IMPRESS_DOC_SC
-{
- File = "sx03249.png";
-};
-
-Bitmap BMP_OO_CALC_DOC_SC
-{
- File = "sx03250.png";
-};
-
-Bitmap BMP_OO_WRITER_DOC_SC
-{
- File = "sx03251.png";
-};
-
-Bitmap BMP_OO_DRAW_TEMPLATE_SC
-{
- File = "sx03252.png";
-};
-
-Bitmap BMP_OO_IMPRESS_TEMPLATE_SC
-{
- File = "sx03253.png";
-};
-
-Bitmap BMP_OO_CALC_TEMPLATE_SC
-{
- File = "sx03254.png";
-};
-
-Bitmap BMP_OO_WRITER_TEMPLATE_SC
-{
- File = "sx03255.png";
-};
-
-Bitmap BMP_EXTENSION_SC
-{
- File = "sx03256.png";
-};
-
-Bitmap BMP_IMPRESS_LC
-{
- File = "lx03123.png";
-};
-
-Bitmap BMP_BITMAP_LC
-{
- File = "lx03125.png";
-};
-
-Bitmap BMP_CALC_LC
-{
- File = "lx03126.png";
-};
-
-Bitmap BMP_CALCTEMPLATE_LC
-{
- File = "lx03127.png";
-};
-
-Bitmap BMP_DATABASE_LC
-{
- File = "lx03129.png";
-};
-
-Bitmap BMP_IMPRESSTEMPLATE_LC
-{
- File = "lx03130.png";
-};
-
-Bitmap BMP_GIF_LC
-{
- File = "lx03137.png";
-};
-
-Bitmap BMP_HTML_LC
-{
- File = "lx03139.png";
-};
-
-Bitmap BMP_JPG_LC
-{
- File = "lx03140.png";
-};
-
-Bitmap BMP_MATH_LC
-{
- File = "lx03144.png";
-};
-
-Bitmap BMP_MATHTEMPLATE_LC
-{
- File = "lx03145.png";
-};
-
-Bitmap BMP_FILE_LC
-{
- File = "lx03150.png";
-};
-
-Bitmap BMP_PCD_LC
-{
- File = "lx03152.png";
-};
-
-Bitmap BMP_PCT_LC
-{
- File = "lx03153.png";
-};
-
-Bitmap BMP_PCX_LC
-{
- File = "lx03154.png";
-};
-
-Bitmap BMP_SIM_LC
-{
- File = "lx03155.png";
-};
-
-Bitmap BMP_TEXTFILE_LC
-{
- File = "lx03156.png";
-};
-
-Bitmap BMP_TIFF_LC
-{
- File = "lx03158.png";
-};
-
-Bitmap BMP_WMF_LC
-{
- File = "lx03160.png";
-};
-
-Bitmap BMP_WRITER_LC
-{
- File = "lx03162.png";
-};
-
-Bitmap BMP_WRITERTEMPLATE_LC
-{
- File = "lx03163.png";
-};
-
-Bitmap BMP_FIXEDDEV_LC
-{
- File = "lx03164.png";
-};
-
-Bitmap BMP_REMOVABLEDEV_LC
-{
- File = "lx03165.png";
-};
-
-Bitmap BMP_CDROMDEV_LC
-{
- File = "lx03166.png";
-};
-
-Bitmap BMP_NETWORKDEV_LC
-{
- File = "lx03167.png";
-};
-
-Bitmap BMP_TABLE_LC
-{
- File = "lx03188.png";
-};
-
-Bitmap BMP_FOLDER_LC
-{
- File = "lx03189.png";
-};
-
-Bitmap BMP_DXF_LC
-{
- File = "lx03217.png";
-};
-
-Bitmap BMP_MET_LC
-{
- File = "lx03218.png";
-};
-
-Bitmap BMP_PNG_LC
-{
- File = "lx03219.png";
-};
-
-Bitmap BMP_SGF_LC
-{
- File = "lx03220.png";
-};
-
-Bitmap BMP_SGV_LC
-{
- File = "lx03221.png";
-};
-
-Bitmap BMP_SVM_LC
-{
- File = "lx03222.png";
-};
-
-Bitmap BMP_GLOBAL_DOC_LC
-{
- File = "lx03226.png";
-};
-
-Bitmap BMP_DRAW_LC
-{
- File = "lx03227.png";
-};
-
-Bitmap BMP_DRAWTEMPLATE_LC
-{
- File = "lx03228.png";
-};
-
-Bitmap BMP_TEMPLATE_LC
-{
- File = "lx03242.png";
-};
-
-Bitmap BMP_OO_DATABASE_DOC_LC
-{
- File = "lx03245.png";
-};
-
-Bitmap BMP_OO_DRAW_DOC_LC
-{
- File = "lx03246.png";
-};
-
-Bitmap BMP_OO_MATH_DOC_LC
-{
- File = "lx03247.png";
-};
-
-Bitmap BMP_OO_GLOBAL_DOC_LC
-{
- File = "lx03248.png";
-};
-
-Bitmap BMP_OO_IMPRESS_DOC_LC
-{
- File = "lx03249.png";
-};
-
-Bitmap BMP_OO_CALC_DOC_LC
-{
- File = "lx03250.png";
-};
-
-Bitmap BMP_OO_WRITER_DOC_LC
-{
- File = "lx03251.png";
-};
-
-Bitmap BMP_OO_DRAW_TEMPLATE_LC
-{
- File = "lx03252.png";
-};
-
-Bitmap BMP_OO_IMPRESS_TEMPLATE_LC
-{
- File = "lx03253.png";
-};
-
-Bitmap BMP_OO_CALC_TEMPLATE_LC
-{
- File = "lx03254.png";
-};
-
-Bitmap BMP_OO_WRITER_TEMPLATE_LC
-{
- File = "lx03255.png";
-};
-
-Bitmap BMP_EXTENSION_LC
-{
- File = "lx03256.png";
-};
-
-Bitmap BMP_PLUGIN
-{
- File = "plugin.png" ;
-};
-
// description strings
String STR_DESCRIPTION_SOURCEFILE
More information about the Libreoffice-commits
mailing list