diff options
author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-29 21:41:06 +0100 |
---|---|---|
committer | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-31 10:21:07 +0100 |
commit | be9d9fee66aaa7123bd84b3d5a4fc08457774544 (patch) | |
tree | aeaeaf6f1ecb65d12a0ce7953a8e653aa55805c5 /comphelper/source/streaming | |
parent | 95692db60e47442924077dc463bbd729cc71ee04 (diff) |
RTL_CONSTASCII_(U)STRINGPARAM removed in comphelper
Change-Id: Ib068c06956bc9f04bb7c468375aacd2e6e9db77d
Diffstat (limited to 'comphelper/source/streaming')
-rw-r--r-- | comphelper/source/streaming/memorystream.cxx | 4 | ||||
-rw-r--r-- | comphelper/source/streaming/seqinputstreamserv.cxx | 15 | ||||
-rw-r--r-- | comphelper/source/streaming/seqoutputstreamserv.cxx | 10 |
3 files changed, 14 insertions, 15 deletions
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 1dd6188c6ab1..fb654abb4f23 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -148,7 +148,7 @@ void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOExce void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException) { if( (location < 0) || (location > SAL_MAX_INT32) ) - throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("this implementation does not support more than 2GB!")), Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 ); + throw IllegalArgumentException( OUString("this implementation does not support more than 2GB!"), Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 ); // seek operation should be able to resize the stream if ( location > static_cast< sal_Int64 >( maData.size() ) ) @@ -180,7 +180,7 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t if( nNewSize > SAL_MAX_INT32 ) { OSL_ASSERT(false); - throw IOException( OUString(RTL_CONSTASCII_USTRINGPARAM("this implementation does not support more than 2GB!")), Reference< XInterface >(static_cast<OWeakObject*>(this)) ); + throw IOException( OUString("this implementation does not support more than 2GB!"), Reference< XInterface >(static_cast<OWeakObject*>(this)) ); } if( static_cast< sal_Int32 >( nNewSize ) > static_cast< sal_Int32 >( maData.size() ) ) diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 9f7b74c4d777..c26c7bd9bbff 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -95,9 +95,9 @@ SequenceInputStreamService::SequenceInputStreamService() return getImplementationName_static(); } -::rtl::OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() +OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.SequenceInputStreamService" ) ); + return OUString( "com.sun.star.comp.SequenceInputStreamService" ); } ::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) @@ -115,11 +115,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupport return getSupportedServiceNames_static(); } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames_static() { - uno::Sequence< ::rtl::OUString > s( 1 ); - s[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.io.SequenceInputStream" ) ); + uno::Sequence< OUString > s( 1 ); + s[0] = "com.sun.star.io.SequenceInputStream"; return s; } @@ -213,7 +212,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com throw frame::DoubleInitializationException(); if ( aArguments.getLength() != 1 ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong number of arguments!\n")), + throw lang::IllegalArgumentException( OUString("Wrong number of arguments!\n"), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); @@ -229,7 +228,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com m_bInitialized = sal_True; } else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unexpected type of argument!\n")), + throw lang::IllegalArgumentException( OUString("Unexpected type of argument!\n"), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); } diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index f8b5fc01bd1b..9dc868b461e9 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -81,9 +81,9 @@ SequenceOutputStreamService::SequenceOutputStreamService() return getImplementationName_static(); } -::rtl::OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() +OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.SequenceOutputStreamService" ) ); + return OUString("com.sun.star.comp.SequenceOutputStreamService"); } ::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) @@ -101,10 +101,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSuppor return getSupportedServiceNames_static(); } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames_static() { - uno::Sequence< ::rtl::OUString > s( 1 ); - s[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.SequenceOutputStream" ) ); + uno::Sequence< OUString > s( 1 ); + s[0] = "com.sun.star.io.SequenceOutputStream"; return s; } |