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 /forms/source/component | |
parent | 9d17726dcd629f3d588327dbfb0e35fc70ec262c (diff) |
stario -> css::io
Change-Id: I4e82694399e72ce17172ac3d3c3cd9f9bcd30ba5
Diffstat (limited to 'forms/source/component')
-rw-r--r-- | forms/source/component/CheckBox.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/ComboBox.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/File.cxx | 4 | ||||
-rw-r--r-- | forms/source/component/FormComponent.cxx | 30 | ||||
-rw-r--r-- | forms/source/component/Time.hxx | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 365e4ed1d736..e092bbe61797 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -137,8 +137,8 @@ OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException, std:: } -void SAL_CALL OCheckBoxModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) - throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OCheckBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) + throw(css::io::IOException, RuntimeException, std::exception) { OReferenceValueComponent::write(_rxOutStream); @@ -153,7 +153,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference<stario::XObjectOutputStream> } -void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OCheckBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception) { OReferenceValueComponent::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index e7c1730ebaa2..a6d881769d4e 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -324,8 +324,8 @@ OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException, std:: } -void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) - throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) + throw(css::io::IOException, RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -362,7 +362,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream> } -void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); ControlModelLock aLock( *this ); diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index ddd194fe5aa5..6690b02c20ed 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -200,7 +200,7 @@ OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star:: } -void OFileControlModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -214,7 +214,7 @@ void OFileControlModel::write(const Reference<stario::XObjectOutputStream>& _rxO } -void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 9d21d40ddb4e..96ce237c388a 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 css::uno::Reference< stario::XObjectInputStream >& _rxInStream) +void OControlModel::readHelpTextCompatibly(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) { OUString sHelpText; ::comphelper::operator>>( _rxInStream, sHelpText); @@ -484,7 +484,7 @@ void OControlModel::readHelpTextCompatibly(const css::uno::Reference< stario::XO } } -void OControlModel::writeHelpTextCompatibly(const css::uno::Reference< stario::XObjectOutputStream >& _rxOutStream) +void OControlModel::writeHelpTextCompatibly(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) { OUString sHelpText; try @@ -730,13 +730,13 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS xPersist->read( _rxInStream ); } -void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) - throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) + throw(css::io::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); // 1. writing the UnoControls - Reference<stario::XMarkableStream> xMark(_rxOutStream, UNO_QUERY); + Reference<css::io::XMarkableStream> xMark(_rxOutStream, UNO_QUERY); if ( !xMark.is() ) { throw IOException( @@ -775,11 +775,11 @@ void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>& // EOIN! } -void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) throw (::com::sun::star::io::IOException, RuntimeException, std::exception) +void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) throw (::com::sun::star::io::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); - Reference<stario::XMarkableStream> xMark(InStream, UNO_QUERY); + Reference<css::io::XMarkableStream> xMark(InStream, UNO_QUERY); if ( !xMark.is() ) { throw IOException( @@ -1525,7 +1525,7 @@ Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Stati } // XPersist -void SAL_CALL OBoundControlModel::write( const Reference<stario::XObjectOutputStream>& _rxOutStream ) throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputStream>& _rxOutStream ) throw(css::io::IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); osl::MutexGuard aGuard(m_aMutex); @@ -1550,14 +1550,14 @@ void OBoundControlModel::defaultCommonProperties() m_xLabelControl = NULL; } -void OBoundControlModel::readCommonProperties(const Reference<stario::XObjectInputStream>& _rxInStream) +void OBoundControlModel::readCommonProperties(const Reference<css::io::XObjectInputStream>& _rxInStream) { sal_Int32 nLen = _rxInStream->readLong(); - Reference<stario::XMarkableStream> xMark(_rxInStream, UNO_QUERY); + Reference<css::io::XMarkableStream> xMark(_rxInStream, UNO_QUERY); DBG_ASSERT(xMark.is(), "OBoundControlModel::readCommonProperties : can only work with markable streams !"); sal_Int32 nMark = xMark->createMark(); // read the reference to the label control - Reference<stario::XPersistObject> xPersist; + Reference<css::io::XPersistObject> xPersist; sal_Int32 nUsedFlag; nUsedFlag = _rxInStream->readLong(); if (nUsedFlag) @@ -1573,16 +1573,16 @@ void OBoundControlModel::readCommonProperties(const Reference<stario::XObjectInp xMark->deleteMark(nMark); } -void OBoundControlModel::writeCommonProperties(const Reference<stario::XObjectOutputStream>& _rxOutStream) +void OBoundControlModel::writeCommonProperties(const Reference<css::io::XObjectOutputStream>& _rxOutStream) { - Reference<stario::XMarkableStream> xMark(_rxOutStream, UNO_QUERY); + Reference<css::io::XMarkableStream> xMark(_rxOutStream, UNO_QUERY); DBG_ASSERT(xMark.is(), "OBoundControlModel::writeCommonProperties : can only work with markable streams !"); sal_Int32 nMark = xMark->createMark(); // a placeholder where we will write the overall length (later in this method) sal_Int32 nLen = 0; _rxOutStream->writeLong(nLen); // write the reference to the label control - Reference<stario::XPersistObject> xPersist(m_xLabelControl, UNO_QUERY); + Reference<css::io::XPersistObject> xPersist(m_xLabelControl, UNO_QUERY); sal_Int32 nUsedFlag = 0; if (xPersist.is()) nUsedFlag = 1; @@ -1598,7 +1598,7 @@ void OBoundControlModel::writeCommonProperties(const Reference<stario::XObjectOu xMark->deleteMark(nMark); } -void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStream >& _rxInStream ) throw(stario::IOException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::read( const Reference< css::io::XObjectInputStream >& _rxInStream ) throw(css::io::IOException, RuntimeException, std::exception) { OControlModel::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 76aadfb574e0..dfef239d93fb 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -41,7 +41,7 @@ protected: public: DECLARE_DEFAULT_LEAF_XTOR( OTimeModel ); - // stario::XPersistObject + // css::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertySet |