diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 14:46:03 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:16 +0200 |
commit | 9d17726dcd629f3d588327dbfb0e35fc70ec262c (patch) | |
tree | 30df65f3327defb23386c319a46008307228dd3c | |
parent | ab9e2ed4ca551768295ede7ab84d0b41f14cebc5 (diff) |
staruno -> css::uno
Change-Id: Ic82bbe5797d4f3c16096598cd566b917ee335a10
-rw-r--r-- | connectivity/source/commontools/dbexception.cxx | 4 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.cxx | 8 | ||||
-rw-r--r-- | forms/source/component/FormComponent.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index d8b71ee4f25a..6d43810f20a1 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -126,9 +126,9 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno: } -SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError) +SQLExceptionInfo::SQLExceptionInfo(const css::uno::Any& _rError) { - const staruno::Type& aSQLExceptionType = cppu::UnoType<com::sun::star::sdbc::SQLException>::get(); + const css::uno::Type& aSQLExceptionType = cppu::UnoType<com::sun::star::sdbc::SQLException>::get(); bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType()); if (bValid) m_aContent = _rError; diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 3f043123b751..d88ad1cfc99b 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 staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::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<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); } } -void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } -void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index ea99117dc18d..9d21d40ddb4e 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -468,7 +468,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE return aReturn; } -void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream) +void OControlModel::readHelpTextCompatibly(const css::uno::Reference< stario::XObjectInputStream >& _rxInStream) { OUString sHelpText; ::comphelper::operator>>( _rxInStream, sHelpText); @@ -484,7 +484,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb } } -void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream) +void OControlModel::writeHelpTextCompatibly(const css::uno::Reference< stario::XObjectOutputStream >& _rxOutStream) { OUString sHelpText; try |