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

From: thorstenb svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13119 - in trunk: . patches/dev300
Date: Tue, 8 Jul 2008 22:28:32 +0000 (UTC)
Author: thorstenb
Date: Tue Jul  8 22:28:32 2008
New Revision: 13119
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13119&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/svg-import-standalone-conv.diff: clean-up
	* patches/dev300/svg-import-filter.diff:
	* patches/dev300/svg-import-filter-gfxfilter.diff: updated, also
	some clean-ups, and added own type detection, that checks for
	opening "<svg" tag, or "DOCTYPE svg" in the first 1k of the file



Removed:
   trunk/patches/dev300/svg-import-standalone-conv.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/svg-import-filter-gfxfilter.diff
   trunk/patches/dev300/svg-import-filter.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul  8 22:28:32 2008
@@ -1880,9 +1880,6 @@
 # like svg-import-filter.diff, but adds a graphic filter for SVG
 svg-import-filter-gfxfilter.diff, thorsten
 
-# standalone converter binary - for testing, etc.
-# svg-import-standalone-conv.diff
-
 [ SVGImport < dev300-m22 >= beb300-m1 ]
 svg-import-basegfx.diff, thorsten
 

Modified: trunk/patches/dev300/svg-import-filter-gfxfilter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter-gfxfilter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter-gfxfilter.diff	Tue Jul  8 22:28:32 2008
@@ -1,6 +1,16 @@
-diff -ur filter_orig/source/config/fragments/internalgraphicfilters/svg_Export.xcu filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
---- filter_orig/source/config/fragments/internalgraphicfilters/svg_Export.xcu	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu	2008-05-28 02:30:15.000000000 +0200
+ .../internalgraphicfilters/svg_Export.xcu          |   10 
+ filter/source/svg/exports.map                      |    1 
+ filter/source/svg/makefile.mk                      |    1 
+ filter/source/svg/svgfilter.cxx                    |    9 
+ filter/source/svg/svgfilter.hxx                    |    7 
+ filter/source/svg/svgreader.cxx                    |  767 ++++++++++++++++++++
+ filter/source/svg/test/makefile.mk                 |    1 
+ 7 files changed, 792 insertions(+), 4 deletions(-)
+
+diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
+index 8b73f15..f0cd69d 100644
+--- filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
++++ filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
 @@ -8,3 +8,13 @@
  		</prop>
  		<prop oor:name="Flags"><value>EXPORT</value></prop>
@@ -15,10 +25,11 @@
 +		</prop>
 +		<prop oor:name="Flags"><value>IMPORT</value></prop>
 +	</node>
-diff -ur filter_orig/source/svg/exports.map filter/source/svg/exports.map
---- filter_orig/source/svg/exports.map	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/exports.map	2008-05-27 23:32:34.000000000 +0200
-@@ -3,6 +3,7 @@
+diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
+index acb4748..d56c225 100644
+--- filter/source/svg/exports.map
++++ filter/source/svg/exports.map
+@@ -3,6 +3,7 @@ SVGFILTER_1_0 {
                  component_getImplementationEnvironment;
                  component_getFactory;
                  component_writeInfo;
@@ -26,10 +37,11 @@
  
          local:
                  *;
-diff -ur filter_orig/source/svg/makefile.mk filter/source/svg/makefile.mk
---- filter_orig/source/svg/makefile.mk	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/makefile.mk	2008-05-28 02:16:23.000000000 +0200
-@@ -78,6 +78,7 @@
+diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
+index f5682cc..e24734b 100644
+--- filter/source/svg/makefile.mk
++++ filter/source/svg/makefile.mk
+@@ -74,6 +74,7 @@ SHL1STDLIBS=\
  	$(UNOTOOLSLIB)		\
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\
@@ -37,25 +49,35 @@
  	$(CPPUHELPERLIB)	\
  	$(CPPULIB)			\
  	$(SALLIB)			\
-diff -ur filter_orig/source/svg/svgfilter.cxx filter/source/svg/svgfilter.cxx
---- filter_orig/source/svg/svgfilter.cxx	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/svgfilter.cxx	2008-05-27 23:32:59.000000000 +0200
-@@ -243,3 +243,11 @@
- {
-     return SVGFilter_getSupportedServiceNames();
- }
-+
-+// -----------------------------------------------------------------------------
-+
+diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
+index 9efbed7..de1e638 100644
+--- filter/source/svg/svgfilter.cxx
++++ filter/source/svg/svgfilter.cxx
+@@ -208,6 +208,14 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
+ 
+ // -----------------------------------------------------------------------------
+ 
 +class FilterConfigItem;
 +extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
 +{
 +	return importSvg( rStream, rGraphic );
 +}
-diff -ur filter_orig/source/svg/svgfilter.hxx filter/source/svg/svgfilter.hxx
---- filter_orig/source/svg/svgfilter.hxx	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/svgfilter.hxx	2008-05-27 23:03:42.000000000 +0200
-@@ -328,4 +328,11 @@
++
++// -----------------------------------------------------------------------------
++
+ namespace sdecl = comphelper::service_decl;
+  sdecl::class_<SVGFilter> serviceImpl;
+  const sdecl::ServiceDecl svgFilter(
+@@ -219,3 +227,4 @@ namespace sdecl = comphelper::service_decl;
+ 
+ // The C shared lib entry points
+ COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter)
++
+diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
+index dcb8065..b057a5e 100644
+--- filter/source/svg/svgfilter.hxx
++++ filter/source/svg/svgfilter.hxx
+@@ -271,4 +271,11 @@ sal_Bool SAL_CALL SVGFilter_supportsService( const ::rtl::OUString& ServiceName
  SAL_CALL SVGFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
  	throw ( ::com::sun::star::uno::Exception );
  
@@ -67,9 +89,10 @@
 +bool importSvg(SvStream & rStream, Graphic & rGraphic );
 +
  #endif // SVGFILTER_HXX
-diff -ur filter_orig/source/svg/svgreader.cxx filter/source/svg/svgreader.cxx
---- filter_orig/source/svg/svgreader.cxx	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/svgreader.cxx	2008-05-28 22:12:21.000000000 +0200
+diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
+index a486247..bb5447c 100644
+--- filter/source/svg/svgreader.cxx
++++ filter/source/svg/svgreader.cxx
 @@ -7,6 +7,7 @@
   *      Thorsten Behrens <tbehrens novell com>	   	
   *
@@ -96,7 +119,7 @@
  #include <boost/bind.hpp>
  #include <hash_set>
  #include <map>
-@@ -432,6 +444,9 @@
+@@ -432,6 +444,9 @@ struct AnnotatingVisitor
          // start&end color)
          optimizeGradientStops(rState.maFillGradient);
  
@@ -106,7 +129,7 @@
          // do we have a gradient fill? then write out gradient as well
          if( rState.meFillType == GRADIENT && rState.maFillGradient.maStops.size() > 1 )
          {
-@@ -1541,10 +1556,13 @@
+@@ -1541,10 +1556,13 @@ struct ShapeWritingVisitor
              for( sal_uInt32 i=0; i<rPoly.count(); ++i )
              {                
                  aPolys.push_back(
@@ -124,7 +147,7 @@
                  // TODO(F2): line ends
              }
  
-@@ -1896,4 +1914,745 @@
+@@ -1896,4 +1914,745 @@ sal_Bool SVGReader::parseAndConvert()
      return sal_True;
  }
  
@@ -870,10 +893,11 @@
 +}
 +
 +
-diff -ur filter_orig/source/svg/test/makefile.mk filter/source/svg/test/makefile.mk
---- filter_orig/source/svg/test/makefile.mk	2008-05-28 02:34:02.000000000 +0200
-+++ filter/source/svg/test/makefile.mk	2008-05-28 02:18:07.000000000 +0200
-@@ -40,6 +40,7 @@
+diff --git a/filter/source/svg/test/makefile.mk b/filter/source/svg/test/makefile.mk
+index c3adda5..90441e3 100644
+--- filter/source/svg/test/makefile.mk
++++ filter/source/svg/test/makefile.mk
+@@ -41,6 +41,7 @@ SHL1STDLIBS= 	        \
  	$(UNOTOOLSLIB)		\
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\

Modified: trunk/patches/dev300/svg-import-filter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter.diff	Tue Jul  8 22:28:32 2008
@@ -1,6 +1,38 @@
---- filter/source/config/fragments/fcfg_drawgraphics.mk	2008-04-11 08:49:31.000000000 +0200
-+++ filter/source/config/fragments/fcfg_drawgraphics.mk	2008-04-11 00:09:55.000000000 +0200
-@@ -54,6 +54,7 @@
+ .../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                    | 1899 ++++++++++++++++++++
+ filter/source/svg/svgreader.hxx                    |   43 
+ filter/source/svg/svguno.cxx                       |  105 -
+ filter/source/svg/test/makefile.mk                 |  124 +
+ 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                        |  112 +
+ filter/source/svg/units.hxx                        |   47 
+ 28 files changed, 4715 insertions(+), 369 deletions(-)
+
+diff --git a/filter/source/config/fragments/fcfg_drawgraphics.mk b/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
+@@ -54,6 +54,7 @@ F4_DRAWGRAPHICS = \
      SGF___StarOffice_Writer_SGF \
      SGV___StarDraw_2_0 \
      SVM___StarView_Metafile \
@@ -8,8 +40,11 @@
      TGA___Truevision_TARGA \
      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-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
+new file mode 100644
+index 0000000..7a1b9a5
+--- /dev/null
++++ filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
 @@ -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,12 +59,14 @@
 +		<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-04-11 08:49:31.000000000 +0200
-+++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu	2008-04-11 00:09:55.000000000 +0200
-@@ -1,12 +1,12 @@
+diff --git a/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu b/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
+@@ -1,10 +1,10 @@
  	<node oor:name="svg_Scalable_Vector_Graphics" oor:op="replace" >
 -		<prop oor:name="DetectService"/>
-+		<prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
++		<prop oor:name="DetectService"><value>com.sun.star.comp.Draw.SVGFilter</value></prop>
  		<prop oor:name="URLPattern"/>
  		<prop oor:name="Extensions"><value>svg</value></prop>
  		<prop oor:name="MediaType"><value>image/svg+xml</value></prop>
@@ -40,11 +77,11 @@
  		<prop oor:name="UIName">
  			<value>SVG - Scalable Vector Graphics</value>
  		</prop>
--		<prop oor:name="ClipboardFormat"/>
-+		<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-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx
+new file mode 100644
+index 0000000..a93beb2
+--- /dev/null
++++ filter/source/svg/b2dellipse.cxx
 @@ -0,0 +1,139 @@
 +/*************************************************************************
 + *
@@ -185,8 +222,11 @@
 +
 +//////////////////////////////////////////////////////////////////////////////
 +// eof
---- filter/source/svg/b2dellipse.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/b2dellipse.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
+new file mode 100644
+index 0000000..0708fdf
+--- /dev/null
++++ filter/source/svg/b2dellipse.hxx
 @@ -0,0 +1,77 @@
 +/*************************************************************************
 + *
@@ -265,23 +305,28 @@
 +//////////////////////////////////////////////////////////////////////////////
 +
 +#endif /* _BASEGFX_B2DELLIPSE_HXX */
---- filter/source/svg/exports.map	2008-04-11 08:49:31.000000000 +0200
-+++ filter/source/svg/exports.map	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
+index c673092..acb4748 100644
+--- filter/source/svg/exports.map
++++ filter/source/svg/exports.map
 @@ -1,4 +1,4 @@
 -PDFFILTER_1_0 {
 +SVGFILTER_1_0 {
          global:
                  component_getImplementationEnvironment;
                  component_getFactory;
-@@ -6,4 +6,4 @@
+@@ -6,4 +6,4 @@ PDFFILTER_1_0 {
  
          local:
                  *;
 -}; 
 \ 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-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/gentoken.pl b/filter/source/svg/gentoken.pl
+new file mode 100644
+index 0000000..124457f
+--- /dev/null
++++ filter/source/svg/gentoken.pl
 @@ -0,0 +1,58 @@
 +# from oox/source/token - should really put this into solenv
 +
@@ -341,8 +386,11 @@
 +print ( HXX "#endif\n" );
 +close ( HXX );
 +close ( GPERF );
---- filter/source/svg/gfxtypes.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/gfxtypes.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
+new file mode 100644
+index 0000000..d21f821
+--- /dev/null
++++ filter/source/svg/gfxtypes.hxx
 @@ -0,0 +1,356 @@
 +/*************************************************************************
 + *
@@ -700,9 +748,11 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/makefile.mk	2008-04-11 08:49:31.000000000 +0200
-+++ filter/source/svg/makefile.mk	2008-04-11 00:09:55.000000000 +0200
-@@ -34,24 +34,35 @@
+diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
+index 74e3908..f5682cc 100644
+--- filter/source/svg/makefile.mk
++++ filter/source/svg/makefile.mk
+@@ -30,24 +30,34 @@
  #*************************************************************************
  
  PRJ=..$/..
@@ -733,7 +783,6 @@
 -SLOFILES+=		$(SLO)$/svgimport.obj
 +			$(SLO)$/svgimport.obj		\
 +			$(SLO)$/svgreader.obj		\
-+			$(SLO)$/svguno.obj			\
 +			$(SLO)$/svgwriter.obj		\
 +			$(SLO)$/tokenmap.obj        \
 +			$(SLO)$/units.obj
@@ -745,14 +794,15 @@
  .ENDIF
  
  # --- Library -----------------------------------
-@@ -59,22 +70,18 @@
- SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
+@@ -55,22 +65,19 @@ SLOFILES+=		$(SLO)$/svgimport.obj
+ SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
  
  SHL1STDLIBS=\
 +	$(BASEGFXLIB)		\
  	$(SVXLIB)			\
  	$(XMLOFFLIB)		\
 -	$(GOODIESLIB)		\
++	$(SVTOOLLIB)	    \
 +	$(BASEGFXLIB)		\
  	$(VCLLIB)			\
  	$(UNOTOOLSLIB)		\
@@ -772,7 +822,7 @@
  
  SHL1DEPN=
  SHL1IMPLIB=	i$(SHL1TARGET)
-@@ -87,3 +94,16 @@
+@@ -83,3 +90,16 @@ DEF1NAME=$(SHL1TARGET)
  # --- Targets ----------------------------------
  
  .INCLUDE : target.mk
@@ -789,8 +839,11 @@
 +$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 +
 +$(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-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
+new file mode 100644
+index 0000000..9d78625
+--- /dev/null
++++ filter/source/svg/parserfragments.cxx
 @@ -0,0 +1,553 @@
 +/*************************************************************************
 + *
@@ -1345,8 +1398,11 @@
 +}
 +
 +} // namespace svgi
---- filter/source/svg/parserfragments.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/parserfragments.hxx b/filter/source/svg/parserfragments.hxx
+new file mode 100644
+index 0000000..c76b44b
+--- /dev/null
++++ filter/source/svg/parserfragments.hxx
 @@ -0,0 +1,50 @@
 +/*************************************************************************
 + *
@@ -1398,8 +1454,11 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/spirit_supplements.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/spirit_supplements.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/spirit_supplements.hxx b/filter/source/svg/spirit_supplements.hxx
+new file mode 100644
+index 0000000..3a40e14
+--- /dev/null
++++ filter/source/svg/spirit_supplements.hxx
 @@ -0,0 +1,94 @@
 +/*************************************************************************
 + *
@@ -1495,9 +1554,41 @@
 +
 +# endif
 +#endif
---- filter/source/svg/svgfilter.cxx	2008-04-11 08:49:31.000000000 +0200
-+++ filter/source/svg/svgfilter.cxx	2008-04-11 00:09:55.000000000 +0200
-@@ -96,11 +96,9 @@
+diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
+index 15d5d64..9efbed7 100644
+--- filter/source/svg/svgfilter.cxx
++++ filter/source/svg/svgfilter.cxx
+@@ -33,13 +33,16 @@
+ 
+ #include <cstdio>
+ 
+-#include "svgfilter.hxx" 
++#include <comphelper/servicedecl.hxx>
++#include <uno/environment.h>
+ #include <com/sun/star/drawing/XDrawPage.hpp>
+ #include <com/sun/star/drawing/XDrawView.hpp>
+ #include <com/sun/star/frame/XDesktop.hdl>
+ #include <com/sun/star/frame/XController.hdl>
+ #include <vos/mutex.hxx>
+ 
++#include "svgfilter.hxx" 
++
+ using ::rtl::OUString;
+ using namespace ::com::sun::star;
+ 
+@@ -47,8 +50,9 @@ using namespace ::com::sun::star;
+ // - SVGFilter -
+ // -------------
+ 
+-SVGFilter::SVGFilter( const Reference< XMultiServiceFactory > &rxMSF ) :
+-    mxMSF( rxMSF ),
++SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
++    mxMSF( rxCtx->getServiceManager(),
++           uno::UNO_QUERY_THROW ),
+     mpSVGDoc( NULL ),
+     mpSVGExport( NULL ),
+ 	mpSVGFontExport( NULL ),
+@@ -83,11 +87,9 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
      if( pFocusWindow )
      	pFocusWindow->EnterWait();
  
@@ -1509,7 +1600,7 @@
      if( mxSrcDoc.is() )
  	{
  		uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), 
-@@ -169,13 +167,11 @@
+@@ -156,77 +158,64 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc
  
  // -----------------------------------------------------------------------------
  
@@ -1523,45 +1614,122 @@
  
  // -----------------------------------------------------------------------------
  
-@@ -194,25 +190,29 @@
- 
- // -----------------------------------------------------------------------------
- 
--#define SERVICE_NAME "com.sun.star.document.SVGFilter"
-+#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
-+#define SERVICE_NAME2 "com.sun.star.document.ExportFilter"
- 
- sal_Bool SAL_CALL SVGFilter_supportsService( const OUString& ServiceName ) 
- 	throw (RuntimeException)
+-void SAL_CALL SVGFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) 
+-	throw (Exception, RuntimeException)
++rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException)
  {
--    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) );
-+	return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
-+		ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
++    uno::Reference< io::XInputStream > xInput;
++    rtl::OUString aURL;
++
++    const beans::PropertyValue* pAttribs = io_rDescriptor.getConstArray();
++    const sal_Int32 nAttribs = io_rDescriptor.getLength();
++    for( sal_Int32 i = 0; i < nAttribs; i++ )
++    {
++        if( pAttribs[i].Name.equalsAscii( "InputStream" ) )
++            pAttribs[i].Value >>= xInput;
++    }
++
++    if( !xInput.is() )
++        return rtl::OUString();
++
++    uno::Reference< io::XSeekable > xSeek( xInput, uno::UNO_QUERY );
++    if( xSeek.is() )
++        xSeek->seek( 0 );
++
++    // read the first 1024 bytes & check a few magic string
++    // constants (heuristically)
++    const sal_Int32 nLookAhead = 1024;
++    uno::Sequence< sal_Int8 > aBuf( nLookAhead );
++    const sal_uInt64 nBytes=xInput->readBytes(aBuf, nLookAhead);
++    const sal_Int8* const pBuf=aBuf.getConstArray();
++
++    sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'};
++    if( std::search(pBuf, pBuf+nBytes, 
++                    aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes )
++        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
++
++    sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'};
++    if( std::search(pBuf, pBuf+nBytes, 
++                    aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes )
++        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
++
++    return rtl::OUString();
  }
  
  // -----------------------------------------------------------------------------
  
- Sequence< OUString > SAL_CALL SVGFilter_getSupportedServiceNames(  ) throw (RuntimeException)
- {
+-OUString SVGFilter_getImplementationName ()
+-	throw (RuntimeException)
+-{
+-	return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.SVGFilter" ) );
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+-#define SERVICE_NAME "com.sun.star.document.SVGFilter"
+-
+-sal_Bool SAL_CALL SVGFilter_supportsService( const OUString& ServiceName ) 
+-	throw (RuntimeException)
+-{
+-    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) );
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+-Sequence< OUString > SAL_CALL SVGFilter_getSupportedServiceNames(  ) throw (RuntimeException)
+-{
 -	Sequence < OUString > aRet(1);
 -    OUString* pArray = aRet.getArray();
 -    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
 -    return aRet;
-+	Sequence < OUString > aRet(2);
-+	OUString* pArray = aRet.getArray();
-+	pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
-+	pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); 
-+	return aRet;
- }
- 
+-}
+-
 -#undef SERVICE_NAME
-+#undef SERVICE_NAME1
-+#undef SERVICE_NAME2
- 
- // -----------------------------------------------------------------------------
- 
---- filter/source/svg/svgfilter.hxx	2008-04-11 08:49:31.000000000 +0200
-+++ filter/source/svg/svgfilter.hxx	2008-04-11 00:09:55.000000000 +0200
+-
+-// -----------------------------------------------------------------------------
+-
+-Reference< XInterface > SAL_CALL SVGFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
+-{
+-	return (cppu::OWeakObject*) new SVGFilter( rSMgr );
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+-OUString SAL_CALL SVGFilter::getImplementationName(  ) 
+-	throw (RuntimeException)
+-{
+-	return SVGFilter_getImplementationName();
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+-sal_Bool SAL_CALL SVGFilter::supportsService( const OUString& rServiceName ) 
+-	throw (RuntimeException)
+-{
+-    return SVGFilter_supportsService( rServiceName );
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+-::com::sun::star::uno::Sequence< OUString > SAL_CALL SVGFilter::getSupportedServiceNames(  ) throw (RuntimeException)
+-{
+-    return SVGFilter_getSupportedServiceNames();
+-}
++namespace sdecl = comphelper::service_decl;
++ sdecl::class_<SVGFilter> serviceImpl;
++ const sdecl::ServiceDecl svgFilter(
++     serviceImpl,
++     "com.sun.star.comp.Draw.SVGFilter",
++     "com.sun.star.document.ImportFilter;"
++     "com.sun.star.document.ExportFilter;"
++     "com.sun.star.document.ExtendedTypeDetection" );
++
++// The C shared lib entry points
++COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter)
+diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
+index dc4b64e..dcb8065 100644
+--- filter/source/svg/svgfilter.hxx
++++ filter/source/svg/svgfilter.hxx
 @@ -38,20 +38,14 @@
  #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
  #include <com/sun/star/presentation/XPresentationSupplier.hpp>
@@ -1570,39 +1738,42 @@
  #include <com/sun/star/document/XImporter.hpp>
 -#endif // SOLAR_JAVA
  #include <com/sun/star/document/XExporter.hpp>
++#include <com/sun/star/document/XExtendedFilterDetection.hpp>
  #include <com/sun/star/lang/XInitialization.hpp>
  #include <com/sun/star/lang/XServiceInfo.hpp>
  #include <com/sun/star/beans/XPropertySet.hpp>
  #include <com/sun/star/lang/XComponent.hpp>
- #include <cppuhelper/implbase1.hxx>
+-#include <cppuhelper/implbase1.hxx>
 -#ifdef SOLAR_JAVA
- #include <cppuhelper/implbase5.hxx>
+-#include <cppuhelper/implbase5.hxx>
 -#else // !SOLAR_JAVA
--#include <cppuhelper/implbase4.hxx>
+ #include <cppuhelper/implbase4.hxx>
 -#endif
  #include <com/sun/star/lang/XMultiServiceFactory.hpp>
  #include <com/sun/star/io/XActiveDataSource.hpp>
  #include <com/sun/star/presentation/AnimationEffect.hpp>
-@@ -231,18 +223,11 @@
+@@ -178,18 +172,10 @@ class SVGFontExport;
  class SVGActionWriter;
  class EditFieldInfo;
  
 -#ifdef SOLAR_JAVA
- class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
- 											     XImporter,
-                                                  XExporter,
- 												 XInitialization,
- 												 XServiceInfo >
--#else // !SOLAR_JAVA
--class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
+-class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
+-											     XImporter,
 -                                                 XExporter,
+-												 XInitialization,
+-												 XServiceInfo >
+-#else // !SOLAR_JAVA
+ class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
++											     XImporter,
+                                                  XExporter,
 -                                                 XInitialization,
 -                                                 XServiceInfo >
 -#endif
++                                                 XExtendedFilterDetection >
  {
  	typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
  
-@@ -259,15 +244,11 @@
+@@ -206,15 +192,11 @@ private:
  
  	ObjectMap*							mpObjects;
  	Reference< XComponent >				mxSrcDoc;
@@ -1618,7 +1789,7 @@
  
      sal_Bool                            implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
      Reference< XDocumentHandler >       implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
-@@ -306,10 +287,8 @@
+@@ -253,26 +235,19 @@ protected:
      virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
      virtual void SAL_CALL cancel( ) throw (RuntimeException);
  
@@ -1629,9 +1800,31 @@
  
  	// XExporter
      virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/svgimport.cxx	2008-04-11 08:49:32.000000000 +0200
-+++ filter/source/svg/svgimport.cxx	2008-04-11 00:09:55.000000000 +0200
-@@ -37,160 +37,59 @@
+ 
+-	// XInitialization
+-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException);
+-
+-	// XServiceInfo
+-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException);
+-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException);
+-    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException);
++    // XExtendedFilterDetection
++    virtual rtl::OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException);
+ 
+ public:
+ 	
+-				SVGFilter( const Reference< XMultiServiceFactory > &rxMSF );
+-	virtual		~SVGFilter();
++    explicit SVGFilter( const Reference< XComponentContext >& rxCtx );
++	virtual	~SVGFilter();
+ };
+ 
+ // -----------------------------------------------------------------------------
+diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
+index 32c114c..1d27cf0 100644
+--- filter/source/svg/svgimport.cxx
++++ filter/source/svg/svgimport.cxx
+@@ -32,160 +32,59 @@
  #include "precompiled_filter.hxx"
  
  #include "svgfilter.hxx" 
@@ -1675,15 +1868,6 @@
 -	for( sal_Int32 i = 0 ; ( i < nLength ) && !aTmpFileName.getLength(); i++)
 -		if( pValue[ i ].Name.equalsAscii( "FileName" ) )
 -			pValue[ i ].Value >>= aTmpFileName;
--
--    if( aTmpFileName.getLength() && xServiceFactory.is() )
--    {
--
--	    Reference< XJavaVM >    xJavaVM( xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), UNO_QUERY );
--        Sequence< sal_Int8 >    aProcessID( 17 );
--		String					aLocalFile;
--
--		if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpFileName, aLocalFile ) && aLocalFile.Len() )
 +    rtl::OUString aURL;
 +    uno::Reference< io::XInputStream > xInputStream;
 +    uno::Reference< task::XStatusIndicator > xStatus;
@@ -1692,7 +1876,27 @@
 +    for ( sal_Int32 i=0 ; i<nLength; ++i, ++pAttribs )
 +	{
 +        if( pAttribs->Name.equalsAscii( "InputStream" ) )
-         {
++        {
++            pAttribs->Value >>= xInputStream;
++        }
++        else if( pAttribs->Name.equalsAscii( "StatusIndicator" ) )
++            pAttribs->Value >>= xStatus;
++	}
+ 
+-    if( aTmpFileName.getLength() && xServiceFactory.is() )
+-    {
++    OSL_ASSERT(xInputStream.is());
++    if(!xInputStream.is()) 
++        return sal_False;
+ 
+-	    Reference< XJavaVM >    xJavaVM( xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), UNO_QUERY );
+-        Sequence< sal_Int8 >    aProcessID( 17 );
+-		String					aLocalFile;
++	rtl::OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
++	Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
+ 
+-		if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpFileName, aLocalFile ) && aLocalFile.Len() )
+-        {
 -			rtl_getGlobalProcessId( (sal_uInt8 *) aProcessID.getArray() );
 -            aProcessID[16] = 0;            
 -		
@@ -1725,7 +1929,10 @@
 -					aMId = pEnv->GetStaticMethodID( aClass, "main", "([Ljava/lang/String;)V" );
 -					if ( aMId )
 -					{
--
++	// The XImporter sets up an empty target document for XDocumentHandler to write to.. 
++	uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
++	xImporter->setTargetDocument(mxDstDoc);
+ 
 -						::utl::TempFile aTempFile;
 -						String			aOutputURL( aTempFile.GetURL() );
 -						String			aOutputFile;
@@ -1819,29 +2026,15 @@
 -        }            
 -    }
 -    return bRet;
-+            pAttribs->Value >>= xInputStream;
-+        }
-+        else if( pAttribs->Name.equalsAscii( "StatusIndicator" ) )
-+            pAttribs->Value >>= xStatus;
-+	}
-+
-+    OSL_ASSERT(xInputStream.is());
-+    if(!xInputStream.is()) 
-+        return sal_False;
-+
-+	rtl::OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
-+	Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
-+
-+	// The XImporter sets up an empty target document for XDocumentHandler to write to.. 
-+	uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
-+	xImporter->setTargetDocument(mxDstDoc);
-+
 +    SVGReader aReader(mxMSF, xInputStream, xInternalHandler);
 +    return aReader.parseAndConvert();
  }
      
---- filter/source/svg/svgreader.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.cxx	2008-04-11 09:33:30.000000000 +0200
+diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
+new file mode 100644
+index 0000000..a486247
+--- /dev/null
++++ filter/source/svg/svgreader.cxx
 @@ -0,0 +1,1899 @@
 +/*************************************************************************
 + *
@@ -3742,8 +3935,11 @@
 +}
 +
 +} // namespace svgi
---- filter/source/svg/svgreader.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
+new file mode 100644
+index 0000000..420d326
+--- /dev/null
++++ filter/source/svg/svgreader.hxx
 @@ -0,0 +1,43 @@
 +/*************************************************************************
 + *
@@ -3788,9 +3984,123 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/test/makefile.mk	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/test/makefile.mk	2008-05-23 11:23:50.000000000 +0200
-@@ -0,0 +1,123 @@
+diff --git a/filter/source/svg/svguno.cxx b/filter/source/svg/svguno.cxx
+deleted file mode 100644
+index 22f3215..0000000
+--- filter/source/svg/svguno.cxx
++++ /dev/null
+@@ -1,105 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile$
+- * $Revision$
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-
+-// MARKER(update_precomp.py): autogen include statement, do not remove
+-#include "precompiled_filter.hxx"
+-
+-#include <stdio.h>
+-#include <osl/mutex.hxx>
+-#include <osl/thread.h>
+-#include <cppuhelper/factory.hxx>
+-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+-
+-#include <svgfilter.hxx>
+-
+-using ::rtl::OUString;
+-using namespace ::cppu;
+-using namespace ::com::sun::star::uno;
+-using namespace ::com::sun::star::lang;
+-using namespace ::com::sun::star::registry;
+-
+-extern "C"
+-{
+-    //==================================================================================================
+-    void SAL_CALL component_getImplementationEnvironment(
+-	    const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+-    {
+-	    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+-    }
+-    //==================================================================================================
+-    sal_Bool SAL_CALL component_writeInfo(
+-	    void * /* pServiceManager */, void * pRegistryKey )
+-    {
+-	    if (pRegistryKey)
+-	    {
+-		    try
+-		    {
+-			    Reference< XRegistryKey > xNewKey(
+-				    reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SVGFilter_getImplementationName() ) ); 
+-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+-			    
+-			    const Sequence< OUString > & rSNL = SVGFilter_getSupportedServiceNames();
+-			    const OUString * pArray = rSNL.getConstArray();
+-			    for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
+-				    xNewKey->createKey( pArray[nPos] );
+-
+-			    return sal_True;
+-		    }
+-		    catch (InvalidRegistryException &)
+-		    {
+-			    OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+-		    }
+-	    }
+-	    return sal_False;
+-    }
+-    //==================================================================================================
+-    void * SAL_CALL component_getFactory(
+-	    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+-    {
+-	    void * pRet = 0;
+-	    
+-        OUString implName = OUString::createFromAscii( pImplName );
+-	    if ( pServiceManager && implName.equals(SVGFilter_getImplementationName()) )
+-	    {
+-		    Reference< XSingleServiceFactory > xFactory( createSingleFactory(
+-			    reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+-			    OUString::createFromAscii( pImplName ),
+-			    SVGFilter_createInstance, SVGFilter_getSupportedServiceNames() ) );
+-		    
+-		    if (xFactory.is())
+-		    {
+-			    xFactory->acquire();
+-			    pRet = xFactory.get();
+-		    }
+-	    }
+-	    
+-	    return pRet;
+-    }
+-}
+diff --git a/filter/source/svg/test/makefile.mk b/filter/source/svg/test/makefile.mk
+new file mode 100644
+index 0000000..c3adda5
+--- /dev/null
++++ filter/source/svg/test/makefile.mk
+@@ -0,0 +1,124 @@
 +#*************************************************************************
 +#
 +#    OpenOffice.org - a multi-platform office productivity suite
@@ -3827,6 +4137,7 @@
 +SHL1STDLIBS= 	        \
 +	$(BASEGFXLIB)		\
 +	$(SVXLIB)			\
++	$(SVTOOLLIB)	    \
 +	$(XMLOFFLIB)		\
 +	$(BASEGFXLIB)		\
 +	$(VCLLIB)			\
@@ -3914,9 +4225,11 @@
 +#ALLTAR : $(BIN)$/svgi_unittest_test.ini \
 +#		 $(BIN)$/unittestservices.rdb \
 +#         $(foreach,i,$(TESTFILES:s/.svg/_svgi_unittest_succeeded/:f) $(MISC)$/$i)
-diff -urN /tmp/svgfilter/filter/source/svg/test/odfserializer.cxx /builds/oobuild/ooo-build-2.4/build/current/filter/source/svg/test/odfserializer.cxx
---- filter/source/svg/test/odfserializer.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/test/odfserializer.cxx	2008-05-23 10:23:53.000000000 +0200
+diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
+new file mode 100644
+index 0000000..7686223
+--- /dev/null
++++ filter/source/svg/test/odfserializer.cxx
 @@ -0,0 +1,140 @@
 +/*************************************************************************
 + *
@@ -4058,9 +4371,11 @@
 +}
 +
 +}
-diff -urN /tmp/svgfilter/filter/source/svg/test/odfserializer.hxx /builds/oobuild/ooo-build-2.4/build/current/filter/source/svg/test/odfserializer.hxx
---- filter/source/svg/test/odfserializer.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/test/odfserializer.hxx	2008-05-23 10:23:53.000000000 +0200
+diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx
+new file mode 100644
+index 0000000..f2ab4a3
+--- /dev/null
++++ filter/source/svg/test/odfserializer.hxx
 @@ -0,0 +1,31 @@
 +/*************************************************************************
 + *
@@ -4093,9 +4408,11 @@
 +}
 +
 +#endif // _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HDL_
-diff -urN /tmp/svgfilter/filter/source/svg/test/parsertest.cxx /builds/oobuild/ooo-build-2.4/build/current/filter/source/svg/test/parsertest.cxx
---- filter/source/svg/test/parsertest.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/test/parsertest.cxx	2008-05-23 15:52:49.000000000 +0200
+diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx
+new file mode 100644
+index 0000000..c8db101
+--- /dev/null
++++ filter/source/svg/test/parsertest.cxx
 @@ -0,0 +1,210 @@
 +/*************************************************************************
 + *
@@ -4307,9 +4624,11 @@
 +// to let the user the possibility to also register some functions by hand.
 +NOADDITIONAL;
 +
-diff -urN /tmp/svgfilter/filter/source/svg/test/svg2odf.cxx /builds/oobuild/ooo-build-2.4/build/current/filter/source/svg/test/svg2odf.cxx
---- filter/source/svg/test/svg2odf.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/test/svg2odf.cxx	2008-05-23 11:23:07.000000000 +0200
+diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
+new file mode 100644
+index 0000000..a271ce0
+--- /dev/null
++++ filter/source/svg/test/svg2odf.cxx
 @@ -0,0 +1,124 @@
 +/*************************************************************************
 + *
@@ -4435,8 +4754,11 @@
 +                            svgi::createSerializer(new OutputWrap(aDstURL)));
 +    return aReader.parseAndConvert() ? 0 : 1;
 +}
---- filter/source/svg/tokenmap.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.cxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx
+new file mode 100644
+index 0000000..d9fb57a
+--- /dev/null
++++ filter/source/svg/tokenmap.cxx
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -4500,8 +4822,11 @@
 +}
 +
 +} // namespace svgi
---- filter/source/svg/tokenmap.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx
+new file mode 100644
+index 0000000..c77def6
+--- /dev/null
++++ filter/source/svg/tokenmap.hxx
 @@ -0,0 +1,32 @@
 +/*************************************************************************
 + *
@@ -4535,8 +4860,11 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/tokens.txt	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokens.txt	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/tokens.txt b/filter/source/svg/tokens.txt
+new file mode 100644
+index 0000000..1211e69
+--- /dev/null
++++ filter/source/svg/tokens.txt
 @@ -0,0 +1,403 @@
 +#######################################
 +#
@@ -4941,8 +5269,11 @@
 +#######################################
 +userSpaceOnUse
 +objectBoundingBox
---- filter/source/svg/units.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.cxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx
+new file mode 100644
+index 0000000..16fe8ab
+--- /dev/null
++++ filter/source/svg/units.cxx
 @@ -0,0 +1,112 @@
 +/*************************************************************************
 + *
@@ -5056,8 +5387,11 @@
 +}
 +
 +} // namespace svgi
---- filter/source/svg/units.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.hxx	2008-04-11 00:09:55.000000000 +0200
+diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx
+new file mode 100644
+index 0000000..8e20fcf
+--- /dev/null
++++ filter/source/svg/units.hxx
 @@ -0,0 +1,47 @@
 +/*************************************************************************
 + *
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]