summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx16
-rw-r--r--forms/source/xforms/model_ui.cxx13
-rw-r--r--forms/source/xforms/unohelper.cxx11
-rw-r--r--forms/source/xforms/unohelper.hxx4
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx7
-rw-r--r--offapi/type_reference/types.rdbbin7440384 -> 7440384 bytes
-rw-r--r--oox/inc/oox/helper/textinputstream.hxx6
-rw-r--r--oox/inc/oox/vml/vmlinputstream.hxx4
-rw-r--r--oox/source/helper/textinputstream.cxx12
-rw-r--r--oox/source/vml/vmlinputstream.cxx2
-rw-r--r--scripting/source/stringresource/stringresource.cxx201
-rw-r--r--udkapi/UnoApi_udkapi.mk3
-rw-r--r--udkapi/com/sun/star/io/TextInputStream.idl15
-rw-r--r--udkapi/com/sun/star/io/XTextInputStream2.idl48
14 files changed, 176 insertions, 166 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index c7677ca8e471..e10dc3688af5 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/io/XTextOutputStream.hpp>
-#include <com/sun/star/io/XTextInputStream.hpp>
+#include <com/sun/star/io/TextInputStream.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/util/XModifiable.hpp>
@@ -59,6 +59,7 @@ namespace dbaccess
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Type;
+ using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::embed::XStorage;
using ::com::sun::star::frame::XController;
using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
@@ -68,7 +69,8 @@ namespace dbaccess
using ::com::sun::star::io::XStream;
using ::com::sun::star::io::XTextOutputStream;
using ::com::sun::star::io::XActiveDataSource;
- using ::com::sun::star::io::XTextInputStream;
+ using ::com::sun::star::io::TextInputStream;
+ using ::com::sun::star::io::XTextInputStream2;
using ::com::sun::star::io::XActiveDataSink;
using ::com::sun::star::frame::XModel;
using ::com::sun::star::util::XModifiable;
@@ -179,7 +181,7 @@ namespace dbaccess
}
// .........................................................................
- static void lcl_readObjectMap_throw( const ::comphelper::ComponentContext& i_rContext, const Reference< XStorage >& i_rStorage,
+ static void lcl_readObjectMap_throw( const Reference<XComponentContext> & i_rxContext, const Reference< XStorage >& i_rStorage,
MapStringToCompDesc& o_mapStorageToObjectName )
{
ENSURE_OR_THROW( i_rStorage.is(), "invalid storage" );
@@ -192,11 +194,9 @@ namespace dbaccess
Reference< XStream > xIniStream( i_rStorage->openStreamElement(
lcl_getObjectMapStreamName(), ElementModes::READ ), UNO_SET_THROW );
- Reference< XTextInputStream > xTextInput( i_rContext.createComponent( "com.sun.star.io.TextInputStream" ), UNO_QUERY_THROW );
+ Reference< XTextInputStream2 > xTextInput = TextInputStream::create( i_rxContext );
xTextInput->setEncoding( lcl_getMapStreamEncodingName() );
-
- Reference< XActiveDataSink > xDataSink( xTextInput, UNO_QUERY_THROW );
- xDataSink->setInputStream( xIniStream->getInputStream() );
+ xTextInput->setInputStream( xIniStream->getInputStream() );
::rtl::OUString sCurrentSection;
bool bCurrentSectionIsKnownToBeUnsupported = true;
@@ -352,7 +352,7 @@ namespace dbaccess
Reference< XStorage > xComponentsStor( xRecoveryStorage->openStorageElement(
SubComponentRecovery::getComponentsStorageName( aKnownTypes[i] ), ElementModes::READ ) );
- lcl_readObjectMap_throw( m_pData->aContext, xComponentsStor, aMapCompDescs[ aKnownTypes[i] ] );
+ lcl_readObjectMap_throw( m_pData->aContext.getUNOContext(), xComponentsStor, aMapCompDescs[ aKnownTypes[i] ] );
xComponentsStor->dispose();
}
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index d0bfb79ec265..7032b8fa4653 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -31,6 +31,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
+#include <comphelper/processfactory.hxx>
// UNO classes
#include <com/sun/star/xml/dom/XNode.hpp>
@@ -42,7 +43,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XTextInputStream.hpp>
+#include <com/sun/star/io/TextInputStream.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -57,7 +58,8 @@ using rtl::OUStringBuffer;
using com::sun::star::beans::PropertyValue;
using com::sun::star::io::XInputStream;
using com::sun::star::io::XActiveDataSink;
-using com::sun::star::io::XTextInputStream;
+using com::sun::star::io::TextInputStream;
+using com::sun::star::io::XTextInputStream2;
using com::sun::star::container::XEnumeration;
using com::sun::star::container::XNameContainer;
using com::sun::star::xforms::XFormsSupplier;
@@ -838,11 +840,8 @@ static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
aSerialization.serialize();
// copy stream into buffer
- Reference<XTextInputStream> xTextInputStream(
- createInstance( "com.sun.star.io.TextInputStream" ),
- UNO_QUERY );
- Reference<XActiveDataSink>( xTextInputStream, UNO_QUERY_THROW )
- ->setInputStream( aSerialization.getInputStream() );
+ Reference<XTextInputStream2> xTextInputStream = TextInputStream::create( comphelper::getProcessComponentContext() );
+ xTextInputStream->setInputStream( aSerialization.getInputStream() );
/* WORK AROUND for problem in serialization: currently, multiple
XML delarations (<?xml...?>) are being written out and we don't
diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx
index 15e9dae1ca84..df62262a264b 100644
--- a/forms/source/xforms/unohelper.cxx
+++ b/forms/source/xforms/unohelper.cxx
@@ -46,17 +46,6 @@ using com::sun::star::beans::PropertyAttribute::READONLY;
using rtl::OUString;
-Reference<XInterface> xforms::createInstance( const OUString& sServiceName )
-{
- Reference<XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
- OSL_ENSURE( xFactory.is(), "can't get service factory" );
-
- Reference<XInterface> xInstance = xFactory->createInstance( sServiceName );
- OSL_ENSURE( xInstance.is(), "failed to create instance" );
-
- return xInstance;
-}
-
void xforms::copy( const Reference<XPropertySet>& xFrom,
Reference<XPropertySet>& xTo )
{
diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx
index 41e78fde5b9c..84f07da13316 100644
--- a/forms/source/xforms/unohelper.hxx
+++ b/forms/source/xforms/unohelper.hxx
@@ -35,10 +35,6 @@ namespace com { namespace sun { namespace star {
namespace xforms
{
-/** instantiate a UNO service using the process global service factory */
-com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
- createInstance( const rtl::OUString& sServiceName );
-
/** copy the properties from one PropertySet into the next */
void copy( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& , com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& );
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index a2fe77425d9c..0a3e9035808f 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -25,14 +25,13 @@
#include <uno/mapping.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <rtl/textenc.h>
#include <rtl/tencinfo.h>
-#include <com/sun/star/io/XTextInputStream.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/io/XTextInputStream2.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -54,7 +53,7 @@ namespace io_TextInputStream
//===========================================================================
// Implementation XTextInputStream
-typedef WeakImplHelper3< XTextInputStream, XActiveDataSink, XServiceInfo > TextInputStreamHelper;
+typedef WeakImplHelper2< XTextInputStream2, XServiceInfo > TextInputStreamHelper;
#define INITIAL_UNICODE_BUFFER_CAPACITY 0x100
#define READ_BYTE_COUNT 0x100
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e890208f2fe5..d6e15e5cedae 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx
index 2ac99ad66963..944f32950f4b 100644
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/oox/inc/oox/helper/textinputstream.hxx
@@ -25,7 +25,7 @@
namespace com { namespace sun { namespace star {
namespace io { class XInputStream; }
- namespace io { class XTextInputStream; }
+ namespace io { class XTextInputStream2; }
namespace uno { class XComponentContext; }
} } }
@@ -91,7 +91,7 @@ public:
/** Creates a UNO text input stream object from the passed UNO input stream.
*/
- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+ static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
createXTextInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
@@ -108,7 +108,7 @@ private:
::rtl::OUString createFinalString( const ::rtl::OUString& rString );
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
mxTextStrm;
sal_Unicode mcPendingChar;
};
diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/oox/inc/oox/vml/vmlinputstream.hxx
index 1670654a25d7..5c23af76971f 100644
--- a/oox/inc/oox/vml/vmlinputstream.hxx
+++ b/oox/inc/oox/vml/vmlinputstream.hxx
@@ -25,7 +25,7 @@
#include <rtl/string.hxx>
namespace com { namespace sun { namespace star {
- namespace io { class XTextInputStream; }
+ namespace io { class XTextInputStream2; }
namespace uno { class XComponentContext; }
} } }
@@ -78,7 +78,7 @@ private:
::rtl::OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
mxTextStrm;
::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket;
::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket;
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 926beb963455..7bc5b5ac9aad 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -20,7 +20,7 @@
#include "oox/helper/textinputstream.hxx"
#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XTextInputStream.hpp>
+#include <com/sun/star/io/TextInputStream.hpp>
#include <cppuhelper/implbase1.hxx>
#include <rtl/tencinfo.h>
#include "oox/helper/binaryinputstream.hxx"
@@ -184,18 +184,16 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
return OUString();
}
-/*static*/ Reference< XTextInputStream > TextInputStream::createXTextInputStream(
+/*static*/ Reference< XTextInputStream2 > TextInputStream::createXTextInputStream(
const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
{
- Reference< XTextInputStream > xTextStrm;
+ Reference< XTextInputStream2 > xTextStrm;
const char* pcCharset = rtl_getBestMimeCharsetFromTextEncoding( eTextEnc );
OSL_ENSURE( pcCharset, "TextInputStream::createXTextInputStream - unsupported text encoding" );
if( rxContext.is() && rxInStrm.is() && pcCharset ) try
{
- Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
- Reference< XActiveDataSink > xDataSink( xFactory->createInstance( "com.sun.star.io.TextInputStream" ), UNO_QUERY_THROW );
- xDataSink->setInputStream( rxInStrm );
- xTextStrm.set( xDataSink, UNO_QUERY_THROW );
+ xTextStrm = com::sun::star::io::TextInputStream::create( rxContext );
+ xTextStrm->setInputStream( rxInStrm );
xTextStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
}
catch (const Exception&)
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 340d5b22effa..48d0a3c42987 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -19,7 +19,7 @@
#include "oox/vml/vmlinputstream.hxx"
-#include <com/sun/star/io/XTextInputStream.hpp>
+#include <com/sun/star/io/XTextInputStream2.hpp>
#include <map>
#include <string.h>
#include <rtl/strbuf.hxx>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 1b30c81bacd7..311df0013fce 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -19,7 +19,7 @@
#include "stringresource.hxx"
#include <com/sun/star/io/TempFile.hpp>
-#include <com/sun/star/io/XTextInputStream.hpp>
+#include <com/sun/star/io/TextInputStream.hpp>
#include <com/sun/star/io/XTextOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
@@ -1969,7 +1969,7 @@ sal_Unicode getEscapeChar( const sal_Unicode* pBuf, sal_Int32 nLen, sal_Int32& r
return cRet;
}
-void CheckContinueInNextLine( Reference< io::XTextInputStream > xTextInputStream,
+void CheckContinueInNextLine( Reference< io::XTextInputStream2 > xTextInputStream,
::rtl::OUString& aLine, bool& bEscapePending, const sal_Unicode*& pBuf,
sal_Int32& nLen, sal_Int32& i )
{
@@ -1996,127 +1996,118 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile
return false;
bool bSuccess = false;
- Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
- Reference< io::XTextInputStream > xTextInputStream( xMCF->createInstanceWithContext
- ( ::rtl::OUString("com.sun.star.io.TextInputStream"), m_xContext ), UNO_QUERY );
+ Reference< io::XTextInputStream2 > xTextInputStream = io::TextInputStream::create( m_xContext );
+
+ bSuccess = true;
+
+ xTextInputStream->setInputStream( xInputStream );
+
+ ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii
+ ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
+ xTextInputStream->setEncoding( aEncodingStr );
- if( xTextInputStream.is() )
+ ::rtl::OUString aLine;
+ while( !xTextInputStream->isEOF() )
{
- Reference< io::XActiveDataSink> xActiveDataSink( xTextInputStream, UNO_QUERY );
- if( xActiveDataSink.is() )
- {
- bSuccess = true;
+ aLine = xTextInputStream->readLine();
- xActiveDataSink->setInputStream( xInputStream );
+ sal_Int32 nLen = aLine.getLength();
+ if( 0 == nLen )
+ continue;
+ const sal_Unicode* pBuf = aLine.getStr();
+ ::rtl::OUStringBuffer aBuf;
+ sal_Unicode c = 0;
+ sal_Int32 i = 0;
- ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii
- ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
- xTextInputStream->setEncoding( aEncodingStr );
+ skipWhites( pBuf, nLen, i );
+ if( i == nLen )
+ continue; // line contains only white spaces
+
+ // Comment?
+ c = pBuf[i];
+ if( c == '#' || c == '!' )
+ continue;
- ::rtl::OUString aLine;
- while( !xTextInputStream->isEOF() )
+ // Scan key
+ ::rtl::OUString aResourceID;
+ bool bEscapePending = false;
+ bool bStrComplete = false;
+ while( i < nLen && !bStrComplete )
+ {
+ c = pBuf[i];
+ if( bEscapePending )
+ {
+ aBuf.append( getEscapeChar( pBuf, nLen, i ) );
+ bEscapePending = false;
+ }
+ else
{
- aLine = xTextInputStream->readLine();
-
- sal_Int32 nLen = aLine.getLength();
- if( 0 == nLen )
- continue;
- const sal_Unicode* pBuf = aLine.getStr();
- ::rtl::OUStringBuffer aBuf;
- sal_Unicode c = 0;
- sal_Int32 i = 0;
-
- skipWhites( pBuf, nLen, i );
- if( i == nLen )
- continue; // line contains only white spaces
-
- // Comment?
- c = pBuf[i];
- if( c == '#' || c == '!' )
- continue;
-
- // Scan key
- ::rtl::OUString aResourceID;
- bool bEscapePending = false;
- bool bStrComplete = false;
- while( i < nLen && !bStrComplete )
+ if( c == '\\' )
{
- c = pBuf[i];
- if( bEscapePending )
- {
- aBuf.append( getEscapeChar( pBuf, nLen, i ) );
- bEscapePending = false;
- }
- else
- {
- if( c == '\\' )
- {
- bEscapePending = true;
- }
- else
- {
- if( c == ':' || c == '=' || isWhiteSpace( c ) )
- bStrComplete = true;
- else
- aBuf.append( c );
- }
- }
- i++;
-
- CheckContinueInNextLine( xTextInputStream, aLine, bEscapePending, pBuf, nLen, i );
- if( i == nLen )
+ bEscapePending = true;
+ }
+ else
+ {
+ if( c == ':' || c == '=' || isWhiteSpace( c ) )
bStrComplete = true;
-
- if( bStrComplete )
- aResourceID = aBuf.makeStringAndClear();
+ else
+ aBuf.append( c );
}
+ }
+ i++;
- // Ignore lines with empty keys
- if( aResourceID.isEmpty() )
- continue;
+ CheckContinueInNextLine( xTextInputStream, aLine, bEscapePending, pBuf, nLen, i );
+ if( i == nLen )
+ bStrComplete = true;
- // Scan value
- skipWhites( pBuf, nLen, i );
+ if( bStrComplete )
+ aResourceID = aBuf.makeStringAndClear();
+ }
- ::rtl::OUString aValueStr;
- bEscapePending = false;
- bStrComplete = false;
- while( i < nLen && !bStrComplete )
- {
- c = pBuf[i];
- if( c == 0x000a || c == 0x000d ) // line feed/carriage return, not always handled by TextInputStream
- {
- i++;
- }
- else
- {
- if( bEscapePending )
- {
- aBuf.append( getEscapeChar( pBuf, nLen, i ) );
- bEscapePending = false;
- }
- else if( c == '\\' )
- bEscapePending = true;
- else
- aBuf.append( c );
- i++;
+ // Ignore lines with empty keys
+ if( aResourceID.isEmpty() )
+ continue;
- CheckContinueInNextLine( xTextInputStream, aLine, bEscapePending, pBuf, nLen, i );
- }
- if( i == nLen )
- bStrComplete = true;
+ // Scan value
+ skipWhites( pBuf, nLen, i );
- if( bStrComplete )
- aValueStr = aBuf.makeStringAndClear();
+ ::rtl::OUString aValueStr;
+ bEscapePending = false;
+ bStrComplete = false;
+ while( i < nLen && !bStrComplete )
+ {
+ c = pBuf[i];
+ if( c == 0x000a || c == 0x000d ) // line feed/carriage return, not always handled by TextInputStream
+ {
+ i++;
+ }
+ else
+ {
+ if( bEscapePending )
+ {
+ aBuf.append( getEscapeChar( pBuf, nLen, i ) );
+ bEscapePending = false;
}
+ else if( c == '\\' )
+ bEscapePending = true;
+ else
+ aBuf.append( c );
+ i++;
- // Push into table
- pLocaleItem->m_aIdToStringMap[ aResourceID ] = aValueStr;
- implScanIdForNumber( aResourceID );
- IdToIndexMap& rIndexMap = pLocaleItem->m_aIdToIndexMap;
- rIndexMap[ aResourceID ] = pLocaleItem->m_nNextIndex++;
+ CheckContinueInNextLine( xTextInputStream, aLine, bEscapePending, pBuf, nLen, i );
}
+ if( i == nLen )
+ bStrComplete = true;
+
+ if( bStrComplete )
+ aValueStr = aBuf.makeStringAndClear();
}
+
+ // Push into table
+ pLocaleItem->m_aIdToStringMap[ aResourceID ] = aValueStr;
+ implScanIdForNumber( aResourceID );
+ IdToIndexMap& rIndexMap = pLocaleItem->m_aIdToIndexMap;
+ rIndexMap[ aResourceID ] = pLocaleItem->m_nNextIndex++;
}
return bSuccess;
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: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 11:48:30 +0000