fdo#46808, convert io::TextInputStream service to new style

Change-Id: Ida4abdd6587399aa8ade88af672bcb23ab7ea0f1

3 files changed, 52 insertions, 14 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 262ad55d8154..6a11ab924cc1 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 \
-	TextInputStream \
 	TextOutputStream \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
@@ -116,6 +115,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
 	SequenceInputStream \
 	SequenceOutputStream \
 	TempFile \
+	TextInputStream \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
 	JavaVirtualMachine \
@@ -321,6 +321,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
 	XStreamListener \
 	XTempFile \
 	XTextInputStream \
+	XTextInputStream2 \
 	XTextOutputStream \
 	XTruncate \
 	XXMLExtractor \
diff --git a/udkapi/com/sun/star/io/TextInputStream.idl b/udkapi/com/sun/star/io/TextInputStream.idl
index d7e6703985f2..f2a8e56053c0 100644
--- a/udkapi/com/sun/star/io/TextInputStream.idl
+++ b/udkapi/com/sun/star/io/TextInputStream.idl
@@ -19,12 +19,9 @@
 #ifndef __com_sun_star_io_TextInputStream_idl__
 #define __com_sun_star_io_TextInputStream_idl__
 
-#include <com/sun/star/io/XTextInputStream.idl>
-
+#include <com/sun/star/io/XTextInputStream2.idl>
 #include <com/sun/star/io/XActiveDataSink.idl>
 
-#include <com/sun/star/io/XConnectable.idl>
-
 
 
 module com {  module sun {  module star {  module io {
@@ -37,15 +34,7 @@ module com {  module sun {  module star {  module io {
     <p>For details about the text functionality see
     <type scope="com::sun::star::io">XTextInputStream</type>.
  */
-published service TextInputStream
-{
-    /// Interface to read text data
-    interface com::sun::star::io::XTextInputStream;
-
-    /// Interface to specify the used <type scope="com::sun::star::io">XInputStream</type>
-    interface com::sun::star::io::XActiveDataSink;
-
-};
+published service TextInputStream : XTextInputStream2;
 
 
 }; }; }; };
diff --git a/udkapi/com/sun/star/io/XTextInputStream2.idl b/udkapi/com/sun/star/io/XTextInputStream2.idl
new file mode 100644
index 000000000000..59c5b9cc2301
--- /dev/null
+++ b/udkapi/com/sun/star/io/XTextInputStream2.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_XTextInputStream2_idl__
+#define __com_sun_star_io_XTextInputStream2_idl__
+
+#include <com/sun/star/io/XTextInputStream.idl>
+#include <com/sun/star/io/XActiveDataSink.idl>
+
+
+
+module com {  module sun {  module star {  module io {
+
+/** Provides a unified interface for the new-style service TextInputStream.
+
+    @since LibreOffice 4.1
+ */
+published interface XTextInputStream2
+{
+    /// Interface to read text data
+    interface com::sun::star::io::XTextInputStream;
+
+    /// Interface to specify the used <type scope="com::sun::star::io">XInputStream</type>
+    interface com::sun::star::io::XActiveDataSink;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */