GNOME.org
 

ooo-build r15214 - in trunk: . patches/dev300

Author: kyoshida
Date: Wed Jan 28 16:24:20 2009
New Revision: 15214
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15214&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/svg-import-filter-m39.diff:
	* patches/dev300/svg-import-filter.diff: 	
	* patches/dev300/apply: adjusted for dev300-m40.  Thorsten, please 
	check.



Added:
   trunk/patches/dev300/svg-import-filter-m39.diff
      - copied unchanged from r15209, /trunk/patches/dev300/svg-import-filter.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/svg-import-filter.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 16:24:20 2009
@@ -2550,11 +2550,17 @@
 jvmfwk-gij32.diff, n#222708, pmladek
 
 
-[ SVGImport ]
+[ SVGImport <= dev300-m39 ]
+# A bit less partial implementation of SVG import
+# Work in progress, but fairly usable already
+svg-import-filter-m39.diff, thorsten
+
+[ SVGImport > dev300-m39 ]
 # A bit less partial implementation of SVG import
 # Work in progress, but fairly usable already
 svg-import-filter.diff, thorsten
 
+[ SVGImport ]
 # like svg-import-filter.diff, but adds a graphic filter for SVG
 svg-import-filter-gfxfilter.diff, thorsten
 

Modified: trunk/patches/dev300/svg-import-filter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter.diff	Wed Jan 28 16:24:20 2009
@@ -1,33 +1,4 @@
- .../source/config/fragments/fcfg_drawgraphics.mk   |    1 
- .../filters/SVG___Scalable_Vector_Graphics.xcu     |   13 
- .../types/svg_Scalable_Vector_Graphics.xcu         |    6 
- filter/source/svg/b2dellipse.cxx                   |  139 +
- filter/source/svg/b2dellipse.hxx                   |   77 +
- filter/source/svg/exports.map                      |    4 
- filter/source/svg/gentoken.pl                      |   58 +
- filter/source/svg/gfxtypes.hxx                     |  356 ++++
- filter/source/svg/makefile.mk                      |   50 -
- filter/source/svg/parserfragments.cxx              |  553 ++++++
- filter/source/svg/parserfragments.hxx              |   50 +
- filter/source/svg/spirit_supplements.hxx           |   94 +
- filter/source/svg/svgfilter.cxx                    |  121 +
- filter/source/svg/svgfilter.hxx                    |   39 
- filter/source/svg/svgimport.cxx                    |  191 --
- filter/source/svg/svgreader.cxx                    | 1876 ++++++++++++++++++++
- filter/source/svg/svgreader.hxx                    |   43 
- filter/source/svg/test/makefile.mk                 |  114 +
- filter/source/svg/test/odfserializer.cxx           |  140 +
- filter/source/svg/test/odfserializer.hxx           |   31 
- filter/source/svg/test/parsertest.cxx              |  210 ++
- filter/source/svg/test/svg2odf.cxx                 |  124 +
- filter/source/svg/tokenmap.cxx                     |   62 +
- filter/source/svg/tokenmap.hxx                     |   32 
- filter/source/svg/tokens.txt                       |  403 ++++
- filter/source/svg/units.cxx                        |   99 +
- filter/source/svg/units.hxx                        |   60 +
- 27 files changed, 4682 insertions(+), 264 deletions(-)
-
-diff --git a/filter/source/config/fragments/fcfg_drawgraphics.mk b/filter/source/config/fragments/fcfg_drawgraphics.mk
+diff --git filter/source/config/fragments/fcfg_drawgraphics.mk filter/source/config/fragments/fcfg_drawgraphics.mk
 index 7038e27..41a4625 100644
 --- filter/source/config/fragments/fcfg_drawgraphics.mk
 +++ filter/source/config/fragments/fcfg_drawgraphics.mk
@@ -39,7 +10,7 @@
      TGA___Truevision_TARGA \
      TIF___Tag_Image_File \
      WMF___MS_Windows_Metafile \
-diff --git a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
+diff --git filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
 new file mode 100644
 index 0000000..7a1b9a5
 --- /dev/null
@@ -58,7 +29,7 @@
 +		<prop oor:name="TemplateName"/>
 +		<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
 +	</node>
-diff --git a/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
+diff --git filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
 index 31fc7fc..910ebe9 100644
 --- filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
 +++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
@@ -76,7 +47,7 @@
  		<prop oor:name="UIName">
  			<value>SVG - Scalable Vector Graphics</value>
  		</prop>
-diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx
+diff --git filter/source/svg/b2dellipse.cxx filter/source/svg/b2dellipse.cxx
 new file mode 100644
 index 0000000..a93beb2
 --- /dev/null
@@ -221,7 +192,7 @@
 +
 +//////////////////////////////////////////////////////////////////////////////
 +// eof
-diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
+diff --git filter/source/svg/b2dellipse.hxx filter/source/svg/b2dellipse.hxx
 new file mode 100644
 index 0000000..0708fdf
 --- /dev/null
@@ -304,7 +275,7 @@
 +//////////////////////////////////////////////////////////////////////////////
 +
 +#endif /* _BASEGFX_B2DELLIPSE_HXX */
-diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
+diff --git filter/source/svg/exports.map filter/source/svg/exports.map
 index c673092..acb4748 100644
 --- filter/source/svg/exports.map
 +++ filter/source/svg/exports.map
@@ -321,7 +292,7 @@
 -}; 
 \ No newline at end of file
 +}; 
-diff --git a/filter/source/svg/gentoken.pl b/filter/source/svg/gentoken.pl
+diff --git filter/source/svg/gentoken.pl filter/source/svg/gentoken.pl
 new file mode 100644
 index 0000000..124457f
 --- /dev/null
@@ -385,9 +356,9 @@
 +print ( HXX "#endif\n" );
 +close ( HXX );
 +close ( GPERF );
-diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
+diff --git filter/source/svg/gfxtypes.hxx filter/source/svg/gfxtypes.hxx
 new file mode 100644
-index 0000000..d21f821
+index 0000000..09a6660
 --- /dev/null
 +++ filter/source/svg/gfxtypes.hxx
 @@ -0,0 +1,356 @@
@@ -747,11 +718,11 @@
 +} // namespace svgi
 +
 +#endif
-diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
-index f63be94..aa54c9e 100644
+diff --git filter/source/svg/makefile.mk filter/source/svg/makefile.mk
+index 5d8e187..29c065e 100644
 --- filter/source/svg/makefile.mk
 +++ filter/source/svg/makefile.mk
-@@ -30,24 +30,34 @@
+@@ -30,25 +30,35 @@
  #*************************************************************************
  
  PRJ=..$/..
@@ -760,6 +731,7 @@
  TARGET=svgfilter
 -
  ENABLE_EXCEPTIONS=TRUE
+ VISIBILITY_HIDDEN=TRUE
  
  # --- Settings ----------------------------------
  
@@ -793,7 +765,7 @@
  .ENDIF
  
  # --- Library -----------------------------------
-@@ -55,22 +65,19 @@ SLOFILES+=		$(SLO)$/svgimport.obj
+@@ -56,22 +66,19 @@ SLOFILES+=		$(SLO)$/svgimport.obj
  SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
  
  SHL1STDLIBS=\
@@ -821,7 +793,7 @@
  
  SHL1DEPN=
  SHL1IMPLIB=	i$(SHL1TARGET)
-@@ -83,3 +90,16 @@ DEF1NAME=$(SHL1TARGET)
+@@ -84,3 +91,16 @@ DEF1NAME=$(SHL1TARGET)
  # --- Targets ----------------------------------
  
  .INCLUDE : target.mk
@@ -838,7 +810,7 @@
 +$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 +
 +$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
+diff --git filter/source/svg/parserfragments.cxx filter/source/svg/parserfragments.cxx
 new file mode 100644
 index 0000000..9d78625
 --- /dev/null
@@ -1397,7 +1369,7 @@
 +}
 +
 +} // namespace svgi
-diff --git a/filter/source/svg/parserfragments.hxx b/filter/source/svg/parserfragments.hxx
+diff --git filter/source/svg/parserfragments.hxx filter/source/svg/parserfragments.hxx
 new file mode 100644
 index 0000000..c76b44b
 --- /dev/null
@@ -1453,9 +1425,9 @@
 +} // namespace svgi
 +
 +#endif
-diff --git a/filter/source/svg/spirit_supplements.hxx b/filter/source/svg/spirit_supplements.hxx
+diff --git filter/source/svg/spirit_supplements.hxx filter/source/svg/spirit_supplements.hxx
 new file mode 100644
-index 0000000..3a40e14
+index 0000000..43db8e6
 --- /dev/null
 +++ filter/source/svg/spirit_supplements.hxx
 @@ -0,0 +1,115 @@
@@ -1574,7 +1546,7 @@
 +
 +# endif
 +#endif
-diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
+diff --git filter/source/svg/svgfilter.cxx filter/source/svg/svgfilter.cxx
 index bc194c0..5b3c985 100644
 --- filter/source/svg/svgfilter.cxx
 +++ filter/source/svg/svgfilter.cxx
@@ -1746,7 +1718,7 @@
 +
 +// The C shared lib entry points
 +COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter)
-diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
+diff --git filter/source/svg/svgfilter.hxx filter/source/svg/svgfilter.hxx
 index 43b73d3..b1123cc 100644
 --- filter/source/svg/svgfilter.hxx
 +++ filter/source/svg/svgfilter.hxx
@@ -1840,7 +1812,7 @@
  };
  
  // -----------------------------------------------------------------------------
-diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
+diff --git filter/source/svg/svgimport.cxx filter/source/svg/svgimport.cxx
 index be0329f..b8a079b 100644
 --- filter/source/svg/svgimport.cxx
 +++ filter/source/svg/svgimport.cxx
@@ -2050,9 +2022,9 @@
 +    return aReader.parseAndConvert();
  }
      
-diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
+diff --git filter/source/svg/svgreader.cxx filter/source/svg/svgreader.cxx
 new file mode 100644
-index 0000000..2714f05
+index 0000000..ce3bc85
 --- /dev/null
 +++ filter/source/svg/svgreader.cxx
 @@ -0,0 +1,1876 @@
@@ -3932,7 +3904,7 @@
 +}
 +
 +} // namespace svgi
-diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
+diff --git filter/source/svg/svgreader.hxx filter/source/svg/svgreader.hxx
 new file mode 100644
 index 0000000..420d326
 --- /dev/null
@@ -3981,7 +3953,7 @@
 +} // namespace svgi
 +
 +#endif
-diff --git a/filter/source/svg/test/makefile.mk b/filter/source/svg/test/makefile.mk
+diff --git filter/source/svg/test/makefile.mk filter/source/svg/test/makefile.mk
 new file mode 100644
 index 0000000..3f14c88
 --- /dev/null
@@ -4101,7 +4073,7 @@
 +ALLTAR : $(BIN)$/svgi_unittest_test.ini \
 +		 $(BIN)$/unittestservices.rdb \
 +         $(foreach,i,$(TESTFILES:s/.svg/_svgi_unittest_succeeded/:f) $(MISC)$/$i)
-diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
+diff --git filter/source/svg/test/odfserializer.cxx filter/source/svg/test/odfserializer.cxx
 new file mode 100644
 index 0000000..7686223
 --- /dev/null
@@ -4247,7 +4219,7 @@
 +}
 +
 +}
-diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx
+diff --git filter/source/svg/test/odfserializer.hxx filter/source/svg/test/odfserializer.hxx
 new file mode 100644
 index 0000000..f2ab4a3
 --- /dev/null
@@ -4284,7 +4256,7 @@
 +}
 +
 +#endif // _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HDL_
-diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx
+diff --git filter/source/svg/test/parsertest.cxx filter/source/svg/test/parsertest.cxx
 new file mode 100644
 index 0000000..c8db101
 --- /dev/null
@@ -4500,7 +4472,7 @@
 +// to let the user the possibility to also register some functions by hand.
 +NOADDITIONAL;
 +
-diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
+diff --git filter/source/svg/test/svg2odf.cxx filter/source/svg/test/svg2odf.cxx
 new file mode 100644
 index 0000000..a271ce0
 --- /dev/null
@@ -4630,7 +4602,7 @@
 +                            svgi::createSerializer(new OutputWrap(aDstURL)));
 +    return aReader.parseAndConvert() ? 0 : 1;
 +}
-diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx
+diff --git filter/source/svg/tokenmap.cxx filter/source/svg/tokenmap.cxx
 new file mode 100644
 index 0000000..d9fb57a
 --- /dev/null
@@ -4698,7 +4670,7 @@
 +}
 +
 +} // namespace svgi
-diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx
+diff --git filter/source/svg/tokenmap.hxx filter/source/svg/tokenmap.hxx
 new file mode 100644
 index 0000000..c77def6
 --- /dev/null
@@ -4736,7 +4708,7 @@
 +} // namespace svgi
 +
 +#endif
-diff --git a/filter/source/svg/tokens.txt b/filter/source/svg/tokens.txt
+diff --git filter/source/svg/tokens.txt filter/source/svg/tokens.txt
 new file mode 100644
 index 0000000..1211e69
 --- /dev/null
@@ -5145,7 +5117,7 @@
 +#######################################
 +userSpaceOnUse
 +objectBoundingBox
-diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx
+diff --git filter/source/svg/units.cxx filter/source/svg/units.cxx
 new file mode 100644
 index 0000000..b4f9d94
 --- /dev/null
@@ -5250,7 +5222,7 @@
 +}
 +
 +} // namespace svgi
-diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx
+diff --git filter/source/svg/units.hxx filter/source/svg/units.hxx
 new file mode 100644
 index 0000000..e48b5d5
 --- /dev/null
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]