further impl; bugfixing

2 files changed, 37 insertions, 22 deletions

diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 44f573858c4c..3ee63792eecb 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xml_helper.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-16 14:14:47 $
+ *  last change: $Author: dbo $ $Date: 2001-02-27 12:45:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,13 +61,22 @@
 #ifndef _XMLSCRIPT_XML_HELPER_HXX_
 #define _XMLSCRIPT_XML_HELPER_HXX_
 
+#ifndef _RTL_BYTESEQ_HXX_
 #include <rtl/byteseq.hxx>
+#endif
 
+#ifndef _COM_SUN_STAR_XML_XIMPORTER_HXX_
 #include <com/sun/star/xml/XImporter.hpp>
+#endif
+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HXX_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
+#endif
+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_
 #include <com/sun/star/io/XInputStream.hpp>
+#endif
+#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HXX_
 #include <com/sun/star/io/XOutputStream.hpp>
+#endif
 
 
 namespace xmlscript
@@ -85,7 +94,7 @@ struct NameSpaceUid
 };
 
 //==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
 SAL_CALL createDocumentHandler(
     NameSpaceUid const * pNamespaceUids, sal_Int32 nNameSpaceUids,
     sal_Int32 nUnknownNamespaceUid,
@@ -94,12 +103,12 @@ SAL_CALL createDocumentHandler(
     throw ();
 
 //==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
 SAL_CALL createInputStream(
     ::rtl::ByteSequence const & rInData )
     throw ();
 //==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
 SAL_CALL createOutputStream(
     ::rtl::ByteSequence * pOutData )
     throw ();
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 4ac42b439690..328b4c3e8a1b 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_imexp.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ab $ $Date: 2001-02-26 12:59:16 $
+ *  last change: $Author: dbo $ $Date: 2001-02-27 12:45:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #endif
 
+
 namespace xmlscript
 {
 
@@ -80,30 +81,35 @@ namespace xmlscript
 
 
 //==================================================================================================
-SAL_DLLEXPORT void SAL_CALL exportDialogModel(
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut )
+SAL_DLLEXPORT void
+SAL_CALL exportDialogModels(
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
+        ::com::sun::star::container::XNameContainer > > const & rInModels )
     throw (::com::sun::star::uno::Exception);
-
 //==================================================================================================
 SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
-SAL_CALL importDialogModel(
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel )
+SAL_CALL importDialogModels(
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
+        ::com::sun::star::container::XNameContainer > > * pOutModels )
     throw (::com::sun::star::uno::Exception);
 
 //==================================================================================================
-SAL_DLLEXPORT void SAL_CALL exportDialogModelToByteSequence(
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Sequence< sal_Int8 >& aDestSequence )
+SAL_DLLEXPORT void
+SAL_CALL exportDialogModelsToByteSequence(
+    ::com::sun::star::uno::Sequence< sal_Int8 > * pOutBytes,
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
+        ::com::sun::star::container::XNameContainer > > const & rInModels )
     throw (::com::sun::star::uno::Exception);
-
 //==================================================================================================
-SAL_DLLEXPORT void SAL_CALL importDialogModelFromByteSequence(
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Sequence< sal_Int8 > const& aSourceSequence )
+SAL_DLLEXPORT void
+SAL_CALL importDialogModelsFromByteSequence(
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
+        ::com::sun::star::container::XNameContainer > > * pOutModels,
+    ::com::sun::star::uno::Sequence< sal_Int8 > const & rInBytes )
     throw (::com::sun::star::uno::Exception);
 
 };
 
 #endif
-