diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 14:49:41 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:17 +0200 |
commit | 892f4c2ad87063fc4f5b10516e23e3f0ac1b836b (patch) | |
tree | 2d56b7d30f6d73cd128ebdf57ebc04d909080c34 /filter | |
parent | 9d17726dcd629f3d588327dbfb0e35fc70ec262c (diff) |
stario -> css::io
Change-Id: I4e82694399e72ce17172ac3d3c3cd9f9bcd30ba5
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/swffilter.cxx | 2 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.cxx | 8 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.hxx | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index bbbf0f18c6e6..50df6baceae7 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -77,7 +77,7 @@ public: mrFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } - // stario::XOutputStream + // css::io::XOutputStream virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index d88ad1cfc99b..bcc2d97cb753 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -33,23 +33,23 @@ using namespace ::osl; //= OOutputStreamWrapper -void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { sal_uInt64 nWritten = 0; rStream.write(aData.getConstArray(),aData.getLength(),nWritten); if (nWritten != (sal_uInt64)aData.getLength()) { - throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); } } -void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } -void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index 01d2bdaa07a5..7da2eaf38a93 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -32,13 +32,12 @@ namespace osl namespace foo { - namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; //= OOutputStreamWrapper -typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamWrapper_Base; +typedef ::cppu::WeakImplHelper1<css::io::XOutputStream> OutputStreamWrapper_Base; // needed for some compilers class OOutputStreamWrapper : public OutputStreamWrapper_Base { @@ -47,10 +46,10 @@ class OOutputStreamWrapper : public OutputStreamWrapper_Base public: OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { } -// stario::XOutputStream - virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XOutputStream + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace utl |