[Libreoffice-commits] .: 2 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 vcl/inc vcl/source

Noel Power noelp at kemper.freedesktop.org
Tue Nov 15 04:42:04 PST 2011


 default_images/res/lx03128.png               |binary
 default_images/res/lx03252.png               |binary
 default_images/res/otg_16_8.png              |binary
 default_images/res/otg_32_8.png              |binary
 default_images/res/otg_48_8.png              |binary
 default_images/res/sx03128.png               |binary
 default_images/res/sx03252.png               |binary
 ooo_custom_images/crystal/res/lx03139.png    |binary
 ooo_custom_images/crystal/res/sx03139.png    |binary
 ooo_custom_images/hicontrast/res/lx03128.png |binary
 ooo_custom_images/hicontrast/res/lx03139.png |binary
 ooo_custom_images/hicontrast/res/lx03252.png |binary
 ooo_custom_images/hicontrast/res/sx03128.png |binary
 ooo_custom_images/hicontrast/res/sx03139.png |binary
 ooo_custom_images/hicontrast/res/sx03252.png |binary
 ooo_custom_images/human/res/lx03128.png      |binary
 ooo_custom_images/human/res/lx03139.png      |binary
 ooo_custom_images/human/res/lx03252.png      |binary
 ooo_custom_images/human/res/sx03128.png      |binary
 ooo_custom_images/human/res/sx03139.png      |binary
 ooo_custom_images/human/res/sx03252.png      |binary
 ooo_custom_images/industrial/res/lx03128.png |binary
 ooo_custom_images/industrial/res/lx03139.png |binary
 ooo_custom_images/industrial/res/lx03252.png |binary
 ooo_custom_images/industrial/res/sx03128.png |binary
 ooo_custom_images/industrial/res/sx03139.png |binary
 ooo_custom_images/industrial/res/sx03252.png |binary
 ooo_custom_images/oxygen/res/lx03128.png     |binary
 ooo_custom_images/oxygen/res/lx03139.png     |binary
 ooo_custom_images/oxygen/res/lx03252.png     |binary
 ooo_custom_images/oxygen/res/otg_16_8.png    |binary
 ooo_custom_images/oxygen/res/otg_32_8.png    |binary
 ooo_custom_images/oxygen/res/otg_48_8.png    |binary
 ooo_custom_images/oxygen/res/oth_16_8.png    |binary
 ooo_custom_images/oxygen/res/oth_32_8.png    |binary
 ooo_custom_images/oxygen/res/oth_48_8.png    |binary
 ooo_custom_images/oxygen/res/sx03128.png     |binary
 ooo_custom_images/oxygen/res/sx03139.png     |binary
 ooo_custom_images/oxygen/res/sx03252.png     |binary
 ooo_custom_images/tango/res/lx03128.png      |binary
 ooo_custom_images/tango/res/lx03139.png      |binary
 ooo_custom_images/tango/res/lx03252.png      |binary
 ooo_custom_images/tango/res/sx03128.png      |binary
 ooo_custom_images/tango/res/sx03139.png      |binary
 ooo_custom_images/tango/res/sx03252.png      |binary
 vcl/inc/svids.hrc                            |    3 +
 vcl/source/src/images.src                    |   75 +++++++++++++++++++++++++++
 47 files changed, 78 insertions(+)

New commits:
commit a1cc4e507cb6547d7715be09bff29366424c09fe
Author: Noel Power <noel.power at novell.com>
Date:   Tue Nov 15 12:41:57 2011 +0000

    Revert "FDO#42454 - EasyHack: remove code associated with unused icons"
    
    This reverts commit 3e26dfcc2d347f4e0914449ca8104c8969fc6281.

diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png
new file mode 100644
index 0000000..309e882
Binary files /dev/null and b/default_images/res/lx03128.png differ
diff --git a/default_images/res/lx03252.png b/default_images/res/lx03252.png
new file mode 100644
index 0000000..3bd7387
Binary files /dev/null and b/default_images/res/lx03252.png differ
diff --git a/default_images/res/otg_16_8.png b/default_images/res/otg_16_8.png
new file mode 100644
index 0000000..4bb2bfe
Binary files /dev/null and b/default_images/res/otg_16_8.png differ
diff --git a/default_images/res/otg_32_8.png b/default_images/res/otg_32_8.png
new file mode 100644
index 0000000..b3c0823
Binary files /dev/null and b/default_images/res/otg_32_8.png differ
diff --git a/default_images/res/otg_48_8.png b/default_images/res/otg_48_8.png
new file mode 100644
index 0000000..7544b6f
Binary files /dev/null and b/default_images/res/otg_48_8.png differ
diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png
new file mode 100644
index 0000000..a24df73
Binary files /dev/null and b/default_images/res/sx03128.png differ
diff --git a/default_images/res/sx03252.png b/default_images/res/sx03252.png
new file mode 100644
index 0000000..456b810
Binary files /dev/null and b/default_images/res/sx03252.png differ
diff --git a/ooo_custom_images/crystal/res/lx03139.png b/ooo_custom_images/crystal/res/lx03139.png
new file mode 100644
index 0000000..4113176
Binary files /dev/null and b/ooo_custom_images/crystal/res/lx03139.png differ
diff --git a/ooo_custom_images/crystal/res/sx03139.png b/ooo_custom_images/crystal/res/sx03139.png
new file mode 100644
index 0000000..e746e6b
Binary files /dev/null and b/ooo_custom_images/crystal/res/sx03139.png differ
diff --git a/ooo_custom_images/hicontrast/res/lx03128.png b/ooo_custom_images/hicontrast/res/lx03128.png
new file mode 100644
index 0000000..d03948b
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/lx03128.png differ
diff --git a/ooo_custom_images/hicontrast/res/lx03139.png b/ooo_custom_images/hicontrast/res/lx03139.png
new file mode 100644
index 0000000..5985c29
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/lx03139.png differ
diff --git a/ooo_custom_images/hicontrast/res/lx03252.png b/ooo_custom_images/hicontrast/res/lx03252.png
new file mode 100644
index 0000000..ec4b821
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/lx03252.png differ
diff --git a/ooo_custom_images/hicontrast/res/sx03128.png b/ooo_custom_images/hicontrast/res/sx03128.png
new file mode 100644
index 0000000..39a721f
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/sx03128.png differ
diff --git a/ooo_custom_images/hicontrast/res/sx03139.png b/ooo_custom_images/hicontrast/res/sx03139.png
new file mode 100644
index 0000000..c55858e
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/sx03139.png differ
diff --git a/ooo_custom_images/hicontrast/res/sx03252.png b/ooo_custom_images/hicontrast/res/sx03252.png
new file mode 100644
index 0000000..45c79c4
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/sx03252.png differ
diff --git a/ooo_custom_images/human/res/lx03128.png b/ooo_custom_images/human/res/lx03128.png
new file mode 100644
index 0000000..ac441a1
Binary files /dev/null and b/ooo_custom_images/human/res/lx03128.png differ
diff --git a/ooo_custom_images/human/res/lx03139.png b/ooo_custom_images/human/res/lx03139.png
new file mode 100644
index 0000000..9514dd5
Binary files /dev/null and b/ooo_custom_images/human/res/lx03139.png differ
diff --git a/ooo_custom_images/human/res/lx03252.png b/ooo_custom_images/human/res/lx03252.png
new file mode 100644
index 0000000..c3c5897
Binary files /dev/null and b/ooo_custom_images/human/res/lx03252.png differ
diff --git a/ooo_custom_images/human/res/sx03128.png b/ooo_custom_images/human/res/sx03128.png
new file mode 100644
index 0000000..4ec8db8
Binary files /dev/null and b/ooo_custom_images/human/res/sx03128.png differ
diff --git a/ooo_custom_images/human/res/sx03139.png b/ooo_custom_images/human/res/sx03139.png
new file mode 100644
index 0000000..3df32b0
Binary files /dev/null and b/ooo_custom_images/human/res/sx03139.png differ
diff --git a/ooo_custom_images/human/res/sx03252.png b/ooo_custom_images/human/res/sx03252.png
new file mode 100644
index 0000000..d2299e1
Binary files /dev/null and b/ooo_custom_images/human/res/sx03252.png differ
diff --git a/ooo_custom_images/industrial/res/lx03128.png b/ooo_custom_images/industrial/res/lx03128.png
new file mode 100644
index 0000000..7692cd0
Binary files /dev/null and b/ooo_custom_images/industrial/res/lx03128.png differ
diff --git a/ooo_custom_images/industrial/res/lx03139.png b/ooo_custom_images/industrial/res/lx03139.png
new file mode 100644
index 0000000..537a987
Binary files /dev/null and b/ooo_custom_images/industrial/res/lx03139.png differ
diff --git a/ooo_custom_images/industrial/res/lx03252.png b/ooo_custom_images/industrial/res/lx03252.png
new file mode 100644
index 0000000..8824d12
Binary files /dev/null and b/ooo_custom_images/industrial/res/lx03252.png differ
diff --git a/ooo_custom_images/industrial/res/sx03128.png b/ooo_custom_images/industrial/res/sx03128.png
new file mode 100644
index 0000000..b9c7e2a
Binary files /dev/null and b/ooo_custom_images/industrial/res/sx03128.png differ
diff --git a/ooo_custom_images/industrial/res/sx03139.png b/ooo_custom_images/industrial/res/sx03139.png
new file mode 100644
index 0000000..278e0dd
Binary files /dev/null and b/ooo_custom_images/industrial/res/sx03139.png differ
diff --git a/ooo_custom_images/industrial/res/sx03252.png b/ooo_custom_images/industrial/res/sx03252.png
new file mode 100644
index 0000000..50d1d89
Binary files /dev/null and b/ooo_custom_images/industrial/res/sx03252.png differ
diff --git a/ooo_custom_images/oxygen/res/lx03128.png b/ooo_custom_images/oxygen/res/lx03128.png
new file mode 100644
index 0000000..7e3f038
Binary files /dev/null and b/ooo_custom_images/oxygen/res/lx03128.png differ
diff --git a/ooo_custom_images/oxygen/res/lx03139.png b/ooo_custom_images/oxygen/res/lx03139.png
new file mode 100644
index 0000000..6e0a8ce
Binary files /dev/null and b/ooo_custom_images/oxygen/res/lx03139.png differ
diff --git a/ooo_custom_images/oxygen/res/lx03252.png b/ooo_custom_images/oxygen/res/lx03252.png
new file mode 100644
index 0000000..cb658f9
Binary files /dev/null and b/ooo_custom_images/oxygen/res/lx03252.png differ
diff --git a/ooo_custom_images/oxygen/res/otg_16_8.png b/ooo_custom_images/oxygen/res/otg_16_8.png
new file mode 100644
index 0000000..0f14ed0
Binary files /dev/null and b/ooo_custom_images/oxygen/res/otg_16_8.png differ
diff --git a/ooo_custom_images/oxygen/res/otg_32_8.png b/ooo_custom_images/oxygen/res/otg_32_8.png
new file mode 100644
index 0000000..dd4d72b
Binary files /dev/null and b/ooo_custom_images/oxygen/res/otg_32_8.png differ
diff --git a/ooo_custom_images/oxygen/res/otg_48_8.png b/ooo_custom_images/oxygen/res/otg_48_8.png
new file mode 100644
index 0000000..773d52c
Binary files /dev/null and b/ooo_custom_images/oxygen/res/otg_48_8.png differ
diff --git a/ooo_custom_images/oxygen/res/oth_16_8.png b/ooo_custom_images/oxygen/res/oth_16_8.png
new file mode 100644
index 0000000..432c2db
Binary files /dev/null and b/ooo_custom_images/oxygen/res/oth_16_8.png differ
diff --git a/ooo_custom_images/oxygen/res/oth_32_8.png b/ooo_custom_images/oxygen/res/oth_32_8.png
new file mode 100644
index 0000000..9bae937
Binary files /dev/null and b/ooo_custom_images/oxygen/res/oth_32_8.png differ
diff --git a/ooo_custom_images/oxygen/res/oth_48_8.png b/ooo_custom_images/oxygen/res/oth_48_8.png
new file mode 100644
index 0000000..55d78c9
Binary files /dev/null and b/ooo_custom_images/oxygen/res/oth_48_8.png differ
diff --git a/ooo_custom_images/oxygen/res/sx03128.png b/ooo_custom_images/oxygen/res/sx03128.png
new file mode 100644
index 0000000..ec6c437
Binary files /dev/null and b/ooo_custom_images/oxygen/res/sx03128.png differ
diff --git a/ooo_custom_images/oxygen/res/sx03139.png b/ooo_custom_images/oxygen/res/sx03139.png
new file mode 100644
index 0000000..d2466e0
Binary files /dev/null and b/ooo_custom_images/oxygen/res/sx03139.png differ
diff --git a/ooo_custom_images/oxygen/res/sx03252.png b/ooo_custom_images/oxygen/res/sx03252.png
new file mode 100644
index 0000000..95eebf0
Binary files /dev/null and b/ooo_custom_images/oxygen/res/sx03252.png differ
diff --git a/ooo_custom_images/tango/res/lx03128.png b/ooo_custom_images/tango/res/lx03128.png
new file mode 100644
index 0000000..309e882
Binary files /dev/null and b/ooo_custom_images/tango/res/lx03128.png differ
diff --git a/ooo_custom_images/tango/res/lx03139.png b/ooo_custom_images/tango/res/lx03139.png
new file mode 100644
index 0000000..c08fd88
Binary files /dev/null and b/ooo_custom_images/tango/res/lx03139.png differ
diff --git a/ooo_custom_images/tango/res/lx03252.png b/ooo_custom_images/tango/res/lx03252.png
new file mode 100644
index 0000000..3bd7387
Binary files /dev/null and b/ooo_custom_images/tango/res/lx03252.png differ
diff --git a/ooo_custom_images/tango/res/sx03128.png b/ooo_custom_images/tango/res/sx03128.png
new file mode 100644
index 0000000..a24df73
Binary files /dev/null and b/ooo_custom_images/tango/res/sx03128.png differ
diff --git a/ooo_custom_images/tango/res/sx03139.png b/ooo_custom_images/tango/res/sx03139.png
new file mode 100644
index 0000000..16bf02e
Binary files /dev/null and b/ooo_custom_images/tango/res/sx03139.png differ
diff --git a/ooo_custom_images/tango/res/sx03252.png b/ooo_custom_images/tango/res/sx03252.png
new file mode 100644
index 0000000..456b810
Binary files /dev/null and b/ooo_custom_images/tango/res/sx03252.png differ
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 51a0791..dc16ab1 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -255,11 +255,13 @@
 #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 d99f9f9..f836306 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -204,6 +204,21 @@ 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" ;
@@ -279,6 +294,21 @@ 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" ;
@@ -427,6 +457,16 @@ 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" ;
@@ -477,6 +517,16 @@ 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" ;
commit 1d843960ce64350543574dd07ae9de183c37c669
Author: Noel Power <noel.power at novell.com>
Date:   Tue Nov 15 12:41:46 2011 +0000

    Revert "remove unused SV_ICON_ID_HTML_DOCUMENT entries"
    
    This reverts commit 28e36d54a0f4bbe4fddacbaf2f51ff25c76ce2d5.

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index f0dce63..51a0791 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -259,6 +259,7 @@
 #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 5f6dace..d99f9f9 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -264,6 +264,21 @@ 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" ;
@@ -452,6 +467,16 @@ 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" ;


More information about the Libreoffice-commits mailing list