diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 14:44:35 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:15 +0200 |
commit | ab9e2ed4ca551768295ede7ab84d0b41f14cebc5 (patch) | |
tree | a41f7d1f11f89da74dea72a916736e752d0e41e1 | |
parent | fa6a5ebc1c55cff3967338eb341187edaa977aa3 (diff) |
unotools: use css alias
Change-Id: I0440f589242d921e3e10e490e43f40cabd70ec9f
-rw-r--r-- | include/unotools/streamhelper.hxx | 6 | ||||
-rw-r--r-- | include/unotools/streamsection.hxx | 4 | ||||
-rw-r--r-- | include/unotools/streamwrap.hxx | 28 | ||||
-rw-r--r-- | unotools/source/streaming/streamhelper.cxx | 6 | ||||
-rw-r--r-- | unotools/source/streaming/streamwrap.cxx | 6 |
5 files changed, 25 insertions, 25 deletions
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index a1a964c6f179..075f4018266c 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -63,9 +63,9 @@ public: virtual sal_Int32 SAL_CALL available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL seek( sal_Int64 location ) throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace utl diff --git a/include/unotools/streamsection.hxx b/include/unotools/streamsection.hxx index c6b6d68027bc..ad45b4e12496 100644 --- a/include/unotools/streamsection.hxx +++ b/include/unotools/streamsection.hxx @@ -47,13 +47,13 @@ class OStreamSection public: /** starts reading of a "skippable" section of data within the given input stream<BR> @param _rxInput the stream to read from. Must support the - com::sun::star::io::XMarkableStream interface + css::io::XMarkableStream interface */ OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput); /** starts writing of a "skippable" section of data into the given output stream @param _rxOutput the stream the stream to write to. Must support the - com::sun::star::io::XMarkableStream interface + css::io::XMarkableStream interface @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this value will be written as section length and corrected (in the dtor) only if needed. If you know how much bytes you are about to write, you may diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index b5f65f585475..e8027ce7b205 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -73,12 +73,12 @@ protected: //= OSeekableInputStreamWrapper -typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable +typedef ::cppu::ImplHelper1 < css::io::XSeekable > OSeekableInputStreamWrapper_Base; /** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). */ -class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public ::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, com::sun::star::io::XSeekable > +class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public ::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, css::io::XSeekable > { protected: OSeekableInputStreamWrapper() {} @@ -87,9 +87,9 @@ public: OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false); // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; //= OOutputStreamWrapper @@ -118,7 +118,7 @@ protected: //= OSeekableOutputStreamWrapper -typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable +typedef ::cppu::ImplHelper1 < css::io::XSeekable > OSeekableOutputStreamWrapper_Base; /** helper class for wrapping an SvStream into an com.sun.star.io::XOutputStream which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). @@ -134,30 +134,30 @@ private: virtual ~OSeekableOutputStreamWrapper(); // disambiguate XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, com::sun::star::io::XStream, com::sun::star::io::XOutputStream, com::sun::star::io::XTruncate > +class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, css::io::XStream, css::io::XOutputStream, css::io::XTruncate > { public: OStreamWrapper(SvStream& _rStream); // css::io::XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::io::XOutputStream virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL truncate() throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index e905ce447f4b..1206cf0c81a6 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -58,18 +58,18 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& return nRead; } -void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); m_nActPos = location; } -sal_Int64 SAL_CALL OInputStreamHelper::getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL OInputStreamHelper::getPosition( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { return m_nActPos; } -sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) return 0; diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 2752b4783c0b..0c96bec87e0d 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -280,12 +280,12 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream) SetStream( &_rStream, false ); } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream( ) throw (css::uno::RuntimeException, std::exception) { return this; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream( ) throw (css::uno::RuntimeException, std::exception) { return this; } @@ -313,7 +313,7 @@ void SAL_CALL OStreamWrapper::closeOutput() throw(css::io::NotConnectedException { } -void SAL_CALL OStreamWrapper::truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OStreamWrapper::truncate() throw(css::io::IOException, css::uno::RuntimeException, std::exception) { m_pSvStream->SetStreamSize(0); } |