ooo-build r11775 - in trunk: . patches/src680
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11775 - in trunk: . patches/src680
- Date: Mon, 3 Mar 2008 11:53:40 +0000 (GMT)
Author: strba
Date: Mon Mar 3 11:53:40 2008
New Revision: 11775
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11775&view=rev
Log:
rewrite a part of the colour parser to prevent msvc from getting nuts
Modified:
trunk/ChangeLog
trunk/patches/src680/svg-import-filter.diff
Modified: trunk/patches/src680/svg-import-filter.diff
==============================================================================
--- trunk/patches/src680/svg-import-filter.diff (original)
+++ trunk/patches/src680/svg-import-filter.diff Mon Mar 3 11:53:40 2008
@@ -1,5 +1,5 @@
---- filter/source/config/fragments/fcfg_drawgraphics.mk 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/config/fragments/fcfg_drawgraphics.mk 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/config/fragments/fcfg_drawgraphics.mk 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/config/fragments/fcfg_drawgraphics.mk 2008-02-29 10:27:32.000000000 +0100
@@ -54,6 +54,7 @@
SGF___StarOffice_Writer_SGF \
SGV___StarDraw_2_0 \
@@ -9,7 +9,7 @@
TIF___Tag_Image_File \
WMF___MS_Windows_Metafile \
--- filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,13 @@
+ <node oor:name="SVG - Scalable Vector Graphics" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
@@ -24,8 +24,8 @@
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+ </node>
---- filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2008-02-29 10:27:32.000000000 +0100
@@ -1,12 +1,12 @@
<node oor:name="svg_Scalable_Vector_Graphics" oor:op="replace" >
- <prop oor:name="DetectService"/>
@@ -44,7 +44,7 @@
+ <prop oor:name="ClipboardFormat"><value>doctype:xmlns="http://www.w3.org/2000/svg";</value></prop>
</node>
--- filter/source/svg/b2dellipse.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/b2dellipse.cxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/b2dellipse.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
@@ -186,7 +186,7 @@
+//////////////////////////////////////////////////////////////////////////////
+// eof
--- filter/source/svg/b2dellipse.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/b2dellipse.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/b2dellipse.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
@@ -265,8 +265,8 @@
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BASEGFX_B2DELLIPSE_HXX */
---- filter/source/svg/exports.map 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/svg/exports.map 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/svg/exports.map 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/svg/exports.map 2008-02-29 10:27:32.000000000 +0100
@@ -1,4 +1,4 @@
-PDFFILTER_1_0 {
+SVGFILTER_1_0 {
@@ -281,7 +281,7 @@
\ No newline at end of file
+};
--- filter/source/svg/gentoken.pl 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/gentoken.pl 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/gentoken.pl 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,58 @@
+# from oox/source/token - should really put this into solenv
+
@@ -342,7 +342,7 @@
+close ( HXX );
+close ( GPERF );
--- filter/source/svg/gfxtypes.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/gfxtypes.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/gfxtypes.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,309 @@
+/*************************************************************************
+ *
@@ -653,8 +653,8 @@
+} // namespace svgi
+
+#endif
---- filter/source/svg/makefile.mk 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/svg/makefile.mk 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/svg/makefile.mk 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/svg/makefile.mk 2008-02-29 10:27:32.000000000 +0100
@@ -34,24 +34,35 @@
#*************************************************************************
@@ -742,8 +742,8 @@
+$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
+
--- filter/source/svg/parserfragments.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.cxx 2008-02-28 13:54:18.000000000 +0100
-@@ -0,0 +1,650 @@
++++ filter/source/svg/parserfragments.cxx 2008-03-03 12:47:08.000000000 +0100
+@@ -0,0 +1,509 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -776,6 +776,7 @@
+#include <algorithm>
+
+#include "units.hxx"
++#include "tokenmap.hxx"
+
+using namespace ::com::sun::star;
+
@@ -860,339 +861,197 @@
+ using namespace ::boost::spirit;
+
+ int_parser<sal_uInt8,10,1,3> byte_p;
-+
-+ return parse(sColor,
-+ // Begin grammar
-+ (
-+ // the #rrggbb form
-+ ('#' >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
-+ boost::ref(rColor.r),_1,_2)]
-+ >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
-+ boost::ref(rColor.g),_1,_2)]
-+ >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
-+ boost::ref(rColor.b),_1,_2)])
-+ |
-+ // the #rgb form
-+ ('#' >> xdigit_p[boost::bind(&setFourBitColor,
-+ boost::ref(rColor.r),_1)]
-+ >> xdigit_p[boost::bind(&setFourBitColor,
-+ boost::ref(rColor.g),_1)]
-+ >> xdigit_p[boost::bind(&setFourBitColor,
-+ boost::ref(rColor.b),_1)])
-+ |
-+ // rgb() form
-+ (str_p("rgb")
-+ >> '(' >>
-+ // rgb(int,int,int)
-+ (byte_p[boost::bind(&setIntColor,
-+ boost::ref(rColor.r),_1)] >> ',' >>
-+ byte_p[boost::bind(&setIntColor,
-+ boost::ref(rColor.g),_1)] >> ',' >>
-+ byte_p[boost::bind(&setIntColor,
-+ boost::ref(rColor.b),_1)])
-+ |
-+ // rgb(double,double,double)
-+ (real_p[assign_a(rColor.r)] >> ',' >>
-+ real_p[assign_a(rColor.g)] >> ',' >>
-+ real_p[assign_a(rColor.b)])
-+ >> ')')
-+ |
-+ str_p("aliceblue")[assign_a(rColor,ARGBColor(240,248,255))]
-+ |
-+ str_p("antiquewhite")[assign_a(rColor,ARGBColor(250,235,215))]
-+ |
-+ str_p("aqua")[assign_a(rColor,ARGBColor(0,255,255))]
-+ |
-+ str_p("aquamarine")[assign_a(rColor,ARGBColor(127,255,212))]
-+ |
-+ str_p("azure")[assign_a(rColor,ARGBColor(240,255,255))]
-+ |
-+ str_p("beige")[assign_a(rColor,ARGBColor(245,245,220))]
-+ |
-+ str_p("bisque")[assign_a(rColor,ARGBColor(255,228,196))]
-+ |
-+ str_p("black")[assign_a(rColor,ARGBColor(0,0,0))]
-+ |
-+ str_p("blanchedalmond")[assign_a(rColor,ARGBColor(255,235,205))]
-+ |
-+ str_p("blue")[assign_a(rColor,ARGBColor(0,0,255))]
-+ |
-+ str_p("blueviolet")[assign_a(rColor,ARGBColor(138,43,226))]
-+ |
-+ str_p("brown")[assign_a(rColor,ARGBColor(165,42,42))]
-+ |
-+ str_p("burlywood")[assign_a(rColor,ARGBColor(222,184,135))]
-+ |
-+ str_p("cadetblue")[assign_a(rColor,ARGBColor(95,158,160))]
-+ |
-+ str_p("chartreuse")[assign_a(rColor,ARGBColor(127,255,0))]
-+ |
-+ str_p("chocolate")[assign_a(rColor,ARGBColor(210,105,30))]
-+ |
-+ str_p("coral")[assign_a(rColor,ARGBColor(255,127,80))]
-+ |
-+ str_p("cornflowerblue")[assign_a(rColor,ARGBColor(100,149,237))]
-+ |
-+ str_p("cornsilk")[assign_a(rColor,ARGBColor(255,248,220))]
-+ |
-+ str_p("crimson")[assign_a(rColor,ARGBColor(220,20,60))]
-+ |
-+ str_p("cyan")[assign_a(rColor,ARGBColor(0,255,255))]
-+ |
-+ str_p("darkblue")[assign_a(rColor,ARGBColor(0,0,139))]
-+ |
-+ str_p("darkcyan")[assign_a(rColor,ARGBColor(0,139,139))]
-+ |
-+ str_p("darkgoldenrod")[assign_a(rColor,ARGBColor(184,134,11))]
-+ |
-+ str_p("darkgray")[assign_a(rColor,ARGBColor(169,169,169))]
-+ |
-+ str_p("darkgreen")[assign_a(rColor,ARGBColor(0,100,0))]
-+ |
-+ str_p("darkgrey")[assign_a(rColor,ARGBColor(169,169,169))]
-+ |
-+ str_p("darkkhaki")[assign_a(rColor,ARGBColor(189,183,107))]
-+ |
-+ str_p("darkmagenta")[assign_a(rColor,ARGBColor(139,0,139))]
-+ |
-+ str_p("darkolivegreen")[assign_a(rColor,ARGBColor(85,107,47))]
-+ |
-+ str_p("darkorange")[assign_a(rColor,ARGBColor(255,140,0))]
-+ |
-+ str_p("darkorchid")[assign_a(rColor,ARGBColor(153,50,204))]
-+ |
-+ str_p("darkred")[assign_a(rColor,ARGBColor(139,0,0))]
-+ |
-+ str_p("darksalmon")[assign_a(rColor,ARGBColor(233,150,122))]
-+ |
-+ str_p("darkseagreen")[assign_a(rColor,ARGBColor(143,188,143))]
-+ |
-+ str_p("darkslateblue")[assign_a(rColor,ARGBColor(72,61,139))]
-+ |
-+ str_p("darkslategray")[assign_a(rColor,ARGBColor(47,79,79))]
-+ |
-+ str_p("darkslategrey")[assign_a(rColor,ARGBColor(47,79,79))]
-+ |
-+ str_p("darkturquoise")[assign_a(rColor,ARGBColor(0,206,209))]
-+ |
-+ str_p("darkviolet")[assign_a(rColor,ARGBColor(148,0,211))]
-+ |
-+ str_p("deeppink")[assign_a(rColor,ARGBColor(255,20,147))]
-+ |
-+ str_p("deepskyblue")[assign_a(rColor,ARGBColor(0,191,255))]
-+ |
-+ str_p("dimgray")[assign_a(rColor,ARGBColor(105,105,105))]
-+ |
-+ str_p("dimgrey")[assign_a(rColor,ARGBColor(105,105,105))]
-+ |
-+ str_p("dodgerblue")[assign_a(rColor,ARGBColor(30,144,255))]
-+ |
-+ str_p("firebrick")[assign_a(rColor,ARGBColor(178,34,34))]
-+ |
-+ str_p("floralwhite")[assign_a(rColor,ARGBColor(255,250,240))]
-+ |
-+ str_p("forestgreen")[assign_a(rColor,ARGBColor(34,139,34))]
-+ |
-+ str_p("fuchsia")[assign_a(rColor,ARGBColor(255,0,255))]
-+ |
-+ str_p("gainsboro")[assign_a(rColor,ARGBColor(220,220,220))]
-+ |
-+ str_p("ghostwhite")[assign_a(rColor,ARGBColor(248,248,255))]
-+ |
-+ str_p("gold")[assign_a(rColor,ARGBColor(255,215,0))]
-+ |
-+ str_p("goldenrod")[assign_a(rColor,ARGBColor(218,165,32))]
-+ |
-+ str_p("gray")[assign_a(rColor,ARGBColor(128,128,128))]
-+ |
-+ str_p("grey")[assign_a(rColor,ARGBColor(128,128,128))]
-+ |
-+ str_p("green")[assign_a(rColor,ARGBColor(0,128,0))]
-+ |
-+ str_p("greenyellow")[assign_a(rColor,ARGBColor(173,255,47))]
-+ |
-+ str_p("honeydew")[assign_a(rColor,ARGBColor(240,255,240))]
-+ |
-+ str_p("hotpink")[assign_a(rColor,ARGBColor(255,105,180))]
-+ |
-+ str_p("indianred")[assign_a(rColor,ARGBColor(205,92,92))]
-+ |
-+ str_p("indigo")[assign_a(rColor,ARGBColor(75,0,130))]
-+ |
-+ str_p("ivory")[assign_a(rColor,ARGBColor(255,255,240))]
-+ |
-+ str_p("khaki")[assign_a(rColor,ARGBColor(240,230,140))]
-+ |
-+ str_p("lavender")[assign_a(rColor,ARGBColor(230,230,250))]
-+ |
-+ str_p("lavenderblush")[assign_a(rColor,ARGBColor(255,240,245))]
-+ |
-+ str_p("lawngreen")[assign_a(rColor,ARGBColor(124,252,0))]
-+ |
-+ str_p("lemonchiffon")[assign_a(rColor,ARGBColor(255,250,205))]
-+ |
-+ str_p("lightblue")[assign_a(rColor,ARGBColor(173,216,230))]
-+ |
-+ str_p("lightcoral")[assign_a(rColor,ARGBColor(240,128,128))]
-+ |
-+ str_p("lightcyan")[assign_a(rColor,ARGBColor(224,255,255))]
-+ |
-+ str_p("lightgoldenrodyellow")[assign_a(rColor,ARGBColor(250,250,210))]
-+ |
-+ str_p("lightgray")[assign_a(rColor,ARGBColor(211,211,211))]
-+ |
-+ str_p("lightgreen")[assign_a(rColor,ARGBColor(144,238,144))]
-+ |
-+ str_p("lightgrey")[assign_a(rColor,ARGBColor(211,211,211))]
-+ |
-+ str_p("lightpink")[assign_a(rColor,ARGBColor(255,182,193))]
-+ |
-+ str_p("lightsalmon")[assign_a(rColor,ARGBColor(255,160,122))]
-+ |
-+ str_p("lightseagreen")[assign_a(rColor,ARGBColor(32,178,170))]
-+ |
-+ str_p("lightskyblue")[assign_a(rColor,ARGBColor(135,206,250))]
-+ |
-+ str_p("lightslategray")[assign_a(rColor,ARGBColor(119,136,153))]
-+ |
-+ str_p("lightslategrey")[assign_a(rColor,ARGBColor(119,136,153))]
-+ |
-+ str_p("lightsteelblue")[assign_a(rColor,ARGBColor(176,196,222))]
-+ |
-+ str_p("lightyellow")[assign_a(rColor,ARGBColor(255,255,224))]
-+ |
-+ str_p("lime")[assign_a(rColor,ARGBColor(0,255,0))]
-+ |
-+ str_p("limegreen")[assign_a(rColor,ARGBColor(50,205,50))]
-+ |
-+ str_p("linen")[assign_a(rColor,ARGBColor(250,240,230))]
-+ |
-+ str_p("magenta")[assign_a(rColor,ARGBColor(255,0,255))]
-+ |
-+ str_p("maroon")[assign_a(rColor,ARGBColor(128,0,0))]
-+ |
-+ str_p("mediumaquamarine")[assign_a(rColor,ARGBColor(102,205,170))]
-+ |
-+ str_p("mediumblue")[assign_a(rColor,ARGBColor(0,0,205))]
-+ |
-+ str_p("mediumorchid")[assign_a(rColor,ARGBColor(186,85,211))]
-+ |
-+ str_p("mediumpurple")[assign_a(rColor,ARGBColor(147,112,219))]
-+ |
-+ str_p("mediumseagreen")[assign_a(rColor,ARGBColor(60,179,113))]
-+ |
-+ str_p("mediumslateblue")[assign_a(rColor,ARGBColor(123,104,238))]
-+ |
-+ str_p("mediumspringgreen")[assign_a(rColor,ARGBColor(0,250,154))]
-+ |
-+ str_p("mediumturquoise")[assign_a(rColor,ARGBColor(72,209,204))]
-+ |
-+ str_p("mediumvioletred")[assign_a(rColor,ARGBColor(199,21,133))]
-+ |
-+ str_p("midnightblue")[assign_a(rColor,ARGBColor(25,25,112))]
-+ |
-+ str_p("mintcream")[assign_a(rColor,ARGBColor(245,255,250))]
-+ |
-+ str_p("mistyrose")[assign_a(rColor,ARGBColor(255,228,225))]
-+ |
-+ str_p("moccasin")[assign_a(rColor,ARGBColor(255,228,181))]
-+ |
-+ str_p("navajowhite")[assign_a(rColor,ARGBColor(255,222,173))]
-+ |
-+ str_p("navy")[assign_a(rColor,ARGBColor(0,0,128))]
-+ |
-+ str_p("oldlace")[assign_a(rColor,ARGBColor(253,245,230))]
-+ |
-+ str_p("olive")[assign_a(rColor,ARGBColor(128,128,0))]
-+ |
-+ str_p("olivedrab")[assign_a(rColor,ARGBColor(107,142,35))]
-+ |
-+ str_p("orange")[assign_a(rColor,ARGBColor(255,165,0))]
-+ |
-+ str_p("orangered")[assign_a(rColor,ARGBColor(255,69,0))]
-+ |
-+ str_p("orchid")[assign_a(rColor,ARGBColor(218,112,214))]
-+ |
-+ str_p("palegoldenrod")[assign_a(rColor,ARGBColor(238,232,170))]
-+ |
-+ str_p("palegreen")[assign_a(rColor,ARGBColor(152,251,152))]
-+ |
-+ str_p("paleturquoise")[assign_a(rColor,ARGBColor(175,238,238))]
-+ |
-+ str_p("palevioletred")[assign_a(rColor,ARGBColor(219,112,147))]
-+ |
-+ str_p("papayawhip")[assign_a(rColor,ARGBColor(255,239,213))]
-+ |
-+ str_p("peachpuff")[assign_a(rColor,ARGBColor(255,218,185))]
-+ |
-+ str_p("peru")[assign_a(rColor,ARGBColor(205,133,63))]
-+ |
-+ str_p("pink")[assign_a(rColor,ARGBColor(255,192,203))]
-+ |
-+ str_p("plum")[assign_a(rColor,ARGBColor(221,160,221))]
-+ |
-+ str_p("powderblue")[assign_a(rColor,ARGBColor(176,224,230))]
-+ |
-+ str_p("purple")[assign_a(rColor,ARGBColor(128,0,128))]
-+ |
-+ str_p("red")[assign_a(rColor,ARGBColor(255,0,0))]
-+ |
-+ str_p("rosybrown")[assign_a(rColor,ARGBColor(188,143,143))]
-+ |
-+ str_p("royalblue")[assign_a(rColor,ARGBColor(65,105,225))]
-+ |
-+ str_p("saddlebrown")[assign_a(rColor,ARGBColor(139,69,19))]
-+ |
-+ str_p("salmon")[assign_a(rColor,ARGBColor(250,128,114))]
-+ |
-+ str_p("sandybrown")[assign_a(rColor,ARGBColor(244,164,96))]
-+ |
-+ str_p("seagreen")[assign_a(rColor,ARGBColor(46,139,87))]
-+ |
-+ str_p("seashell")[assign_a(rColor,ARGBColor(255,245,238))]
-+ |
-+ str_p("sienna")[assign_a(rColor,ARGBColor(160,82,45))]
-+ |
-+ str_p("silver")[assign_a(rColor,ARGBColor(192,192,192))]
-+ |
-+ str_p("skyblue")[assign_a(rColor,ARGBColor(135,206,235))]
-+ |
-+ str_p("slateblue")[assign_a(rColor,ARGBColor(106,90,205))]
-+ |
-+ str_p("slategray")[assign_a(rColor,ARGBColor(112,128,144))]
-+ |
-+ str_p("slategrey")[assign_a(rColor,ARGBColor(112,128,144))]
-+ |
-+ str_p("snow")[assign_a(rColor,ARGBColor(255,250,250))]
-+ |
-+ str_p("springgreen")[assign_a(rColor,ARGBColor(0,255,127))]
-+ |
-+ str_p("steelblue")[assign_a(rColor,ARGBColor(70,130,180))]
-+ |
-+ str_p("tan")[assign_a(rColor,ARGBColor(210,180,140))]
-+ |
-+ str_p("teal")[assign_a(rColor,ARGBColor(0,128,128))]
-+ |
-+ str_p("thistle")[assign_a(rColor,ARGBColor(216,191,216))]
-+ |
-+ str_p("tomato")[assign_a(rColor,ARGBColor(255,99,71))]
-+ |
-+ str_p("turquoise")[assign_a(rColor,ARGBColor(64,224,208))]
-+ |
-+ str_p("violet")[assign_a(rColor,ARGBColor(238,130,238))]
-+ |
-+ str_p("wheat")[assign_a(rColor,ARGBColor(245,222,179))]
-+ |
-+ str_p("white")[assign_a(rColor,ARGBColor(255,255,255))]
-+ |
-+ str_p("whitesmoke")[assign_a(rColor,ARGBColor(245,245,245))]
-+ |
-+ str_p("yellow")[assign_a(rColor,ARGBColor(255,255,0))]
-+ |
-+ str_p("yellowgreen")[assign_a(rColor,ARGBColor(154,205,50))]
-+ ),
-+ // End grammar
-+ space_p).full;
++
++ switch (getTokenId(sColor, strlen(sColor)))
++ {
++ case XML_ALICEBLUE: rColor = ARGBColor(240,248,255); return true;
++ case XML_ANTIQUEWHITE: rColor = ARGBColor(250,235,215); return true;
++ case XML_AQUA: rColor = ARGBColor(0,255,255); return true;
++ case XML_AQUAMARINE: rColor = ARGBColor(127,255,212); return true;
++ case XML_AZURE: rColor = ARGBColor(240,255,255); return true;
++ case XML_BEIGE: rColor = ARGBColor(245,245,220); return true;
++ case XML_BISQUE: rColor = ARGBColor(255,228,196); return true;
++ case XML_BLACK: rColor = ARGBColor(0,0,0); return true;
++ case XML_BLANCHEDALMOND: rColor = ARGBColor(255,235,205); return true;
++ case XML_BLUE: rColor = ARGBColor(0,0,255); return true;
++ case XML_BLUEVIOLET: rColor = ARGBColor(138,43,226); return true;
++ case XML_BROWN: rColor = ARGBColor(165,42,42); return true;
++ case XML_BURLYWOOD: rColor = ARGBColor(222,184,135); return true;
++ case XML_CADETBLUE: rColor = ARGBColor(95,158,160); return true;
++ case XML_CHARTREUSE: rColor = ARGBColor(127,255,0); return true;
++ case XML_CHOCOLATE: rColor = ARGBColor(210,105,30); return true;
++ case XML_CORAL: rColor = ARGBColor(255,127,80); return true;
++ case XML_CORNFLOWERBLUE: rColor = ARGBColor(100,149,237); return true;
++ case XML_CORNSILK: rColor = ARGBColor(255,248,220); return true;
++ case XML_CRIMSON: rColor = ARGBColor(220,20,60); return true;
++ case XML_CYAN: rColor = ARGBColor(0,255,255); return true;
++ case XML_DARKBLUE: rColor = ARGBColor(0,0,139); return true;
++ case XML_DARKCYAN: rColor = ARGBColor(0,139,139); return true;
++ case XML_DARKGOLDENROD: rColor = ARGBColor(184,134,11); return true;
++ case XML_DARKGRAY: rColor = ARGBColor(169,169,169); return true;
++ case XML_DARKGREEN: rColor = ARGBColor(0,100,0); return true;
++ case XML_DARKGREY: rColor = ARGBColor(169,169,169); return true;
++ case XML_DARKKHAKI: rColor = ARGBColor(189,183,107); return true;
++ case XML_DARKMAGENTA: rColor = ARGBColor(139,0,139); return true;
++ case XML_DARKOLIVEGREEN: rColor = ARGBColor(85,107,47); return true;
++ case XML_DARKORANGE: rColor = ARGBColor(255,140,0); return true;
++ case XML_DARKORCHID: rColor = ARGBColor(153,50,204); return true;
++ case XML_DARKRED: rColor = ARGBColor(139,0,0); return true;
++ case XML_DARKSALMON: rColor = ARGBColor(233,150,122); return true;
++ case XML_DARKSEAGREEN: rColor = ARGBColor(143,188,143); return true;
++ case XML_DARKSLATEBLUE: rColor = ARGBColor(72,61,139); return true;
++ case XML_DARKSLATEGRAY: rColor = ARGBColor(47,79,79); return true;
++ case XML_DARKSLATEGREY: rColor = ARGBColor(47,79,79); return true;
++ case XML_DARKTURQUOISE: rColor = ARGBColor(0,206,209); return true;
++ case XML_DARKVIOLET: rColor = ARGBColor(148,0,211); return true;
++ case XML_DEEPPINK: rColor = ARGBColor(255,20,147); return true;
++ case XML_DEEPSKYBLUE: rColor = ARGBColor(0,191,255); return true;
++ case XML_DIMGRAY: rColor = ARGBColor(105,105,105); return true;
++ case XML_DIMGREY: rColor = ARGBColor(105,105,105); return true;
++ case XML_DODGERBLUE: rColor = ARGBColor(30,144,255); return true;
++ case XML_FIREBRICK: rColor = ARGBColor(178,34,34); return true;
++ case XML_FLORALWHITE: rColor = ARGBColor(255,250,240); return true;
++ case XML_FORESTGREEN: rColor = ARGBColor(34,139,34); return true;
++ case XML_FUCHSIA: rColor = ARGBColor(255,0,255); return true;
++ case XML_GAINSBORO: rColor = ARGBColor(220,220,220); return true;
++ case XML_GHOSTWHITE: rColor = ARGBColor(248,248,255); return true;
++ case XML_GOLD: rColor = ARGBColor(255,215,0); return true;
++ case XML_GOLDENROD: rColor = ARGBColor(218,165,32); return true;
++ case XML_GRAY: rColor = ARGBColor(128,128,128); return true;
++ case XML_GREY: rColor = ARGBColor(128,128,128); return true;
++ case XML_GREEN: rColor = ARGBColor(0,128,0); return true;
++ case XML_GREENYELLOW: rColor = ARGBColor(173,255,47); return true;
++ case XML_HONEYDEW: rColor = ARGBColor(240,255,240); return true;
++ case XML_HOTPINK: rColor = ARGBColor(255,105,180); return true;
++ case XML_INDIANRED: rColor = ARGBColor(205,92,92); return true;
++ case XML_INDIGO: rColor = ARGBColor(75,0,130); return true;
++ case XML_IVORY: rColor = ARGBColor(255,255,240); return true;
++ case XML_KHAKI: rColor = ARGBColor(240,230,140); return true;
++ case XML_LAVENDER: rColor = ARGBColor(230,230,250); return true;
++ case XML_LAVENDERBLUSH: rColor = ARGBColor(255,240,245); return true;
++ case XML_LAWNGREEN: rColor = ARGBColor(124,252,0); return true;
++ case XML_LEMONCHIFFON: rColor = ARGBColor(255,250,205); return true;
++ case XML_LIGHTBLUE: rColor = ARGBColor(173,216,230); return true;
++ case XML_LIGHTCORAL: rColor = ARGBColor(240,128,128); return true;
++ case XML_LIGHTCYAN: rColor = ARGBColor(224,255,255); return true;
++ case XML_LIGHTGOLDENRODYELLOW: rColor = ARGBColor(250,250,210); return true;
++ case XML_LIGHTGRAY: rColor = ARGBColor(211,211,211); return true;
++ case XML_LIGHTGREEN: rColor = ARGBColor(144,238,144); return true;
++ case XML_LIGHTGREY: rColor = ARGBColor(211,211,211); return true;
++ case XML_LIGHTPINK: rColor = ARGBColor(255,182,193); return true;
++ case XML_LIGHTSALMON: rColor = ARGBColor(255,160,122); return true;
++ case XML_LIGHTSEAGREEN: rColor = ARGBColor(32,178,170); return true;
++ case XML_LIGHTSKYBLUE: rColor = ARGBColor(135,206,250); return true;
++ case XML_LIGHTSLATEGRAY: rColor = ARGBColor(119,136,153); return true;
++ case XML_LIGHTSLATEGREY: rColor = ARGBColor(119,136,153); return true;
++ case XML_LIGHTSTEELBLUE: rColor = ARGBColor(176,196,222); return true;
++ case XML_LIGHTYELLOW: rColor = ARGBColor(255,255,224); return true;
++ case XML_LIME: rColor = ARGBColor(0,255,0); return true;
++ case XML_LIMEGREEN: rColor = ARGBColor(50,205,50); return true;
++ case XML_LINEN: rColor = ARGBColor(250,240,230); return true;
++ case XML_MAGENTA: rColor = ARGBColor(255,0,255); return true;
++ case XML_MAROON: rColor = ARGBColor(128,0,0); return true;
++ case XML_MEDIUMAQUAMARINE: rColor = ARGBColor(102,205,170); return true;
++ case XML_MEDIUMBLUE: rColor = ARGBColor(0,0,205); return true;
++ case XML_MEDIUMORCHID: rColor = ARGBColor(186,85,211); return true;
++ case XML_MEDIUMPURPLE: rColor = ARGBColor(147,112,219); return true;
++ case XML_MEDIUMSEAGREEN: rColor = ARGBColor(60,179,113); return true;
++ case XML_MEDIUMSLATEBLUE: rColor = ARGBColor(123,104,238); return true;
++ case XML_MEDIUMSPRINGGREEN: rColor = ARGBColor(0,250,154); return true;
++ case XML_MEDIUMTURQUOISE: rColor = ARGBColor(72,209,204); return true;
++ case XML_MEDIUMVIOLETRED: rColor = ARGBColor(199,21,133); return true;
++ case XML_MIDNIGHTBLUE: rColor = ARGBColor(25,25,112); return true;
++ case XML_MINTCREAM: rColor = ARGBColor(245,255,250); return true;
++ case XML_MISTYROSE: rColor = ARGBColor(255,228,225); return true;
++ case XML_MOCCASIN: rColor = ARGBColor(255,228,181); return true;
++ case XML_NAVAJOWHITE: rColor = ARGBColor(255,222,173); return true;
++ case XML_NAVY: rColor = ARGBColor(0,0,128); return true;
++ case XML_OLDLACE: rColor = ARGBColor(253,245,230); return true;
++ case XML_OLIVE: rColor = ARGBColor(128,128,0); return true;
++ case XML_OLIVEDRAB: rColor = ARGBColor(107,142,35); return true;
++ case XML_ORANGE: rColor = ARGBColor(255,165,0); return true;
++ case XML_ORANGERED: rColor = ARGBColor(255,69,0); return true;
++ case XML_ORCHID: rColor = ARGBColor(218,112,214); return true;
++ case XML_PALEGOLDENROD: rColor = ARGBColor(238,232,170); return true;
++ case XML_PALEGREEN: rColor = ARGBColor(152,251,152); return true;
++ case XML_PALETURQUOISE: rColor = ARGBColor(175,238,238); return true;
++ case XML_PALEVIOLETRED: rColor = ARGBColor(219,112,147); return true;
++ case XML_PAPAYAWHIP: rColor = ARGBColor(255,239,213); return true;
++ case XML_PEACHPUFF: rColor = ARGBColor(255,218,185); return true;
++ case XML_PERU: rColor = ARGBColor(205,133,63); return true;
++ case XML_PINK: rColor = ARGBColor(255,192,203); return true;
++ case XML_PLUM: rColor = ARGBColor(221,160,221); return true;
++ case XML_POWDERBLUE: rColor = ARGBColor(176,224,230); return true;
++ case XML_PURPLE: rColor = ARGBColor(128,0,128); return true;
++ case XML_RED: rColor = ARGBColor(255,0,0); return true;
++ case XML_ROSYBROWN: rColor = ARGBColor(188,143,143); return true;
++ case XML_ROYALBLUE: rColor = ARGBColor(65,105,225); return true;
++ case XML_SADDLEBROWN: rColor = ARGBColor(139,69,19); return true;
++ case XML_SALMON: rColor = ARGBColor(250,128,114); return true;
++ case XML_SANDYBROWN: rColor = ARGBColor(244,164,96); return true;
++ case XML_SEAGREEN: rColor = ARGBColor(46,139,87); return true;
++ case XML_SEASHELL: rColor = ARGBColor(255,245,238); return true;
++ case XML_SIENNA: rColor = ARGBColor(160,82,45); return true;
++ case XML_SILVER: rColor = ARGBColor(192,192,192); return true;
++ case XML_SKYBLUE: rColor = ARGBColor(135,206,235); return true;
++ case XML_SLATEBLUE: rColor = ARGBColor(106,90,205); return true;
++ case XML_SLATEGRAY: rColor = ARGBColor(112,128,144); return true;
++ case XML_SLATEGREY: rColor = ARGBColor(112,128,144); return true;
++ case XML_SNOW: rColor = ARGBColor(255,250,250); return true;
++ case XML_SPRINGGREEN: rColor = ARGBColor(0,255,127); return true;
++ case XML_STEELBLUE: rColor = ARGBColor(70,130,180); return true;
++ case XML_TAN: rColor = ARGBColor(210,180,140); return true;
++ case XML_TEAL: rColor = ARGBColor(0,128,128); return true;
++ case XML_THISTLE: rColor = ARGBColor(216,191,216); return true;
++ case XML_TOMATO: rColor = ARGBColor(255,99,71); return true;
++ case XML_TURQUOISE: rColor = ARGBColor(64,224,208); return true;
++ case XML_VIOLET: rColor = ARGBColor(238,130,238); return true;
++ case XML_WHEAT: rColor = ARGBColor(245,222,179); return true;
++ case XML_WHITE: rColor = ARGBColor(255,255,255); return true;
++ case XML_WHITESMOKE: rColor = ARGBColor(245,245,245); return true;
++ case XML_YELLOW: rColor = ARGBColor(255,255,0); return true;
++ case XML_YELLOWGREEN: rColor = ARGBColor(154,205,50); return true;
++
++ default:
++ return parse(sColor,
++ // Begin grammar
++ (
++ // the #rrggbb form
++ ('#' >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
++ boost::ref(rColor.r),_1,_2)]
++ >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
++ boost::ref(rColor.g),_1,_2)]
++ >> (xdigit_p >> xdigit_p)[boost::bind(&setEightBitColor,
++ boost::ref(rColor.b),_1,_2)])
++ |
++ // the #rgb form
++ ('#' >> xdigit_p[boost::bind(&setFourBitColor,
++ boost::ref(rColor.r),_1)]
++ >> xdigit_p[boost::bind(&setFourBitColor,
++ boost::ref(rColor.g),_1)]
++ >> xdigit_p[boost::bind(&setFourBitColor,
++ boost::ref(rColor.b),_1)])
++ |
++ // rgb() form
++ (str_p("rgb")
++ >> '(' >>
++ // rgb(int,int,int)
++ (byte_p[boost::bind(&setIntColor,
++ boost::ref(rColor.r),_1)] >> ',' >>
++ byte_p[boost::bind(&setIntColor,
++ boost::ref(rColor.g),_1)] >> ',' >>
++ byte_p[boost::bind(&setIntColor,
++ boost::ref(rColor.b),_1)])
++ |
++ // rgb(double,double,double)
++ (real_p[assign_a(rColor.r)] >> ',' >>
++ real_p[assign_a(rColor.g)] >> ',' >>
++ real_p[assign_a(rColor.b)])
++ >> ')')
++ ),
++ // End grammar
++ space_p).full;
++ }
+}
+
+//////////////////////////////////////////////////////////////
@@ -1395,7 +1254,7 @@
+
+} // namespace svgi
--- filter/source/svg/parserfragments.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/parserfragments.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
@@ -1447,7 +1306,7 @@
+
+#endif
--- filter/source/svg/spirit_supplements.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/spirit_supplements.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/spirit_supplements.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
@@ -1543,8 +1402,8 @@
+
+# endif
+#endif
---- filter/source/svg/svgfilter.cxx 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/svg/svgfilter.cxx 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/svg/svgfilter.cxx 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/svg/svgfilter.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -96,11 +96,9 @@
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -1608,8 +1467,8 @@
// -----------------------------------------------------------------------------
---- filter/source/svg/svgfilter.hxx 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/svg/svgfilter.hxx 2008-02-28 18:58:36.000000000 +0100
+--- filter/source/svg/svgfilter.hxx 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/svg/svgfilter.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -57,11 +57,9 @@
#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
#include <com/sun/star/document/XFilter.hpp>
@@ -1684,8 +1543,8 @@
// XExporter
virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/svgimport.cxx 2008-02-28 18:54:45.000000000 +0100
-+++ filter/source/svg/svgimport.cxx 2008-02-28 13:54:18.000000000 +0100
+--- filter/source/svg/svgimport.cxx 2008-03-03 11:43:33.000000000 +0100
++++ filter/source/svg/svgimport.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -37,160 +37,59 @@
#include "precompiled_filter.hxx"
@@ -1896,7 +1755,7 @@
}
--- filter/source/svg/svgreader.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.cxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/svgreader.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,1307 @@
+/*************************************************************************
+ *
@@ -3206,7 +3065,7 @@
+
+} // namespace svgi
--- filter/source/svg/svgreader.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/svgreader.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
@@ -3252,7 +3111,7 @@
+
+#endif
--- filter/source/svg/tokenmap.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.cxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/tokenmap.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
@@ -3317,7 +3176,7 @@
+
+} // namespace svgi
--- filter/source/svg/tokenmap.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/tokenmap.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
@@ -3352,8 +3211,8 @@
+
+#endif
--- filter/source/svg/tokens.txt 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokens.txt 2008-02-28 13:54:18.000000000 +0100
-@@ -0,0 +1,246 @@
++++ filter/source/svg/tokens.txt 2008-03-03 11:57:02.000000000 +0100
+@@ -0,0 +1,398 @@
+#######################################
+#
+# elements (SVG Tiny 1.2)
@@ -3600,9 +3459,160 @@
+y1
+y2
+zoomAndPan
-\ No newline at end of file
++#######################################
++#
++# colour values
++#
++#######################################
++aliceblue
++antiquewhite
++aqua
++aquamarine
++azure
++beige
++bisque
++black
++blanchedalmond
++blue
++blueviolet
++brown
++burlywood
++cadetblue
++chartreuse
++chocolate
++coral
++cornflowerblue
++cornsilk
++crimson
++cyan
++darkblue
++darkcyan
++darkgoldenrod
++darkgray
++darkgreen
++darkgrey
++darkkhaki
++darkmagenta
++darkolivegreen
++darkorange
++darkorchid
++darkred
++darksalmon
++darkseagreen
++darkslateblue
++darkslategray
++darkslategrey
++darkturquoise
++darkviolet
++deeppink
++deepskyblue
++dimgray
++dimgrey
++dodgerblue
++firebrick
++floralwhite
++forestgreen
++fuchsia
++gainsboro
++ghostwhite
++gold
++goldenrod
++gray
++grey
++green
++greenyellow
++honeydew
++hotpink
++indianred
++indigo
++ivory
++khaki
++lavender
++lavenderblush
++lawngreen
++lemonchiffon
++lightblue
++lightcoral
++lightcyan
++lightgoldenrodyellow
++lightgray
++lightgreen
++lightgrey
++lightpink
++lightsalmon
++lightseagreen
++lightskyblue
++lightslategray
++lightslategrey
++lightsteelblue
++lightyellow
++lime
++limegreen
++linen
++magenta
++maroon
++mediumaquamarine
++mediumblue
++mediumorchid
++mediumpurple
++mediumseagreen
++mediumslateblue
++mediumspringgreen
++mediumturquoise
++mediumvioletred
++midnightblue
++mintcream
++mistyrose
++moccasin
++navajowhite
++navy
++oldlace
++olive
++olivedrab
++orange
++orangered
++orchid
++palegoldenrod
++palegreen
++paleturquoise
++palevioletred
++papayawhip
++peachpuff
++peru
++pink
++plum
++powderblue
++purple
++red
++rosybrown
++royalblue
++saddlebrown
++salmon
++sandybrown
++seagreen
++seashell
++sienna
++silver
++skyblue
++slateblue
++slategray
++slategrey
++snow
++springgreen
++steelblue
++tan
++teal
++thistle
++tomato
++turquoise
++violet
++wheat
++white
++whitesmoke
++yellow
++yellowgreen
--- filter/source/svg/units.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.cxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/units.cxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
@@ -3715,7 +3725,7 @@
+
+} // namespace svgi
--- filter/source/svg/units.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.hxx 2008-02-28 13:54:18.000000000 +0100
++++ filter/source/svg/units.hxx 2008-02-29 10:27:32.000000000 +0100
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
