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

Change-Id: I12af47afc21c2b646197893a77698f4e0818f94f

3 files changed, 52 insertions, 13 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 6a11ab924cc1..c4c4eb2b5b60 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
 	ObjectInputStream \
 	ObjectOutputStream \
 	Pump \
-	TextOutputStream \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
 	MultiServiceFactory \
@@ -116,6 +115,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
 	SequenceOutputStream \
 	TempFile \
 	TextInputStream \
+	TextOutputStream \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
 	JavaVirtualMachine \
@@ -323,6 +323,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
 	XTextInputStream \
 	XTextInputStream2 \
 	XTextOutputStream \
+	XTextOutputStream2 \
 	XTruncate \
 	XXMLExtractor \
 ))
diff --git a/udkapi/com/sun/star/io/TextOutputStream.idl b/udkapi/com/sun/star/io/TextOutputStream.idl
index d8a46ff02884..75ab3dd4e544 100644
--- a/udkapi/com/sun/star/io/TextOutputStream.idl
+++ b/udkapi/com/sun/star/io/TextOutputStream.idl
@@ -19,9 +19,7 @@
 #ifndef __com_sun_star_io_TextOutputStream_idl__
 #define __com_sun_star_io_TextOutputStream_idl__
 
-#include <com/sun/star/io/XTextOutputStream.idl>
-
-#include <com/sun/star/io/XActiveDataSource.idl>
+#include <com/sun/star/io/XTextOutputStream2.idl>
 
 
 
@@ -35,15 +33,7 @@ module com {  module sun {  module star {  module io {
     <p>For details about the text functionality see
     <type scope="com::sun::star::io">XTextOutputStream</type>.
  */
-published service TextOutputStream
-{
-    /// Interface to write text data
-    interface com::sun::star::io::XTextOutputStream;
-
-    /// Interface to specify the used <type scope="com::sun::star::io">XOutputStream</type>
-    interface com::sun::star::io::XActiveDataSource;
-
-};
+published service TextOutputStream : XTextOutputStream2;
 
 
 }; }; }; };
diff --git a/udkapi/com/sun/star/io/XTextOutputStream2.idl b/udkapi/com/sun/star/io/XTextOutputStream2.idl
new file mode 100644
index 000000000000..12209b0a5ee3
--- /dev/null
+++ b/udkapi/com/sun/star/io/XTextOutputStream2.idl
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_io_XTextOutputStream2_idl__
+#define __com_sun_star_io_XTextOutputStream2_idl__
+
+#include <com/sun/star/io/XTextOutputStream.idl>
+#include <com/sun/star/io/XActiveDataSource.idl>
+
+
+
+module com {  module sun {  module star {  module io {
+
+/** Provides a unified interface for the new-style service TextOutputStream.
+
+    @since LibreOffice 4.1
+ */
+published interface XTextOutputStream2
+{
+    /// Interface to write text data
+    interface com::sun::star::io::XTextOutputStream;
+
+    /// Interface to specify the used <type scope="com::sun::star::io">XOutputStream</type>
+    interface com::sun::star::io::XActiveDataSource;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */