openoffice-svg-handle-no-solar-java.patch

   1 --- filter/source/svg/svgfilter.hxx.orig        2003-08-09 19:28:05.000000000 -0700
   2 +++ filter/source/svg/svgfilter.hxx     2003-08-09 21:45:14.000000000 -0700
   3 @@ -83,9 +83,11 @@
   4  #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
   5  #include <com/sun/star/document/XFilter.hpp>
   6  #endif
   7 +#ifdef SOLAR_JAVA
   8  #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
   9  #include <com/sun/star/document/XImporter.hpp>
  10  #endif
  11 +#endif // SOLAR_JAVA
  12  #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
  13  #include <com/sun/star/document/XExporter.hpp>
  14  #endif
  15 @@ -104,9 +106,15 @@
  16  #ifndef _CPPUHELPER_IMPLBASE1_HXX_
  17  #include <cppuhelper/implbase1.hxx>
  18  #endif
  19 +#ifdef SOLAR_JAVA
  20  #ifndef _CPPUHELPER_IMPLBASE5_HXX_
  21  #include <cppuhelper/implbase5.hxx>
  22  #endif
  23 +#else // !SOLAR_JAVA
  24 +#ifndef _CPPUHELPER_IMPLBASE4_HXX_
  25 +#include <cppuhelper/implbase4.hxx>
  26 +#endif
  27 +#endif
  28  #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
  29  #include <com/sun/star/lang/XMultiServiceFactory.hpp>
  30  #endif
  31 @@ -152,7 +160,9 @@
  32  #include <svx/svdxcgv.hxx>
  33  #include <svx/svdobj.hxx>
  34  #include <xmloff/xmlexp.hxx>
  35 +#ifdef SOLAR_JAVA
  36  #include <sj2/jnihelp.hxx>
  37 +#endif
  38  #include "svgfilter.hxx"
  39  #include "svgscript.hxx"
  40
  41 @@ -238,11 +248,18 @@
  42  class SVGFontExport;
  43  class SVGActionWriter;
  44
  45 +#ifdef SOLAR_JAVA
  46  class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
  47                                                                                              XImporter,
  48                                                   XExporter,
  49                                                                                                  XInitialization,
  50                                                                                                  XServiceInfo >
  51 +#else // !SOLAR_JAVA
  52 +class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
  53 +                                                 XExporter,
  54 +                                                 XInitialization,
  55 +                                                 XServiceInfo >
  56 +#endif
  57  {
  58         typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
  59
  60 @@ -251,14 +268,18 @@
  61         ObjectMap*                                                      mpObjects;
  62         Reference< XMultiServiceFactory >       mxMSF;
  63         Reference< XComponent >                         mxSrcDoc;
  64 +#ifdef SOLAR_JAVA
  65         Reference< XComponent >                         mxDstDoc;
  66 +#endif
  67      SvXMLElementExport*                                        mpSVGDoc;
  68      SVGExport*                                                 mpSVGExport;
  69         SVGFontExport*                                          mpSVGFontExport;
  70      SVGActionWriter*                                   mpSVGWriter;
  71      sal_Bool                                                   mbPresentation;
  72
  73 +#ifdef SOLAR_JAVA
  74      sal_Bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
  75 +#endif
  76
  77      sal_Bool                            implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
  78      Reference< XDocumentHandler >       implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
  79 @@ -292,8 +313,10 @@
  80      virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
  81      virtual void SAL_CALL cancel( ) throw (RuntimeException);
  82
  83 +#ifdef SOLAR_JAVA
  84         // XImporter
  85      virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
  86 +#endif
  87
  88         // XExporter
  89      virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
  90 --- filter/source/svg/makefile.mk.orig  2003-08-09 20:06:22.000000000 -0700
  91 +++ filter/source/svg/makefile.mk       2003-08-09 20:07:54.000000000 -0700
  92 @@ -99,10 +99,12 @@
  93
  94  SLOFILES=      $(SLO)$/svguno.obj                      \
  95                         $(SLO)$/svgfilter.obj           \
  96 -                       $(SLO)$/svgimport.obj           \
  97                         $(SLO)$/svgexport.obj           \
  98                         $(SLO)$/svgfontexport.obj       \
  99                         $(SLO)$/svgwriter.obj
 100 +.IF "$(SOLAR_JAVA)"!=""
 101 +SLOFILES+=             $(SLO)$/svgimport.obj
 102 +.ENDIF
 103
 104  # --- Library -----------------------------------
 105
 106 @@ -112,7 +114,6 @@
 107         $(SVXLIB)                       \
 108         $(XMLOFFLIB)            \
 109         $(GOODIESLIB)           \
 110 -       $(SJLIB)                        \
 111         $(VCLLIB)                       \
 112         $(UNOTOOLSLIB)          \
 113         $(TOOLSLIB)                     \
 114 @@ -120,7 +121,10 @@
 115         $(CPPUHELPERLIB)        \
 116         $(CPPULIB)                      \
 117         $(SALLIB)
 118 -
 119 +.IF "$(SOLAR_JAVA)"!=""
 120 +SHL1STDLIBS+=\
 121 +       $(SJLIB)
 122 +.ENDIF
 123
 124  SHL1DEPN=
 125  SHL1IMPLIB=    i$(SHL1TARGET)
 126 --- filter/source/svg/svgfilter.cxx.orig        2003-08-09 20:03:37.000000000 -0700
 127 +++ filter/source/svg/svgfilter.cxx     2003-08-09 21:46:50.000000000 -0700
 128 @@ -97,9 +97,12 @@
 129      if( pFocusWindow )
 130         pFocusWindow->EnterWait();
 131
 132 +#ifdef SOLAR_JAVA
 133      if( mxDstDoc.is() )
 134          bRet = implImport( rDescriptor );
 135 -    else if( mxSrcDoc.is() )
 136 +    else
 137 +#endif
 138 +    if( mxSrcDoc.is() )
 139          bRet = implExport( rDescriptor );
 140      else
 141          bRet = sal_False;
 142 @@ -126,11 +129,13 @@
 143
 144  // -----------------------------------------------------------------------------
 145
 146 +#ifdef SOLAR_JAVA
 147  void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
 148         throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
 149  {
 150         mxDstDoc = xDoc;
 151  }
 152 +#endif
 153
 154  // -----------------------------------------------------------------------------
 155