fdo#46808, convert io::TextOutputStream service to new-style

Change-Id: I12af47afc21c2b646197893a77698f4e0818f94f

2 files changed, 10 insertions, 12 deletions

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 5a73eb18043f..6ba5ab7d4e5c 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -41,7 +41,7 @@
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
-    namespace io { class XTextOutputStream; }
+    namespace io { class XTextOutputStream2; }
     namespace uno { class XComponentContext; }
 } } }
 
@@ -124,13 +124,13 @@ public:
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
+    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
                         openTextOutputStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
                             rtl_TextEncoding eTextEnc );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
+    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
                         openTextOutputStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName,
@@ -1072,7 +1072,7 @@ private:
 private:
     typedef ::std::vector< sal_Int32 > StringLenVec;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream > mxStrm;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm;
     ::rtl::OUString     maIndent;
     ::rtl::OUStringBuffer maLine;
     ::rtl::OUString     maLastItem;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index a3cdcf62ed35..8f8aa49516d8 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XTextOutputStream.hpp>
+#include <com/sun/star/io/TextOutputStream.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <comphelper/docpasswordhelper.hxx>
 #include <osl/file.hxx>
@@ -126,17 +126,15 @@ Reference< XOutputStream > InputOutputHelper::openOutputStream(
     return xOutStrm;
 }
 
-Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
+Reference< XTextOutputStream2 > InputOutputHelper::openTextOutputStream(
         const Reference< XComponentContext >& rxContext, const Reference< XOutputStream >& rxOutStrm, rtl_TextEncoding eTextEnc )
 {
-    Reference< XTextOutputStream > xTextOutStrm;
+    Reference< XTextOutputStream2 > xTextOutStrm;
     const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
     if( rxContext.is() && rxOutStrm.is() && pcCharset ) try
     {
-        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
-        Reference< XActiveDataSource > xDataSource( xFactory->createInstance( "com.sun.star.io.TextOutputStream" ), UNO_QUERY_THROW );
-        xDataSource->setOutputStream( rxOutStrm );
-        xTextOutStrm.set( xDataSource, UNO_QUERY_THROW );
+        xTextOutStrm = TextOutputStream::create(rxContext);
+        xTextOutStrm->setOutputStream( rxOutStrm );
         xTextOutStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
     }
     catch( Exception& )
@@ -145,7 +143,7 @@ Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
     return xTextOutStrm;
 }
 
-Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
+Reference< XTextOutputStream2 > InputOutputHelper::openTextOutputStream(
         const Reference< XComponentContext >& rxContext, const OUString& rFileName, rtl_TextEncoding eTextEnc )
 {
     return openTextOutputStream( rxContext, openOutputStream( rxContext, rFileName ), eTextEnc );