fdo#46808, Adapt io::Pipe UNO service to new style

Create a merged XPipe interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: I682633c6252aab503eb2469c9bd2ba771f10bc4b

3 files changed, 60 insertions, 15 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 2c3e1786d0cf..6d1b84ab8882 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -77,7 +77,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
 	MarkableOutputStream \
 	ObjectInputStream \
 	ObjectOutputStream \
-	Pipe \
 	Pump \
 	TextInputStream \
 	TextOutputStream \
@@ -139,6 +138,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,
 	EnumerableMap \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
+	Pipe \
 	SequenceInputStream \
 	SequenceOutputStream \
 	TempFile \
@@ -326,6 +326,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
 	XObjectInputStream \
 	XObjectOutputStream \
 	XOutputStream \
+    XPipe \
 	XPersist \
 	XPersistObject \
 	XSeekable \
diff --git a/udkapi/com/sun/star/io/Pipe.idl b/udkapi/com/sun/star/io/Pipe.idl
index 7a506db02dff..5ecdc361a3c2 100644
--- a/udkapi/com/sun/star/io/Pipe.idl
+++ b/udkapi/com/sun/star/io/Pipe.idl
@@ -19,11 +19,7 @@
 #ifndef __com_sun_star_io_Pipe_idl__
 #define __com_sun_star_io_Pipe_idl__
 
-#include <com/sun/star/io/XOutputStream.idl>
-
-#include <com/sun/star/io/XInputStream.idl>
-
-
+#include <com/sun/star/io/XPipe.idl>
 
 module com {  module sun {  module star {  module io {
 
@@ -38,15 +34,7 @@ module com {  module sun {  module star {  module io {
     <p> With the pipe-service, an outputstream can be converted into an
     input stream at the cost of an additional buffer.
  */
-published service Pipe
-{
-    // DocMerge: empty anyway
-    interface com::sun::star::io::XOutputStream;
-
-    // DocMerge: empty anyway
-    interface com::sun::star::io::XInputStream;
-
-};
+published service Pipe : XPipe;
 
 
 }; }; }; };
diff --git a/udkapi/com/sun/star/io/XPipe.idl b/udkapi/com/sun/star/io/XPipe.idl
new file mode 100644
index 000000000000..f33a97704761
--- /dev/null
+++ b/udkapi/com/sun/star/io/XPipe.idl
@@ -0,0 +1,56 @@
+/* -*- 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_XPipe_idl__
+#define __com_sun_star_io_XPipe_idl__
+
+#include <com/sun/star/io/XOutputStream.idl>
+
+#include <com/sun/star/io/XInputStream.idl>
+
+
+
+module com {  module sun {  module star {  module io {
+
+
+// DocMerge from xml: service com::sun::star::io::Pipe
+/** the implementation of an output stream and an input stream.
+    <p>
+    All data written through the outputstream is buffered until it is
+    read again from the input stream. Often two different threads access
+    input and outputstream.
+
+    <p> With the pipe-service, an outputstream can be converted into an
+    input stream at the cost of an additional buffer.
+ */
+published interface XPipe
+{
+    // DocMerge: empty anyway
+    interface com::sun::star::io::XOutputStream;
+
+    // DocMerge: empty anyway
+    interface com::sun::star::io::XInputStream;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */