GNOME.org
 

ooo-build r11670 - trunk/patches/src680

Author: strba
Date: Thu Feb 21 20:14:36 2008
New Revision: 11670
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11670&view=rev

Log:
make it really import something

Modified:
   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	Thu Feb 21 20:14:36 2008
@@ -1,5 +1,5 @@
---- filter/source/config/fragments/fcfg_drawgraphics.mk	2005-03-21 12:45:41.000000000 +0100
-+++ filter/source/config/fragments/fcfg_drawgraphics.mk	2008-02-21 16:35:51.000000000 +0100
+--- filter/source/config/fragments/fcfg_drawgraphics.mk	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/config/fragments/fcfg_drawgraphics.mk	2008-02-21 17:30:17.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-21 16:33:54.000000000 +0100
++++ filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu	2008-02-21 20:42:40.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	2005-07-20 13:40:16.000000000 +0200
-+++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu	2008-02-21 16:36:30.000000000 +0100
+--- filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu	2008-02-21 17:30:17.000000000 +0100
 @@ -1,12 +1,12 @@
  	<node oor:name="svg_Scalable_Vector_Graphics" oor:op="replace" >
 -		<prop oor:name="DetectService"/>
@@ -43,8 +43,8 @@
 -		<prop oor:name="ClipboardFormat"/>
 +		<prop oor:name="ClipboardFormat"><value>doctype:xmlns="http://www.w3.org/2000/svg";</value></prop>
  	</node>
---- filter/source/svg/exports.map	2003-04-15 16:36:54.000000000 +0200
-+++ filter/source/svg/exports.map	2008-02-21 14:16:04.000000000 +0100
+--- filter/source/svg/exports.map	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/svg/exports.map	2008-02-21 17:30:17.000000000 +0100
 @@ -1,4 +1,4 @@
 -PDFFILTER_1_0 {
 +SVGFILTER_1_0 {
@@ -59,7 +59,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-21 14:16:04.000000000 +0100
++++ filter/source/svg/gentoken.pl	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,58 @@
 +# from oox/source/token - should really put this into solenv
 +
@@ -120,7 +120,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-21 14:48:45.000000000 +0100
++++ filter/source/svg/gfxtypes.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,309 @@
 +/*************************************************************************
 + *
@@ -431,8 +431,8 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/makefile.mk	2007-02-06 14:53:59.000000000 +0100
-+++ filter/source/svg/makefile.mk	2008-02-21 16:37:18.000000000 +0100
+--- filter/source/svg/makefile.mk	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/svg/makefile.mk	2008-02-21 17:30:17.000000000 +0100
 @@ -34,47 +34,46 @@
  #*************************************************************************
  
@@ -496,7 +496,7 @@
  
  SHL1DEPN=
  SHL1IMPLIB=	i$(SHL1TARGET)
-@@ -87,3 +87,15 @@
+@@ -87,3 +86,15 @@
  # --- Targets ----------------------------------
  
  .INCLUDE : target.mk
@@ -512,8 +512,17 @@
 +
 +$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 +
+diff -u -r -N filter/source/svg/makefile.mk.orig filter/source/svg/makefile.mk.orig
+--- filter/source/svg/makefile.mk.orig	2008-02-21 19:57:24.000000000 +0100
++++ filter/source/svg/makefile.mk.orig	2008-02-21 17:24:59.000000000 +0100
+@@ -96,5 +96,3 @@
+ 
+ $(SLO)$/tokenmap.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-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/parserfragments.cxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,347 @@
 +/*************************************************************************
 + *
@@ -863,7 +872,7 @@
 +    
 +} // namespace svgi
 --- filter/source/svg/parserfragments.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.hxx	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/parserfragments.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,45 @@
 +/*************************************************************************
 + *
@@ -910,15 +919,8 @@
 +} // namespace svgi
 +
 +#endif
---- filter/source/svg/README	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/README	2008-02-21 14:16:04.000000000 +0100
-@@ -0,0 +1,4 @@
-+Required patches:
-+
-+buildfix-xmloff-exportxforms.diff 
-+fix-linkoo.diff
---- filter/source/svg/svgfilter.cxx	2007-06-05 15:51:16.000000000 +0200
-+++ filter/source/svg/svgfilter.cxx	2008-02-21 14:58:46.000000000 +0100
+--- filter/source/svg/svgfilter.cxx	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/svg/svgfilter.cxx	2008-02-21 20:49:24.000000000 +0100
 @@ -96,11 +96,9 @@
      if( pFocusWindow )
      	pFocusWindow->EnterWait();
@@ -931,8 +933,59 @@
      if( mxSrcDoc.is() )
  	{
  		uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), 
---- filter/source/svg/svgfilter.hxx	2006-12-01 15:30:42.000000000 +0100
-+++ filter/source/svg/svgfilter.hxx	2008-02-21 15:19:06.000000000 +0100
+@@ -169,13 +167,11 @@
+ 
+ // -----------------------------------------------------------------------------
+ 
+-#ifdef SOLAR_JAVA
+ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc ) 
+ 	throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+ {
+ 	mxDstDoc = xDoc;
+ }
+-#endif
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -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)
+ {
+-    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) );
++	return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
++		ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ }
+ 
+ // -----------------------------------------------------------------------------
+ 
+ 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-02-21 20:58:03.000000000 +0100
++++ filter/source/svg/svgfilter.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -231,18 +231,11 @@
  class SVGActionWriter;
  class EditFieldInfo;
@@ -979,9 +1032,9 @@
  
  	// XExporter
      virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/svgimport.cxx	2006-12-01 15:31:12.000000000 +0100
-+++ filter/source/svg/svgimport.cxx	2008-02-21 15:36:36.000000000 +0100
-@@ -37,160 +37,76 @@
+--- filter/source/svg/svgimport.cxx	2008-02-21 20:58:03.000000000 +0100
++++ filter/source/svg/svgimport.cxx	2008-02-21 20:55:46.000000000 +0100
+@@ -37,160 +37,59 @@
  #include "precompiled_filter.hxx"
  
  #include "svgfilter.hxx" 
@@ -1034,26 +1087,6 @@
 -		String					aLocalFile;
 -
 -		if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpFileName, aLocalFile ) && aLocalFile.Len() )
-+#if 0
-+    sal_Int32 nLength = rDescriptor.getLength();
-+    rtl::OUString aName;
-+    Reference< XInputStream > xInputStream;	
-+    for ( sal_Int32 i = 0 ; i < nLength; i++)
-+	{
-+        aName = rDescriptor[i].Name;
-+	    if (aName.equalsAscii("InputStream"))
-+            rDescriptor[i].Value >>= xInputStream;        		
-+	}
-+
-+    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 );
-+
-+	SVGReader xReader(mxMSF, xInputStream, xInternalHandler);
-+	return xReader.parseAndConvert();
-+#else
 +    rtl::OUString aURL;
 +    uno::Reference< io::XInputStream > xInputStream;
 +    uno::Reference< task::XStatusIndicator > xStatus;
@@ -1202,14 +1235,17 @@
 +	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();
-+#endif
  }
      
 --- filter/source/svg/svgreader.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.cxx	2008-02-21 16:26:19.000000000 +0100
-@@ -0,0 +1,990 @@
++++ filter/source/svg/svgreader.cxx	2008-02-21 19:58:55.000000000 +0100
+@@ -0,0 +1,992 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -1416,6 +1452,7 @@
 +
 +    bool writeStyle(const State& rState)
 +    {
++		printf("WriteStyle 1\n");
 +        rtl::Reference<SvXMLAttributeList> xAttrs( new SvXMLAttributeList() );
 +        uno::Reference<xml::sax::XAttributeList> xUnoAttrs( xAttrs.get() );
 +
@@ -1481,6 +1518,7 @@
 +
 +    void writeStyle(const uno::Reference<xml::dom::XElement>& xElem)
 +    {
++		printf("WriteStyle 2\n");
 +        sal_Int32 nEmulatedStyleId=0;
 +        if( maCurrState.maDashArray.size() && 
 +            maCurrState.meStrokeType != NONE )
@@ -2201,7 +2239,7 @@
 +
 +} // namespace svgi
 --- filter/source/svg/svgreader.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.hxx	2008-02-21 15:15:08.000000000 +0100
++++ filter/source/svg/svgreader.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,43 @@
 +/*************************************************************************
 + *
@@ -2247,7 +2285,7 @@
 +
 +#endif
 --- filter/source/svg/tokenmap.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.cxx	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/tokenmap.cxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -2311,9 +2349,8 @@
 +}
 +
 +} // namespace svgi
-diff -u -r -N filter/source/svg/tokenmap.hxx filter/source/svg/tokenmap.hxx
 --- filter/source/svg/tokenmap.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.hxx	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/tokenmap.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,32 @@
 +/*************************************************************************
 + *
@@ -2348,7 +2385,7 @@
 +
 +#endif
 --- filter/source/svg/tokens.txt	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokens.txt	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/tokens.txt	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,246 @@
 +#######################################
 +#
@@ -2598,7 +2635,7 @@
 +zoomAndPan
 \ No newline at end of file
 --- filter/source/svg/units.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.cxx	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/units.cxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,82 @@
 +/*************************************************************************
 + *
@@ -2683,7 +2720,7 @@
 +
 +} // namespace svgi
 --- filter/source/svg/units.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.hxx	2008-02-21 14:16:04.000000000 +0100
++++ filter/source/svg/units.hxx	2008-02-21 17:30:17.000000000 +0100
 @@ -0,0 +1,43 @@
 +/*************************************************************************
 + *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]