diff options
| -rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 2 | ||||
| -rw-r--r-- | bridges/test/testoffice.cxx | 14 | ||||
| -rw-r--r-- | forms/source/xforms/submission/serialization_app_xml.cxx | 6 | ||||
| -rw-r--r-- | forms/source/xforms/submission/serialization_app_xml.hxx | 4 | ||||
| -rw-r--r-- | forms/source/xforms/submission/serialization_urlencoded.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/submission/serialization_urlencoded.hxx | 5 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 2 |
7 files changed, 14 insertions, 21 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 70de47c58117..94cd073c16a5 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1358,7 +1358,7 @@ void LibPage::ExportAsPackage( const String& aLibName ) // write into pipe: Reference<packages::manifest::XManifestWriter> xManifestWriter( xMSF->createInstance ( DEFINE_CONST_UNICODE("com.sun.star.packages.manifest.ManifestWriter") ), UNO_QUERY ); - Reference<io::XOutputStream> xPipe( io::Pipe::create(comphelper::ComponentContext(xMSF).getUNOContext()), UNO_QUERY ); + Reference<io::XOutputStream> xPipe( io::Pipe::create(comphelper::ComponentContext(xMSF).getUNOContext()), UNO_QUERY_THROW ); xManifestWriter->writeManifestSequence( xPipe, Sequence< Sequence<beans::PropertyValue> >( &manifest[ 0 ], manifest.size() ) ); diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx index e5b3df5a3632..9b90bbe9ec01 100644 --- a/bridges/test/testoffice.cxx +++ b/bridges/test/testoffice.cxx @@ -38,8 +38,7 @@ #include <com/sun/star/bridge/XBridgeFactory.hpp> #include <com/sun/star/uno/XNamingService.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/text/XTextDocument.hpp> @@ -84,23 +83,20 @@ void mygetchar() void testPipe( const Reference < XMultiServiceFactory > & rSmgr ) { - Reference < XOutputStream > rOut( Pipe::create(comphelper::ComponentContext(rSmgr).getUNOContext()), UNO_QUERY_THROW ); - - OSL_ASSERT( rOut.is() ); + Reference < XPipe > rPipe( Pipe::create(comphelper::ComponentContext(rSmgr).getUNOContext()), UNO_QUERY_THROW ); { Sequence < sal_Int8 > seq( 10 ); seq.getArray()[0] = 42; - rOut->writeBytes( seq ); + rPipe->writeBytes( seq ); } { Sequence < sal_Int8 > seq; - Reference < XInputStream > rIn( rOut , UNO_QUERY ); - if( ! ( rIn->available() == 10) ) + if( ! ( rPipe->available() == 10) ) printf( "wrong bytes available\n" ); - if( ! ( rIn->readBytes( seq , 10 ) == 10 ) ) + if( ! ( rPipe->readBytes( seq , 10 ) == 10 ) ) printf( "wrong bytes read\n" ); if( ! ( 42 == seq.getArray()[0] ) ) printf( "wrong element in sequence\n" ); diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index 6b9e2fb266c7..7c783bf8adaa 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.cxx @@ -43,10 +43,8 @@ CSerializationAppXML::CSerializationAppXML() : m_aFactory(comphelper::getProcessServiceFactory()) - , m_aPipe(CSS::io::Pipe::create(comphelper::getProcessComponentContext()), CSS::uno::UNO_QUERY_THROW) -{ - OSL_ENSURE(m_aPipe.is(), "cannot create Pipe"); -} + , m_aPipe(CSS::io::Pipe::create(comphelper::getProcessComponentContext())) +{} CSS::uno::Reference< CSS::io::XInputStream > CSerializationAppXML::getInputStream() diff --git a/forms/source/xforms/submission/serialization_app_xml.hxx b/forms/source/xforms/submission/serialization_app_xml.hxx index 9564961bbbc9..8f72bd8d627e 100644 --- a/forms/source/xforms/submission/serialization_app_xml.hxx +++ b/forms/source/xforms/submission/serialization_app_xml.hxx @@ -29,7 +29,7 @@ #ifndef __SERIALIZATION_APP_XML_HXX #define __SERIALIZATION_APP_XML_HXX -#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XPipe.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "serialization.hxx" @@ -39,7 +39,7 @@ class CSerializationAppXML : public CSerialization { private: CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; - CSS::uno::Reference< CSS::io::XOutputStream > m_aPipe; + CSS::uno::Reference< CSS::io::XPipe > m_aPipe; void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode); void serialize_nodeset(); diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index 8ba1be433991..a1e7d71bd950 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -50,7 +50,7 @@ using namespace CSS::xml::dom; CSerializationURLEncoded::CSerializationURLEncoded() : m_aFactory(comphelper::getProcessServiceFactory()) - , m_aPipe(Pipe::create(comphelper::getProcessComponentContext()), UNO_QUERY_THROW) + , m_aPipe(Pipe::create(comphelper::getProcessComponentContext())) { } diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx index 3401869054cb..0421acf5d3e8 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.hxx +++ b/forms/source/xforms/submission/serialization_urlencoded.hxx @@ -21,8 +21,7 @@ #define __SERIALIZATION_URLENCODED_HXX #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XPipe.hpp> #include <rtl/strbuf.hxx> @@ -32,7 +31,7 @@ class CSerializationURLEncoded : public CSerialization { private: CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; - CSS::uno::Reference< CSS::io::XOutputStream > m_aPipe; + CSS::uno::Reference< CSS::io::XPipe > m_aPipe; sal_Bool is_unreserved(sal_Char); void encode_and_append(const rtl::OUString& aString, rtl::OStringBuffer& aBuffer); diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 6d1b84ab8882..d909fb62972e 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -326,9 +326,9 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ XObjectInputStream \ XObjectOutputStream \ XOutputStream \ - XPipe \ XPersist \ XPersistObject \ + XPipe \ XSeekable \ XSeekableInputStream \ XSequenceOutputStream \ |