ooo-build r11742 - in trunk: . patches/src680
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11742 - in trunk: . patches/src680
- Date: Thu, 28 Feb 2008 18:00:38 +0000 (GMT)
Author: strba
Date: Thu Feb 28 18:00:38 2008
New Revision: 11742
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11742&view=rev
Log:
2008-02-28 Fridrich Strba <fridrich strba bluewin ch>
* patches/src680/svg-import-filter.diff: fix svg filter build when building
without java.
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 Thu Feb 28 18:00:38 2008
@@ -1,5 +1,5 @@
---- filter/source/config/fragments/fcfg_drawgraphics.mk 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/config/fragments/fcfg_drawgraphics.mk 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -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-27 19:02:42.000000000 +0100
++++ filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 2008-02-28 13:54:18.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 13:02:19.000000000 +0100
-+++ filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -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-27 19:02:42.000000000 +0100
++++ filter/source/svg/b2dellipse.cxx 2008-02-28 13:54:18.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-27 19:02:42.000000000 +0100
++++ filter/source/svg/b2dellipse.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
@@ -265,8 +265,8 @@
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BASEGFX_B2DELLIPSE_HXX */
---- filter/source/svg/exports.map 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/svg/exports.map 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -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-27 19:02:42.000000000 +0100
++++ filter/source/svg/gentoken.pl 2008-02-28 13:54:18.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-27 19:02:42.000000000 +0100
++++ filter/source/svg/gfxtypes.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,309 @@
+/*************************************************************************
+ *
@@ -653,8 +653,8 @@
+} // namespace svgi
+
+#endif
---- filter/source/svg/makefile.mk 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/svg/makefile.mk 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -34,24 +34,35 @@
#*************************************************************************
@@ -742,7 +742,7 @@
+$(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:30:03.000000000 +0100
++++ filter/source/svg/parserfragments.cxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,650 @@
+/*************************************************************************
+ *
@@ -1395,7 +1395,7 @@
+
+} // namespace svgi
--- filter/source/svg/parserfragments.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.hxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/parserfragments.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
@@ -1447,7 +1447,7 @@
+
+#endif
--- filter/source/svg/spirit_supplements.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/spirit_supplements.hxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/spirit_supplements.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
@@ -1543,8 +1543,8 @@
+
+# endif
+#endif
---- filter/source/svg/svgfilter.cxx 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/svg/svgfilter.cxx 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -96,11 +96,9 @@
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -1608,9 +1608,37 @@
// -----------------------------------------------------------------------------
---- filter/source/svg/svgfilter.hxx 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/svg/svgfilter.hxx 2008-02-27 19:02:42.000000000 +0100
-@@ -231,18 +231,11 @@
+--- 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
+@@ -57,11 +57,9 @@
+ #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
+ #include <com/sun/star/document/XFilter.hpp>
+ #endif
+-#ifdef SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
+ #include <com/sun/star/document/XImporter.hpp>
+ #endif
+-#endif // SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
+ #include <com/sun/star/document/XExporter.hpp>
+ #endif
+@@ -80,15 +78,9 @@
+ #ifndef _CPPUHELPER_IMPLBASE1_HXX_
+ #include <cppuhelper/implbase1.hxx>
+ #endif
+-#ifdef SOLAR_JAVA
+ #ifndef _CPPUHELPER_IMPLBASE5_HXX_
+ #include <cppuhelper/implbase5.hxx>
+ #endif
+-#else // !SOLAR_JAVA
+-#ifndef _CPPUHELPER_IMPLBASE4_HXX_
+-#include <cppuhelper/implbase4.hxx>
+-#endif
+-#endif
+ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #endif
+@@ -231,18 +223,11 @@
class SVGActionWriter;
class EditFieldInfo;
@@ -1629,7 +1657,7 @@
{
typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
-@@ -259,15 +252,11 @@
+@@ -259,15 +244,11 @@
ObjectMap* mpObjects;
Reference< XComponent > mxSrcDoc;
@@ -1645,7 +1673,7 @@
sal_Bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
Reference< XDocumentHandler > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
-@@ -306,10 +295,8 @@
+@@ -306,10 +287,8 @@
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
virtual void SAL_CALL cancel( ) throw (RuntimeException);
@@ -1656,8 +1684,8 @@
// XExporter
virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/svgimport.cxx 2008-02-28 13:02:19.000000000 +0100
-+++ filter/source/svg/svgimport.cxx 2008-02-27 19:02:42.000000000 +0100
+--- 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
@@ -37,160 +37,59 @@
#include "precompiled_filter.hxx"
@@ -1868,7 +1896,7 @@
}
--- filter/source/svg/svgreader.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.cxx 2008-02-28 13:44:56.000000000 +0100
++++ filter/source/svg/svgreader.cxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,1307 @@
+/*************************************************************************
+ *
@@ -3178,7 +3206,7 @@
+
+} // namespace svgi
--- filter/source/svg/svgreader.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.hxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/svgreader.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
@@ -3224,7 +3252,7 @@
+
+#endif
--- filter/source/svg/tokenmap.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.cxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/tokenmap.cxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
@@ -3289,7 +3317,7 @@
+
+} // namespace svgi
--- filter/source/svg/tokenmap.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.hxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/tokenmap.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
@@ -3324,7 +3352,7 @@
+
+#endif
--- filter/source/svg/tokens.txt 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokens.txt 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/tokens.txt 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,246 @@
+#######################################
+#
@@ -3574,7 +3602,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-27 19:02:42.000000000 +0100
++++ filter/source/svg/units.cxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
@@ -3687,7 +3715,7 @@
+
+} // namespace svgi
--- filter/source/svg/units.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.hxx 2008-02-27 19:02:42.000000000 +0100
++++ filter/source/svg/units.hxx 2008-02-28 13:54:18.000000000 +0100
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]