#82042# added support for xml filter components

sw/source/filter/xml/swxml.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swxml.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-05 09:58:11 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -159,7 +159,7 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
      xml::sax::InputSource aParserInput;
     aParserInput.sSystemId = rName;
 
-    Reference< XIndexContainer > xEmbeddedGraphicExport;
+    Reference< document::XGraphicObjectResolver > xEmbeddedGraphicExport;
     SvXMLGraphicHelper *pGraphicHelper = 0;
     SvStorageStreamRef xDocStream;
     SvStorage *pStorage = pMedium->GetStorage();
@@ -282,6 +282,9 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.8  2001/01/05 09:58:11  mib
+      default styles
+
       Revision 1.7  2001/01/03 11:40:56  mib
       support for OLE objects in XML files
 

sw/source/filter/xml/wrtxml.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtxml.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-08 09:44:55 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -182,7 +182,7 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
     Reference< io::XActiveDataSource > xSrc( xWriter, UNO_QUERY );
     xSrc->setOutputStream( xOut );
 
-    Reference< XIndexContainer > xEmbeddedGraphicExport;
+    Reference< document::XGraphicObjectResolver > xEmbeddedGraphicExport;
     SvXMLGraphicHelper *pGraphicHelper = 0;
     if( pStorage )
     {
@@ -199,6 +199,8 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
                                          bWriteAll, bWriteOnlyFirstTable,
                                          bShowProgress );
 
+    Reference< document::XExporter > xExporter( pExp );
+
     sal_uInt32 nRet = pExp->exportDoc( sXML_text );
     if( xDocStream.Is() )
         xDocStream->Commit();
@@ -210,7 +212,7 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
     if( pGraphicHelper )
         SvXMLGraphicHelper::Destroy( pGraphicHelper );
     xEmbeddedGraphicExport = 0;
-    delete pExp;
+//  delete pExp;
 
     ResetWriter();
 
@@ -230,11 +232,14 @@ void GetXMLWriter( const String& rName, WriterRef& xRet )
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/wrtxml.cxx,v 1.10 2001-01-08 09:44:55 mib Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/wrtxml.cxx,v 1.11 2001-01-12 16:34:01 cl Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.10  2001/01/08 09:44:55  mib
+      Removed SwDoc and SvStorage members from SwXMLExport
+
       Revision 1.9  2001/01/03 11:40:56  mib
       support for OLE objects in XML files
 

sw/source/filter/xml/xmlexp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexp.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: dvo $ $Date: 2001-01-10 21:01:48 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,6 +124,7 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
 
 #ifdef XML_CORE_API
 void SwXMLExport::SetCurPaM( SwPaM& rPaM, sal_Bool bWhole, sal_Bool bTabOnly )
@@ -165,7 +166,7 @@ void SwXMLExport::SetCurPaM( SwPaM& rPaM, sal_Bool bWhole, sal_Bool bTabOnly )
 SwXMLExport::SwXMLExport( const Reference< XModel >& rModel, SwPaM& rPaM,
              const OUString& rFileName,
              const Reference< XDocumentHandler > & rHandler,
-             const Reference< XIndexContainer > & rEmbeddedGrfObjs,
+             const Reference< XGraphicObjectResolver > & rEmbeddedGrfObjs,
              sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly,
              sal_Bool bShowProg ) :
     SvXMLExport( rFileName, rHandler, rModel, rEmbeddedGrfObjs,

sw/source/filter/xml/xmlexp.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexp.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-08 09:44:55 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,7 +167,7 @@ public:
                  const ::com::sun::star::uno::Reference<
                      ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::container::XIndexContainer > &,
+                    ::com::sun::star::document::XGraphicObjectResolver > &,
                  sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly,
                  sal_Bool bShowProgr );
     virtual ~SwXMLExport();

sw/source/filter/xml/xmlimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: os $ $Date: 2001-01-12 16:15:11 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -265,7 +265,7 @@ SwXMLImport::SwXMLImport(
         const ::com::sun::star::uno::Reference<
                  ::com::sun::star::frame::XModel > & rModel,
         const ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexContainer > & rEGO,
+                ::com::sun::star::document::XGraphicObjectResolver > & rEGO,
         SvStorage *pPkg ) :
     SvXMLImport( rModel, rEGO ),
     bLoadDoc( bLDoc ),

sw/source/filter/xml/xmlimp.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-03 11:40:56 $
+ *  last change: $Author: cl $ $Date: 2001-01-12 16:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,7 +140,7 @@ public:
                  const ::com::sun::star::uno::Reference<
                      ::com::sun::star::frame::XModel > & rModel,
                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::container::XIndexContainer > &,
+                    ::com::sun::star::document::XGraphicObjectResolver > &,
                    SvStorage *pPkg );
 
     ~SwXMLImport();