[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extras/Package_palettes.mk extras/source

2016-12-22 Thread heiko tietze 
 extras/Package_palettes.mk|1 
 extras/source/palettes/freecolour-hlc.soc | 1038 ++
 extras/source/palettes/standard.soc   |  280 ++--
 3 files changed, 1136 insertions(+), 183 deletions(-)

New commits:
commit 89488baf09d2e7580041462b409f587ce43af214
Author: heiko tietze 
Date:   Sat Dec 17 11:48:02 2016 +0100

tdf#87538 New standard color palette, tdf#104052 Add LibreColour HLC palette

New standard palette; contribution from Christoph Schaefer, freieFarben e.V.

Change-Id: I36cfb3983e28caad0994f9a81e5bc230e8a675e8
Reviewed-on: https://gerrit.libreoffice.org/32116
Tested-by: Jenkins 
Reviewed-by: V Stuart Foote 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 765826abcaa441d4d90ffbe75bc3c626c42e639b)
Reviewed-on: https://gerrit.libreoffice.org/32278
Reviewed-by: jan iversen 

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 59e3cb2..9c3e3e9 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette
 $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,\
arrowhd.soe \
classic.sog \
+   freecolour-hlc.soc \
hatching.soh \
html.soc \
libreoffice.soc \
diff --git a/extras/source/palettes/freecolour-hlc.soc 
b/extras/source/palettes/freecolour-hlc.soc
new file mode 100644
index 000..914aa91
--- /dev/null
+++ b/extras/source/palettes/freecolour-hlc.soc
@@ -0,0 +1,1038 @@
+
+http://www.w3.org/1999/xlink; 
xmlns:svg="http://www.w3.org/2000/svg;
+xmlns:ooo="http://openoffice.org/2004/office;>
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extras/Package_palettes.mk extras/source

2016-12-21 Thread heiko tietze 
 extras/Package_palettes.mk |5 
 extras/source/palettes/cmyk.soc|  220 --
 extras/source/palettes/gallery.soc |   65 
 extras/source/palettes/palette.soc |   81 -
 extras/source/palettes/scribus.soc |  548 -
 extras/source/palettes/web.soc |  236 ---
 6 files changed, 1155 deletions(-)

New commits:
commit a038b353af6e0658f1151613db11de90d9dda9f2
Author: heiko tietze 
Date:   Thu Dec 1 12:18:30 2016 +0100

tdf#104047 - Remove dispensable palettes

cmyk, palette, gallery, web, scribus are obsolete

Change-Id: I7f8a4cb3ccb44e148783c79076e02dc6af933d2d
Reviewed-on: https://gerrit.libreoffice.org/31477
Tested-by: Jenkins 
Reviewed-by: jan iversen 
(cherry picked from commit a4dc0ce3926eec0d21d6932554c88d818545f4bb)
Reviewed-on: https://gerrit.libreoffice.org/32033
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 71600e2..59e3cb2 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -12,14 +12,10 @@ $(eval $(call 
gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette
 $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,\
arrowhd.soe \
classic.sog \
-   cmyk.soc \
-   gallery.soc \
hatching.soh \
html.soc \
libreoffice.soc \
modern.sog \
-   palette.soc \
-   scribus.soc \
standard.sob \
standard.soc \
standard.sod \
@@ -30,7 +26,6 @@ $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
styles.sod \
tango.soc \
tonal.soc \
-   web.soc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/palettes/cmyk.soc b/extras/source/palettes/cmyk.soc
deleted file mode 100644
index 0642dd9..000
--- a/extras/source/palettes/cmyk.soc
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-http://openoffice.org/2000/office; 
xmlns:style="http://openoffice.org/2000/style; 
xmlns:text="http://openoffice.org/2000/text; 
xmlns:table="http://openoffice.org/2000/table; 
xmlns:draw="http://openoffice.org/2000/drawing; 
xmlns:fo="http://www.w3.org/1999/XSL/Format; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="http://openoffice.org/2000/meta; 
xmlns:number="http://openoffice.org/2000/datastyle; 
xmlns:svg="http://www.w3.org/2000/svg; 
xmlns:chart="http://openoffice.org/2000/chart; 
xmlns:dr3d="http://openoffice.org/2000/dr3d; 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="http://openoffice.org/2000/form; 
xmlns:script="http://openoffice.org/2000/script;>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/extras/source/palettes/gallery.soc 
b/extras/source/palettes/gallery.soc
deleted file mode 100644
index e9970ea..000
--- a/extras/source/palettes/gallery.soc
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-http://openoffice.org/2000/office; 
xmlns:style="http://openoffice.org/2000/style; 
xmlns:text="http://openoffice.org/2000/text; 
xmlns:table="http://openoffice.org/2000/table; 
xmlns:draw="http://openoffice.org/2000/drawing; 
xmlns:fo="http://www.w3.org/1999/XSL/Format; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="http://openoffice.org/2000/meta; 
xmlns:number="http://openoffice.org/2000/datastyle; 
xmlns:svg="http://www.w3.org/2000/svg; 
xmlns:chart="http://openoffice.org/2000/chart; 
xmlns:dr3d="http://openoffice.org/2000/dr3d; 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="http://openoffice.org/2000/form; 
xmlns:script="http://openoffice.org/2000/script; 
xmlns:config="http://openoffice.org/2001/config;>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/extras/source/palettes/palette.soc 
b/extras/source/palettes/palette.soc
deleted file mode 100644
index 6668b70..000
--- a/extras/source/palettes/palette.soc
+++ /dev/null
@@ -1,81 +0,0 @@
-
-

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extras/Package_palettes.mk extras/source

2016-12-05 Thread V Stuart Foote 
 extras/Package_palettes.mk  |2 
 extras/source/palettes/tonal.soc|  123 
 extras/source/palettes/tonal_column.soc |  123 
 3 files changed, 124 insertions(+), 124 deletions(-)

New commits:
commit 792d7d29688a0273f346a9baa23d415a7f8f55d8
Author: V Stuart Foote 
Date:   Fri Nov 25 15:16:31 2016 -0600

tdf#80196 - rename palette to tonal.soc and adjusting names

for 5.3.0 renamed from tonal_column.soc and removed abbreviations

Change-Id: I72dbbab2688709e8266be93b40040c4c6c970d55
Reviewed-on: https://gerrit.libreoffice.org/31217
Reviewed-by: Heiko Tietze 
Reviewed-by: jan iversen 
Tested-by: jan iversen 
(cherry picked from commit 98419425080f58880f2d0d85749a4a55e8abb40b)
Reviewed-on: https://gerrit.libreoffice.org/31510
Reviewed-by: V Stuart Foote 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index ed1f820..71600e2 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -29,7 +29,7 @@ $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
standard.sop \
styles.sod \
tango.soc \
-   tonal_column.soc \
+   tonal.soc \
web.soc \
 ))
 
diff --git a/extras/source/palettes/tonal_column.soc 
b/extras/source/palettes/tonal.soc
similarity index 68%
rename from extras/source/palettes/tonal_column.soc
rename to extras/source/palettes/tonal.soc
index 1740160..ad4872c 100644
--- a/extras/source/palettes/tonal_column.soc
+++ b/extras/source/palettes/tonal.soc
@@ -13,49 +13,49 @@
 
 
 
-
-
-
+
+
+
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
-
+
+
+
 
-
-
-
+
+
+
 
-
-
-
+
+
+
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 
 
 
 
-
+
 
-
+
 
 
 
@@ -65,9 +65,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -77,9 +77,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -89,9 +89,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -101,9 +101,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -113,9 +113,9 @@
 
 
 
-
+
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits