fdo#46808, Adapt xml::sax::XWriter UNO service to new style

Create a merged XWriter interface for the service.
The xml.sax.Writer service already existed, it just did not have
an IDL file.

Change-Id: I4e6d3f3c68f9282a55fc7aa19778f97632fd8ad5

3 files changed, 7 insertions, 27 deletions

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index 238c612f021d..9918419274c7 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/Writer.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -65,26 +66,12 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
     Reference< XModel > const & xDocument )
     SAL_THROW( (Exception) )
 {
-    Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
-    if (! xSMgr.is())
-    {
-        throw RuntimeException("no service manager available!",
-            Reference< XInterface >() );
-    }
-
-    Reference< xml::sax::XExtendedDocumentHandler > xHandler( xSMgr->createInstanceWithContext(
-        "com.sun.star.xml.sax.Writer", xContext ), UNO_QUERY );
-    OSL_ASSERT( xHandler.is() );
-    if (! xHandler.is())
-    {
-        throw RuntimeException("could not create sax-writer component!",
-            Reference< XInterface >() );
-    }
+    Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(xContext);
 
     ByteSequence aBytes;
+    xWriter->setOutputStream( createOutputStream( &aBytes ) );
 
-    Reference< io::XActiveDataSource > xSource( xHandler, UNO_QUERY );
-    xSource->setOutputStream( createOutputStream( &aBytes ) );
+    Reference< xml::sax::XExtendedDocumentHandler > xHandler(xWriter, UNO_QUERY_THROW);
     exportDialogModel( xHandler, xDialogModel, xDocument );
 
     return new InputStreamProvider( aBytes );
@@ -98,13 +85,6 @@ void SAL_CALL importDialogModel(
     Reference< XModel > const & xDocument )
     SAL_THROW( (Exception) )
 {
-    Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
-    if (! xSMgr.is())
-    {
-        throw RuntimeException("no service manager available!",
-            Reference< XInterface >() );
-    }
-
     Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext );
 
     // error handler, entity resolver omitted for this helper function
diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index 9f0cb742cf91..3d1e3dad2d36 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
@@ -39,7 +39,7 @@ const char aFalseStr[] = "false";
 
 void
 SAL_CALL exportLibraryContainer(
-    Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
+    Reference< xml::sax::XWriter > const & xOut,
     const LibDescriptorArray* pLibArray )
         SAL_THROW( (Exception) )
 {
@@ -105,7 +105,7 @@ SAL_CALL exportLibraryContainer(
 
 void
 SAL_CALL exportLibrary(
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut,
     const LibDescriptor& rLib )
         SAL_THROW( (::com::sun::star::uno::Exception) )
 {
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
index 6036cc8afa95..4048a1f21ca9 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
@@ -32,7 +32,7 @@ namespace xmlscript
 
 void
 SAL_CALL exportScriptModule(
-    Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
+    Reference< xml::sax::XWriter > const & xOut,
     const ModuleDescriptor& rMod )
         SAL_THROW( (Exception) )
 {