[Libreoffice-commits] .: 3 commits - default_images/res ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_images/tango svtools/source vcl/inc vcl/source
Noel Power
noelp at kemper.freedesktop.org
Tue Nov 15 09:15:05 PST 2011
dev/null |binary
svtools/source/misc/imagemgr.src | 3 -
vcl/inc/svids.hrc | 3 -
vcl/source/src/images.src | 75 ---------------------------------------
4 files changed, 81 deletions(-)
New commits:
commit 240dc332ad59fc2c45eccb4b2f4923fde09a784b
Author: Noel Power <noel.power at novell.com>
Date: Tue Nov 15 17:13:38 2011 +0000
fix build error, remove still referenced (indirectly ) images
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 62104ea..d1d25c8 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -35,7 +35,6 @@
IMG_IMPRESS ; \
IMG_CALC ; \
IMG_CALCTEMPLATE ; \
- IMG_CHART ; \
IMG_IMPRESSTEMPLATE ; \
IMG_HTML ; \
IMG_MATH ; \
@@ -51,7 +50,6 @@
IMG_CALC ; \
IMG_CALCTEMPLATE ; \
IMG_CDROMDEV ; \
- IMG_CHART ; \
IMG_DATABASE ; \
IMG_DRAW ; \
IMG_DRAWTEMPLATE ; \
@@ -74,7 +72,6 @@
IMG_OO_CALC_TEMPLATE ; \
IMG_OO_DATABASE_DOC ; \
IMG_OO_DRAW_DOC ; \
- IMG_OO_DRAW_TEMPLATE ; \
IMG_OO_GLOBAL_DOC ; \
IMG_OO_IMPRESS_DOC ; \
IMG_OO_IMPRESS_TEMPLATE ; \
commit 0d56c77726be9d9c23a87ae214d989a7bf2e2ddf
Author: Noel Power <noel.power at novell.com>
Date: Tue Nov 15 11:24:04 2011 +0000
remove unused SV_ICON_ID_HTML_DOCUMENT entries
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 51a0791..f0dce63 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -259,7 +259,6 @@
#define SV_ICON_ID_PRESENTATION_TEMPLATE 9
#define SV_ICON_ID_PRESENTATION_COMPRESSED 10
#define SV_ICON_ID_MASTER_DOCUMENT 11
-#define SV_ICON_ID_HTML_DOCUMENT 12
#define SV_ICON_ID_DATABASE 14
#define SV_ICON_ID_FORMULA 15
#define SV_ICON_ID_TEMPLATE 16
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index d99f9f9..5f6dace 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -264,21 +264,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT)
File = "odm_16_8.png" ;
};
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_HTML_DOCUMENT)
-{
- File = "oth_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_HTML_DOCUMENT)
-{
- File = "oth_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_HTML_DOCUMENT)
-{
- File = "oth_16_8.png" ;
-};
-
Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
{
File = "odb_48_8.png" ;
@@ -467,16 +452,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MASTER_DOCUMENT)
File = "sx03248.png" ;
};
-Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_HTML_DOCUMENT)
-{
- File = "lx03139.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT)
-{
- File = "sx03139.png" ;
-};
-
Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE)
{
File = "lx03245.png" ;
commit e0e7c5dc46ac8fd0c7f6fdc0ceb62d15cafd3754
Author: Julien Chaffraix <julien.chaffraix at gmail.com>
Date: Mon Nov 14 07:23:08 2011 -0800
FDO#42454 - EasyHack: remove code associated with unused icons
Removed the icons and code associated with:
SV_ICON_ID_CHART
SV_ICON_ID_DRAWING_TEMPLATE
diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png
deleted file mode 100644
index 309e882..0000000
Binary files a/default_images/res/lx03128.png and /dev/null differ
diff --git a/default_images/res/lx03252.png b/default_images/res/lx03252.png
deleted file mode 100644
index 3bd7387..0000000
Binary files a/default_images/res/lx03252.png and /dev/null differ
diff --git a/default_images/res/otg_16_8.png b/default_images/res/otg_16_8.png
deleted file mode 100644
index 4bb2bfe..0000000
Binary files a/default_images/res/otg_16_8.png and /dev/null differ
diff --git a/default_images/res/otg_32_8.png b/default_images/res/otg_32_8.png
deleted file mode 100644
index b3c0823..0000000
Binary files a/default_images/res/otg_32_8.png and /dev/null differ
diff --git a/default_images/res/otg_48_8.png b/default_images/res/otg_48_8.png
deleted file mode 100644
index 7544b6f..0000000
Binary files a/default_images/res/otg_48_8.png and /dev/null differ
diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png
deleted file mode 100644
index a24df73..0000000
Binary files a/default_images/res/sx03128.png and /dev/null differ
diff --git a/default_images/res/sx03252.png b/default_images/res/sx03252.png
deleted file mode 100644
index 456b810..0000000
Binary files a/default_images/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/crystal/res/lx03139.png b/ooo_custom_images/crystal/res/lx03139.png
deleted file mode 100644
index 4113176..0000000
Binary files a/ooo_custom_images/crystal/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/crystal/res/sx03139.png b/ooo_custom_images/crystal/res/sx03139.png
deleted file mode 100644
index e746e6b..0000000
Binary files a/ooo_custom_images/crystal/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/lx03128.png b/ooo_custom_images/hicontrast/res/lx03128.png
deleted file mode 100644
index d03948b..0000000
Binary files a/ooo_custom_images/hicontrast/res/lx03128.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/lx03139.png b/ooo_custom_images/hicontrast/res/lx03139.png
deleted file mode 100644
index 5985c29..0000000
Binary files a/ooo_custom_images/hicontrast/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/lx03252.png b/ooo_custom_images/hicontrast/res/lx03252.png
deleted file mode 100644
index ec4b821..0000000
Binary files a/ooo_custom_images/hicontrast/res/lx03252.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/sx03128.png b/ooo_custom_images/hicontrast/res/sx03128.png
deleted file mode 100644
index 39a721f..0000000
Binary files a/ooo_custom_images/hicontrast/res/sx03128.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/sx03139.png b/ooo_custom_images/hicontrast/res/sx03139.png
deleted file mode 100644
index c55858e..0000000
Binary files a/ooo_custom_images/hicontrast/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/res/sx03252.png b/ooo_custom_images/hicontrast/res/sx03252.png
deleted file mode 100644
index 45c79c4..0000000
Binary files a/ooo_custom_images/hicontrast/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/lx03128.png b/ooo_custom_images/human/res/lx03128.png
deleted file mode 100644
index ac441a1..0000000
Binary files a/ooo_custom_images/human/res/lx03128.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/lx03139.png b/ooo_custom_images/human/res/lx03139.png
deleted file mode 100644
index 9514dd5..0000000
Binary files a/ooo_custom_images/human/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/lx03252.png b/ooo_custom_images/human/res/lx03252.png
deleted file mode 100644
index c3c5897..0000000
Binary files a/ooo_custom_images/human/res/lx03252.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/sx03128.png b/ooo_custom_images/human/res/sx03128.png
deleted file mode 100644
index 4ec8db8..0000000
Binary files a/ooo_custom_images/human/res/sx03128.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/sx03139.png b/ooo_custom_images/human/res/sx03139.png
deleted file mode 100644
index 3df32b0..0000000
Binary files a/ooo_custom_images/human/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/human/res/sx03252.png b/ooo_custom_images/human/res/sx03252.png
deleted file mode 100644
index d2299e1..0000000
Binary files a/ooo_custom_images/human/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/lx03128.png b/ooo_custom_images/industrial/res/lx03128.png
deleted file mode 100644
index 7692cd0..0000000
Binary files a/ooo_custom_images/industrial/res/lx03128.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/lx03139.png b/ooo_custom_images/industrial/res/lx03139.png
deleted file mode 100644
index 537a987..0000000
Binary files a/ooo_custom_images/industrial/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/lx03252.png b/ooo_custom_images/industrial/res/lx03252.png
deleted file mode 100644
index 8824d12..0000000
Binary files a/ooo_custom_images/industrial/res/lx03252.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/sx03128.png b/ooo_custom_images/industrial/res/sx03128.png
deleted file mode 100644
index b9c7e2a..0000000
Binary files a/ooo_custom_images/industrial/res/sx03128.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/sx03139.png b/ooo_custom_images/industrial/res/sx03139.png
deleted file mode 100644
index 278e0dd..0000000
Binary files a/ooo_custom_images/industrial/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/res/sx03252.png b/ooo_custom_images/industrial/res/sx03252.png
deleted file mode 100644
index 50d1d89..0000000
Binary files a/ooo_custom_images/industrial/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/lx03128.png b/ooo_custom_images/oxygen/res/lx03128.png
deleted file mode 100644
index 7e3f038..0000000
Binary files a/ooo_custom_images/oxygen/res/lx03128.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/lx03139.png b/ooo_custom_images/oxygen/res/lx03139.png
deleted file mode 100644
index 6e0a8ce..0000000
Binary files a/ooo_custom_images/oxygen/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/lx03252.png b/ooo_custom_images/oxygen/res/lx03252.png
deleted file mode 100644
index cb658f9..0000000
Binary files a/ooo_custom_images/oxygen/res/lx03252.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/otg_16_8.png b/ooo_custom_images/oxygen/res/otg_16_8.png
deleted file mode 100644
index 0f14ed0..0000000
Binary files a/ooo_custom_images/oxygen/res/otg_16_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/otg_32_8.png b/ooo_custom_images/oxygen/res/otg_32_8.png
deleted file mode 100644
index dd4d72b..0000000
Binary files a/ooo_custom_images/oxygen/res/otg_32_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/otg_48_8.png b/ooo_custom_images/oxygen/res/otg_48_8.png
deleted file mode 100644
index 773d52c..0000000
Binary files a/ooo_custom_images/oxygen/res/otg_48_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/oth_16_8.png b/ooo_custom_images/oxygen/res/oth_16_8.png
deleted file mode 100644
index 432c2db..0000000
Binary files a/ooo_custom_images/oxygen/res/oth_16_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/oth_32_8.png b/ooo_custom_images/oxygen/res/oth_32_8.png
deleted file mode 100644
index 9bae937..0000000
Binary files a/ooo_custom_images/oxygen/res/oth_32_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/oth_48_8.png b/ooo_custom_images/oxygen/res/oth_48_8.png
deleted file mode 100644
index 55d78c9..0000000
Binary files a/ooo_custom_images/oxygen/res/oth_48_8.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/sx03128.png b/ooo_custom_images/oxygen/res/sx03128.png
deleted file mode 100644
index ec6c437..0000000
Binary files a/ooo_custom_images/oxygen/res/sx03128.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/sx03139.png b/ooo_custom_images/oxygen/res/sx03139.png
deleted file mode 100644
index d2466e0..0000000
Binary files a/ooo_custom_images/oxygen/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/res/sx03252.png b/ooo_custom_images/oxygen/res/sx03252.png
deleted file mode 100644
index 95eebf0..0000000
Binary files a/ooo_custom_images/oxygen/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/lx03128.png b/ooo_custom_images/tango/res/lx03128.png
deleted file mode 100644
index 309e882..0000000
Binary files a/ooo_custom_images/tango/res/lx03128.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/lx03139.png b/ooo_custom_images/tango/res/lx03139.png
deleted file mode 100644
index c08fd88..0000000
Binary files a/ooo_custom_images/tango/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/lx03252.png b/ooo_custom_images/tango/res/lx03252.png
deleted file mode 100644
index 3bd7387..0000000
Binary files a/ooo_custom_images/tango/res/lx03252.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/sx03128.png b/ooo_custom_images/tango/res/sx03128.png
deleted file mode 100644
index a24df73..0000000
Binary files a/ooo_custom_images/tango/res/sx03128.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/sx03139.png b/ooo_custom_images/tango/res/sx03139.png
deleted file mode 100644
index 16bf02e..0000000
Binary files a/ooo_custom_images/tango/res/sx03139.png and /dev/null differ
diff --git a/ooo_custom_images/tango/res/sx03252.png b/ooo_custom_images/tango/res/sx03252.png
deleted file mode 100644
index 456b810..0000000
Binary files a/ooo_custom_images/tango/res/sx03252.png and /dev/null differ
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index dc16ab1..51a0791 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -255,13 +255,11 @@
#define SV_ICON_ID_SPREADSHEET 4
#define SV_ICON_ID_SPREADSHEET_TEMPLATE 5
#define SV_ICON_ID_DRAWING 6
-#define SV_ICON_ID_DRAWING_TEMPLATE 7
#define SV_ICON_ID_PRESENTATION 8
#define SV_ICON_ID_PRESENTATION_TEMPLATE 9
#define SV_ICON_ID_PRESENTATION_COMPRESSED 10
#define SV_ICON_ID_MASTER_DOCUMENT 11
#define SV_ICON_ID_HTML_DOCUMENT 12
-#define SV_ICON_ID_CHART 13
#define SV_ICON_ID_DATABASE 14
#define SV_ICON_ID_FORMULA 15
#define SV_ICON_ID_TEMPLATE 16
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index f836306..d99f9f9 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -204,21 +204,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DRAWING)
File = "odg_16_8.png" ;
};
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
- File = "otg_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
- File = "otg_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
- File = "otg_16_8.png" ;
-};
-
Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRESENTATION)
{
File = "odp_48_8.png" ;
@@ -294,21 +279,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_HTML_DOCUMENT)
File = "oth_16_8.png" ;
};
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_CHART)
-{
- File = "mainapp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_CHART)
-{
- File = "mainapp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_CHART)
-{
- File = "mainapp_16_8.png" ;
-};
-
Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
{
File = "odb_48_8.png" ;
@@ -457,16 +427,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING)
File = "sx03246.png" ;
};
-Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
- File = "lx03252.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
- File = "sx03252.png" ;
-};
-
Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION)
{
File = "lx03249.png" ;
@@ -517,16 +477,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT)
File = "sx03139.png" ;
};
-Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_CHART)
-{
- File = "lx03128.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_CHART)
-{
- File = "sx03128.png" ;
-};
-
Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE)
{
File = "lx03245.png" ;
More information about the Libreoffice-commits
mailing list