strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

catch by const reference

Browse source
This commit is contained in:
Caolán McNamara 2011-06-16 00:49:32 +01:00
parent 4c7a7590b1
commit 896050524c
2 changed files with 49 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
forms/source/component/DatabaseForm.cxx
View file

@ -163,7 +163,7 @@ private:
if ( m_xDocumentModify.is() ) if ( m_xDocumentModify.is() )
_enable ? m_xDocumentModify->enableSetModified() : m_xDocumentModify->disableSetModified(); _enable ? m_xDocumentModify->enableSetModified() : m_xDocumentModify->disableSetModified();
} }
catch( const Exception& ) catch(const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -410,7 +410,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
setPropertyValue( pSourceProperty->Name, xSourceProps->getPropertyValue( pSourceProperty->Name ) ); setPropertyValue( pSourceProperty->Name, xSourceProps->getPropertyValue( pSourceProperty->Name ) );
} }
} }
catch( const Exception& ) catch(const Exception&)
{ {
throw WrappedTargetException( throw WrappedTargetException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given database form." ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given database form." ) ),
@ -1173,7 +1173,7 @@ bool ODatabaseForm::hasValidParent() const
// the parent form is loaded and on a "virtual" row -> not valid // the parent form is loaded and on a "virtual" row -> not valid
return false; return false;
} }
catch(Exception&) catch(const Exception&)
{ {
// parent could be forwardonly? // parent could be forwardonly?
return false; return false;
@ -1261,11 +1261,10 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot
m_xAggregateAsRowSet->execute(); m_xAggregateAsRowSet->execute();
bSuccess = sal_True; bSuccess = sal_True;
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
_rClearForNotifies.clear(); _rClearForNotifies.clear();
if (m_sCurrentErrorContext.getLength()) if (m_sCurrentErrorContext.getLength())
@ -1307,7 +1306,7 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot
xUpdate->moveToInsertRow(); xUpdate->moveToInsertRow();
} }
} }
catch(SQLException& eDB) catch(const SQLException& eDB)
{ {
_rClearForNotifies.clear(); _rClearForNotifies.clear();
if (m_sCurrentErrorContext.getLength()) if (m_sCurrentErrorContext.getLength())
@ -1750,7 +1749,9 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
{ {
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, rValue); m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, rValue);
} }
catch(Exception&) { } catch(const Exception&)
{
}
} }
break; break;
case PROPERTY_ID_TARGET_URL: case PROPERTY_ID_TARGET_URL:
@ -2051,7 +2052,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
if ( aDefault.hasValue() ) if ( aDefault.hasValue() )
xColUpdate->updateObject( aDefault ); xColUpdate->updateObject( aDefault );
} }
catch(Exception&) catch(const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -2059,7 +2060,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
} }
} }
} }
catch(Exception&) catch(const Exception&)
{ {
} }
@ -2419,7 +2420,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com
Reference< XPropertySet > xParentProperties( xParentForm, UNO_QUERY_THROW ); Reference< XPropertySet > xParentProperties( xParentForm, UNO_QUERY_THROW );
xParentProperties->removePropertyChangeListener( PROPERTY_ISNEW, this ); xParentProperties->removePropertyChangeListener( PROPERTY_ISNEW, this );
} }
catch( const Exception& ) catch(const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -2441,7 +2442,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com
Reference< XPropertySet > xParentProperties( xParentForm, UNO_QUERY_THROW ); Reference< XPropertySet > xParentProperties( xParentForm, UNO_QUERY_THROW );
xParentProperties->addPropertyChangeListener( PROPERTY_ISNEW, this ); xParentProperties->addPropertyChangeListener( PROPERTY_ISNEW, this );
} }
catch( const Exception& ) catch(const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -2871,11 +2872,11 @@ sal_Bool ODatabaseForm::implEnsureConnection()
return xConnection.is(); return xConnection.is();
} }
} }
catch(SQLException& eDB) catch(const SQLException& eDB)
{ {
onError(eDB, FRM_RES_STRING(RID_STR_CONNECTERROR)); onError(eDB, FRM_RES_STRING(RID_STR_CONNECTERROR));
} }
catch( Exception ) catch(const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -2962,9 +2963,8 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException )
if (xCloseable.is()) if (xCloseable.is())
xCloseable->close(); xCloseable->close();
} }
catch( const SQLException& e ) catch(const SQLException&)
{ {
(void)e;
} }
aGuard.reset(); aGuard.reset();
} }
@ -3020,10 +3020,9 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac
m_sCurrentErrorContext = FRM_RES_STRING(RID_ERR_REFRESHING_FORM); m_sCurrentErrorContext = FRM_RES_STRING(RID_ERR_REFRESHING_FORM);
bSuccess = executeRowSet(aGuard, bMoveToFirst, _rxCompletionHandler); bSuccess = executeRowSet(aGuard, bMoveToFirst, _rxCompletionHandler);
} }
catch( const SQLException& e ) catch(const SQLException&)
{ {
OSL_FAIL("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?"); OSL_FAIL("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?");
(void)e;
} }
if (bSuccess) if (bSuccess)
@ -3122,19 +3121,22 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con
if ( !xListener->approveRowSetChange( _rEvent ) ) if ( !xListener->approveRowSetChange( _rEvent ) )
return false; return false;
} }
catch ( const DisposedException& e ) catch (const DisposedException& e)
{ {
if ( e.Context == xListener ) if ( e.Context == xListener )
aIter.remove(); aIter.remove();
} }
catch ( const RuntimeException& ) { throw; } catch (const RuntimeException&)
catch ( const SQLException& ) {
throw;
}
catch (const SQLException&)
{ {
if ( _bAllowSQLException ) if ( _bAllowSQLException )
throw; throw;
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
catch ( const Exception& ) catch (const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -3163,13 +3165,16 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr
if ( !xListener->approveCursorMove( event ) ) if ( !xListener->approveCursorMove( event ) )
return sal_False; return sal_False;
} }
catch ( const DisposedException& e ) catch (const DisposedException& e)
{ {
if ( e.Context == xListener ) if ( e.Context == xListener )
aIter.remove(); aIter.remove();
} }
catch ( const RuntimeException& ) { throw; } catch (const RuntimeException&)
catch ( const Exception& ) {
throw;
}
catch (const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -3209,13 +3214,16 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t
if ( !xListener->approveRowChange( event ) ) if ( !xListener->approveRowChange( event ) )
return false; return false;
} }
catch ( const DisposedException& e ) catch (const DisposedException& e)
{ {
if ( e.Context == xListener ) if ( e.Context == xListener )
aIter.remove(); aIter.remove();
} }
catch ( const RuntimeException& ) { throw; } catch (const RuntimeException&)
catch ( const Exception& ) {
throw;
}
catch (const Exception&)
{ {
DBG_UNHANDLED_EXCEPTION(); DBG_UNHANDLED_EXCEPTION();
} }
@ -3499,12 +3507,11 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate)) if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->insertRow(); xUpdate->insertRow();
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto;
throw; throw;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD)); onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD));
throw; throw;
@ -3520,12 +3527,11 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate)) if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->updateRow(); xUpdate->updateRow();
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto;
throw; throw;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
onError(eDb, FRM_RES_STRING(RID_STR_ERR_UPDATERECORD)); onError(eDb, FRM_RES_STRING(RID_STR_ERR_UPDATERECORD));
throw; throw;
@ -3541,12 +3547,11 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate)) if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->deleteRow(); xUpdate->deleteRow();
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto;
throw; throw;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORD)); onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORD));
throw; throw;
@ -3562,12 +3567,11 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce
if (query_aggregation( m_xAggregate, xUpdate)) if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->cancelRowUpdates(); xUpdate->cancelRowUpdates();
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto;
throw; throw;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD)); onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD));
throw; throw;
@ -3627,12 +3631,11 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows
if (query_aggregation( m_xAggregate, xDelete)) if (query_aggregation( m_xAggregate, xDelete))
return xDelete->deleteRows(rows); return xDelete->deleteRows(rows);
} }
catch( const RowSetVetoException& eVeto ) catch(const RowSetVetoException&)
{ {
(void)eVeto; // make compiler happy
throw; throw;
} }
catch(SQLException& eDb) catch(const SQLException& eDb)
{ {
onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORDS)); onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORDS));
throw; throw;

4
forms/source/component/Edit.cxx
View file

@ -485,7 +485,7 @@ namespace
{ {
_rxDest->setPropertyValue( pSourceProps->Name, _rxSource->getPropertyValue( pSourceProps->Name ) ); _rxDest->setPropertyValue( pSourceProps->Name, _rxSource->getPropertyValue( pSourceProps->Name ) );
} }
catch( IllegalArgumentException e ) catch(const IllegalArgumentException& e)
{ {
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
::rtl::OString sMessage( "could not transfer the property named '" ); ::rtl::OString sMessage( "could not transfer the property named '" );
@ -497,6 +497,8 @@ namespace
sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
} }
OSL_FAIL( sMessage.getStr() ); OSL_FAIL( sMessage.getStr() );
#else
(void)e;
#endif #endif
} }