diff options
Diffstat (limited to 'forms/source/component/Grid.cxx')
-rw-r--r-- | forms/source/component/Grid.cxx | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 2b16c87705ae..c8128f3e8d9e 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -122,7 +122,7 @@ OGridControlModel::~OGridControlModel() } // XCloneable -Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) { OGridControlModel* pClone = new OGridControlModel( this, getContext() ); osl_atomic_increment( &pClone->m_refCount ); @@ -166,7 +166,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain } // XServiceInfo -css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 4); @@ -176,7 +176,7 @@ css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw aSupported[aSupported.getLength()-1] = FRM_COMPONENT_GRIDCONTROL; return aSupported; } -Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) { Any aReturn = OGridControlModel_BASE::queryInterface(_rType); if ( !aReturn.hasValue() ) @@ -193,36 +193,36 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru } // XSQLErrorListener -void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) { // forward the errors which happened to my columns to my own listeners onError( _rEvent ); } // XRowSetSupplier -Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeException, std::exception) +Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) { return Reference< XRowSet >( getParent(), UNO_QUERY ); } -void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) { OSL_FAIL( "OGridControlModel::setRowSet: not supported!" ); } -void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) { if ( i_Listener.is() ) m_aRowSetChangeListeners.addInterface( i_Listener ); } -void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) { m_aRowSetChangeListeners.removeInterface( i_Listener ); } // XChild -void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) throw(NoSupportException, RuntimeException, std::exception) +void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( i_Parent == getParent() ) @@ -232,7 +232,7 @@ void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno:: aGuard.clear(); m_aRowSetChangeListeners.notifyEach( &XRowSetChangeListener::onRowSetChanged, aEvent ); } -Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) { return concatSequences( concatSequences( @@ -258,14 +258,14 @@ void OGridControlModel::disposing() } // XEventListener -void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException, std::exception ) +void OGridControlModel::disposing(const EventObject& _rEvent) { OControlModel::disposing( _rEvent ); OInterfaceContainer::disposing( _rEvent ); } // XSelectionSupplier -sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); Reference<XPropertySet> xSel; @@ -295,23 +295,23 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr } return false; } -Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException, std::exception) +Any SAL_CALL OGridControlModel::getSelection() { return makeAny(m_xSelection); } -void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) +void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) { m_aSelectListeners.addInterface(_rxListener); } -void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) +void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) { m_aSelectListeners.removeInterface(_rxListener); } // XGridColumnFactory -Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) { SolarMutexGuard g; const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); @@ -338,13 +338,13 @@ Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId) } return xReturn; } -css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() { return frm::getColumnTypes(); } // XReset -void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::reset() { ::comphelper::OInterfaceIteratorHelper2 aIter(m_aResetListeners); EventObject aEvt(static_cast<XWeak*>(this)); @@ -357,11 +357,11 @@ void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt ); } } -void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.addInterface(_rxListener); } -void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.removeInterface(_rxListener); } @@ -488,7 +488,6 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw(IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (nHandle) @@ -574,7 +573,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& } return bModified; } -void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception) +void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { @@ -766,12 +765,12 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO } // XPersistObject -OUString SAL_CALL OGridControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OGridControlModel::getServiceName() { return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility! } -void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OControlModel::write(_rxOutStream); Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); @@ -863,7 +862,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeLong(getINT32(m_aBackgroundColor)); } -void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) { SolarMutexGuard g; OControlModel::read(_rxInStream); |