summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx18
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx7
-rw-r--r--offapi/type_reference/types.rdbbin7440384 -> 7440384 bytes
-rw-r--r--oox/inc/oox/dump/dumperbase.hxx8
-rw-r--r--oox/source/dump/dumperbase.cxx14
-rw-r--r--scripting/source/stringresource/stringresource.cxx122
-rw-r--r--udkapi/UnoApi_udkapi.mk3
-rw-r--r--udkapi/com/sun/star/io/TextOutputStream.idl14
-rw-r--r--udkapi/com/sun/star/io/XTextOutputStream2.idl48
9 files changed, 128 insertions, 106 deletions
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 26d5cfab2216..7251ddb54f72 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -20,8 +20,7 @@
#include "storagetextstream.hxx"
-#include <com/sun/star/io/XTextOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/TextOutputStream.hpp>
#include <comphelper/componentcontext.hxx>
#include <tools/diagnose_ex.h>
@@ -44,7 +43,8 @@ namespace dbaccess
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Type;
using ::com::sun::star::embed::XStorage;
- using ::com::sun::star::io::XTextOutputStream;
+ using ::com::sun::star::io::TextOutputStream;
+ using ::com::sun::star::io::XTextOutputStream2;
using ::com::sun::star::io::XActiveDataSource;
/** === end UNO using === **/
@@ -53,7 +53,7 @@ namespace dbaccess
//==================================================================================================================
struct StorageTextOutputStream_Data
{
- Reference< XTextOutputStream > xTextOutput;
+ Reference< XTextOutputStream2 > xTextOutput;
};
//==================================================================================================================
@@ -87,11 +87,9 @@ namespace dbaccess
:StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
,m_pData( new StorageTextOutputStream_Data )
{
- m_pData->xTextOutput.set( i_rContext.createComponent( "com.sun.star.io.TextOutputStream" ), UNO_QUERY_THROW );
+ m_pData->xTextOutput = TextOutputStream::create( i_rContext.getUNOContext() );
m_pData->xTextOutput->setEncoding( lcl_getTextStreamEncodingName() );
-
- Reference< XActiveDataSource > xDataSource( m_pData->xTextOutput, UNO_QUERY_THROW );
- xDataSource->setOutputStream( getOutputStream() );
+ m_pData->xTextOutput->setOutputStream( getOutputStream() );
}
//------------------------------------------------------------------------------------------------------------------
@@ -102,8 +100,6 @@ namespace dbaccess
//------------------------------------------------------------------------------------------------------------------
void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine )
{
- ENSURE_OR_RETURN_VOID( m_pData->xTextOutput.is(), "no text output" );
-
m_pData->xTextOutput->writeString( i_rLine );
m_pData->xTextOutput->writeString( lcl_getLineFeed() );
}
@@ -111,8 +107,6 @@ namespace dbaccess
//------------------------------------------------------------------------------------------------------------------
void StorageTextOutputStream::writeLine()
{
- ENSURE_OR_RETURN_VOID( m_pData->xTextOutput.is(), "no text output" );
-
m_pData->xTextOutput->writeString( lcl_getLineFeed() );
}
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index a9916b6a817c..d22add793a59 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -23,15 +23,14 @@
#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 <rtl/unload.h>
-#include <com/sun/star/io/XTextOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XTextOutputStream2.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -52,7 +51,7 @@ namespace io_TextOutputStream
//===========================================================================
// Implementation XTextOutputStream
-typedef WeakImplHelper3< XTextOutputStream, XActiveDataSource, XServiceInfo > TextOutputStreamHelper;
+typedef WeakImplHelper2< XTextOutputStream2, XServiceInfo > TextOutputStreamHelper;
class OTextOutputStream : public TextOutputStreamHelper
{
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index d6e15e5cedae..95b71c216219 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 5a73eb18043f..6ba5ab7d4e5c 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -41,7 +41,7 @@
namespace com { namespace sun { namespace star {
namespace io { class XInputStream; }
namespace io { class XOutputStream; }
- namespace io { class XTextOutputStream; }
+ namespace io { class XTextOutputStream2; }
namespace uno { class XComponentContext; }
} } }
@@ -124,13 +124,13 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::rtl::OUString& rFileName );
- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
+ static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
openTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
rtl_TextEncoding eTextEnc );
- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
+ static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
openTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::rtl::OUString& rFileName,
@@ -1072,7 +1072,7 @@ private:
private:
typedef ::std::vector< sal_Int32 > StringLenVec;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream > mxStrm;
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm;
::rtl::OUString maIndent;
::rtl::OUStringBuffer maLine;
::rtl::OUString maLastItem;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index a3cdcf62ed35..8f8aa49516d8 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -22,7 +22,7 @@
#include <algorithm>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XTextOutputStream.hpp>
+#include <com/sun/star/io/TextOutputStream.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <comphelper/docpasswordhelper.hxx>
#include <osl/file.hxx>
@@ -126,17 +126,15 @@ Reference< XOutputStream > InputOutputHelper::openOutputStream(
return xOutStrm;
}
-Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
+Reference< XTextOutputStream2 > InputOutputHelper::openTextOutputStream(
const Reference< XComponentContext >& rxContext, const Reference< XOutputStream >& rxOutStrm, rtl_TextEncoding eTextEnc )
{
- Reference< XTextOutputStream > xTextOutStrm;
+ Reference< XTextOutputStream2 > xTextOutStrm;
const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
if( rxContext.is() && rxOutStrm.is() && pcCharset ) try
{
- Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
- Reference< XActiveDataSource > xDataSource( xFactory->createInstance( "com.sun.star.io.TextOutputStream" ), UNO_QUERY_THROW );
- xDataSource->setOutputStream( rxOutStrm );
- xTextOutStrm.set( xDataSource, UNO_QUERY_THROW );
+ xTextOutStrm = TextOutputStream::create(rxContext);
+ xTextOutStrm->setOutputStream( rxOutStrm );
xTextOutStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
}
catch( Exception& )
@@ -145,7 +143,7 @@ Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
return xTextOutStrm;
}
-Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
+Reference< XTextOutputStream2 > InputOutputHelper::openTextOutputStream(
const Reference< XComponentContext >& rxContext, const OUString& rFileName, rtl_TextEncoding eTextEnc )
{
return openTextOutputStream( rxContext, openOutputStream( rxContext, rFileName ), eTextEnc );
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 311df0013fce..8b0db02c5089 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -20,7 +20,7 @@
#include "stringresource.hxx"
#include <com/sun/star/io/TempFile.hpp>
#include <com/sun/star/io/TextInputStream.hpp>
-#include <com/sun/star/io/XTextOutputStream.hpp>
+#include <com/sun/star/io/TextOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XStream.hpp>
@@ -2175,7 +2175,7 @@ void implWriteCharToBuffer( ::rtl::OUStringBuffer& aBuf, sal_Unicode cu, bool bK
}
void implWriteStringWithEncoding( const ::rtl::OUString& aStr,
- Reference< io::XTextOutputStream > xTextOutputStream, bool bKey )
+ Reference< io::XTextOutputStream2 > xTextOutputStream, bool bKey )
{
static sal_Unicode cLineFeed = 0xa;
@@ -2208,79 +2208,71 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
return false;
bool bSuccess = false;
- Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
- Reference< io::XTextOutputStream > xTextOutputStream( xMCF->createInstanceWithContext
- ( ::rtl::OUString("com.sun.star.io.TextOutputStream"), m_xContext ), UNO_QUERY );
+ Reference< io::XTextOutputStream2 > xTextOutputStream = io::TextOutputStream::create(m_xContext);
- if( xTextOutputStream.is() )
- {
- Reference< io::XActiveDataSource> xActiveDataSource( xTextOutputStream, UNO_QUERY );
- if( xActiveDataSource.is() )
- {
- xActiveDataSource->setOutputStream( xOutputStream );
+ xTextOutputStream->setOutputStream( xOutputStream );
- ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii
- ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
- xTextOutputStream->setEncoding( aEncodingStr );
+ ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii
+ ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
+ xTextOutputStream->setEncoding( aEncodingStr );
- xTextOutputStream->writeString( aComment );
- xTextOutputStream->writeString( aLineFeedStr );
+ xTextOutputStream->writeString( aComment );
+ xTextOutputStream->writeString( aLineFeedStr );
- const IdToStringMap& rHashMap = pLocaleItem->m_aIdToStringMap;
- if( rHashMap.size() > 0 )
- {
- // Sort ids according to read order
- const IdToIndexMap& rIndexMap = pLocaleItem->m_aIdToIndexMap;
- IdToIndexMap::const_iterator it_index;
-
- // Find max/min index
- sal_Int32 nMinIndex = -1;
- sal_Int32 nMaxIndex = -1;
- for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
- {
- sal_Int32 nIndex = (*it_index).second;
- if( nMinIndex > nIndex || nMinIndex == -1 )
- nMinIndex = nIndex;
- if( nMaxIndex < nIndex )
- nMaxIndex = nIndex;
- }
- sal_Int32 nTabSize = nMaxIndex - nMinIndex + 1;
-
- // Create sorted array of pointers to the id strings
- const ::rtl::OUString** pIdPtrs = new const ::rtl::OUString*[nTabSize];
- sal_Int32 i;
- for( i = 0 ; i < nTabSize ; i++ )
- pIdPtrs[i] = NULL;
- for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
- {
- sal_Int32 nIndex = (*it_index).second;
- pIdPtrs[nIndex - nMinIndex] = &((*it_index).first);
- }
+ const IdToStringMap& rHashMap = pLocaleItem->m_aIdToStringMap;
+ if( rHashMap.size() > 0 )
+ {
+ // Sort ids according to read order
+ const IdToIndexMap& rIndexMap = pLocaleItem->m_aIdToIndexMap;
+ IdToIndexMap::const_iterator it_index;
- // Write lines in correct order
- for( i = 0 ; i < nTabSize ; i++ )
+ // Find max/min index
+ sal_Int32 nMinIndex = -1;
+ sal_Int32 nMaxIndex = -1;
+ for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
+ {
+ sal_Int32 nIndex = (*it_index).second;
+ if( nMinIndex > nIndex || nMinIndex == -1 )
+ nMinIndex = nIndex;
+ if( nMaxIndex < nIndex )
+ nMaxIndex = nIndex;
+ }
+ sal_Int32 nTabSize = nMaxIndex - nMinIndex + 1;
+
+ // Create sorted array of pointers to the id strings
+ const ::rtl::OUString** pIdPtrs = new const ::rtl::OUString*[nTabSize];
+ sal_Int32 i;
+ for( i = 0 ; i < nTabSize ; i++ )
+ pIdPtrs[i] = NULL;
+ for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
+ {
+ sal_Int32 nIndex = (*it_index).second;
+ pIdPtrs[nIndex - nMinIndex] = &((*it_index).first);
+ }
+
+ // Write lines in correct order
+ for( i = 0 ; i < nTabSize ; i++ )
+ {
+ const ::rtl::OUString* pStr = pIdPtrs[i];
+ if( pStr != NULL )
+ {
+ ::rtl::OUString aResourceID = *pStr;
+ IdToStringMap::const_iterator it = rHashMap.find( aResourceID );
+ if( !( it == rHashMap.end() ) )
{
- const ::rtl::OUString* pStr = pIdPtrs[i];
- if( pStr != NULL )
- {
- ::rtl::OUString aResourceID = *pStr;
- IdToStringMap::const_iterator it = rHashMap.find( aResourceID );
- if( !( it == rHashMap.end() ) )
- {
- implWriteStringWithEncoding( aResourceID, xTextOutputStream, true );
- xTextOutputStream->writeString( aAssignmentStr );
- ::rtl::OUString aValStr = (*it).second;
- implWriteStringWithEncoding( aValStr, xTextOutputStream, false );
- }
- }
+ implWriteStringWithEncoding( aResourceID, xTextOutputStream, true );
+ xTextOutputStream->writeString( aAssignmentStr );
+ ::rtl::OUString aValStr = (*it).second;
+ implWriteStringWithEncoding( aValStr, xTextOutputStream, false );
}
-
- delete pIdPtrs;
}
-
- bSuccess = true;
}
+
+ delete pIdPtrs;
}
+
+ bSuccess = true;
+
return bSuccess;
}
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: */
generated by cgit (git 2.34.1) at 2025-02-13 04:52:17 +0000