modified im/export

2 files changed, 29 insertions, 33 deletions

diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 3ee63792eecb..23d8ce83b9b9 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-27 12:45:16 $
+ *  last change: $Author: dbo $ $Date: 2001-03-14 16:39:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,7 +87,7 @@ struct NameSpaceUid
     ::rtl::OUString     sURI;
     sal_Int32           nUid;
 
-    NameSpaceUid( ::rtl::OUString const & sURI_, sal_Int32 nUid_ )
+    inline NameSpaceUid( ::rtl::OUString const & sURI_, sal_Int32 nUid_ ) SAL_THROW( () )
         : sURI( sURI_ )
         , nUid( nUid_ )
         {}
@@ -100,18 +100,18 @@ SAL_CALL createDocumentHandler(
     sal_Int32 nUnknownNamespaceUid,
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::XImporter > const & xImporter,
     bool bSingleThreadedUse = true )
-    throw ();
+    SAL_THROW( () );
 
 //==================================================================================================
 SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
 SAL_CALL createInputStream(
     ::rtl::ByteSequence const & rInData )
-    throw ();
+    SAL_THROW( () );
 //==================================================================================================
 SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
 SAL_CALL createOutputStream(
     ::rtl::ByteSequence * pOutData )
-    throw ();
+    SAL_THROW( () );
 
 };
 
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index fe5638d7a3e7..2575e3e17fa1 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.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-28 18:22:07 $
+ *  last change: $Author: dbo $ $Date: 2001-03-14 16:39:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,12 +64,12 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
+#include <com/sun/star/io/XInputStreamProvider.hpp>
+#endif
 #ifndef _COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HXX_
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
-#include <com/sun/star/uno/Sequence.hxx>
-#endif
 
 
 namespace xmlscript
@@ -77,38 +77,34 @@ namespace xmlscript
 
 #define XMLNS_DIALOGS_URI "http://openoffice.org/2000/dialog"
 #define XMLNS_DIALOGS_UID 1
-#define XMLNS_DIALOGS_PREFIX "dialog"
+#define XMLNS_DIALOGS_PREFIX "dlg"
 
 
 //==================================================================================================
 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_CALL exportDialogModel(
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel )
+    SAL_THROW( (::com::sun::star::uno::Exception) );
 //==================================================================================================
 SAL_DLLEXPORT ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
-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_CALL importDialogModel(
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel )
+    SAL_THROW( (::com::sun::star::uno::Exception) );
+
+// additional functions for convenience
 
 //==================================================================================================
-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 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
+SAL_CALL exportDialogModel(
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel )
+    SAL_THROW( (::com::sun::star::uno::Exception) );
 //==================================================================================================
 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);
+SAL_CALL importDialogModel(
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInput,
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel )
+    SAL_THROW( (::com::sun::star::uno::Exception) );
 
 };