diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-30 16:05:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:15 +0200 |
| commit | fbd4588afd596b96f988350174ad55e66db6d830 (patch) | |
| tree | debbe093822d476efa99de1447aa5000aaeb9076 /oox/source/dump | |
| parent | ff85e8319a263e428ce53f7758092475b953afba (diff) | |
fdo#46808, convert io::TextOutputStream service to new-style
Change-Id: I12af47afc21c2b646197893a77698f4e0818f94f
Diffstat (limited to 'oox/source/dump')
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
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 ); |