User: kz Date: 2008-05-05 16:09:58+0000 Modified: dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: INTEGRATION: CWS dba30b (1.117.4); FILE MERGED 2008/04/15 22:14:37 fs 1.117.4.2: RESYNC: (1.117-1.119); FILE MERGED 2008/03/16 14:08:27 fs 1.117.4.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.119&r2=1.120 Delta lines: +28 -28 --------------------- --- TableController.cxx 2008-04-10 16:40:26+0000 1.119 +++ TableController.cxx 2008-05-05 16:09:55+0000 1.120 @@ -521,10 +521,10 @@ aDlg.Execute(); bError = sal_True; } - catch(Exception&) + catch( const Exception& ) { bError = sal_True; - OSL_ENSURE(sal_False, "OTableController::doSaveDoc: table could not be inserted (caught a generic exception)!"); + DBG_UNHANDLED_EXCEPTION(); } if ( aInfo.isValid() ) @@ -585,9 +585,9 @@ aFieldNames = xCols->getElementNames(); } } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OTableController::doEditIndexes: caught an exception while retrieving the indexes/columns!"); + DBG_UNHANDLED_EXCEPTION(); } if (!xIndexes.is()) @@ -615,9 +615,9 @@ assignTable(); } - catch(const SQLException&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OTableController::initialize: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } try @@ -637,9 +637,9 @@ getUndoMgr()->Clear(); // clear all undo redo things setModified(sal_False); // and we are not modified yet } - catch(const SQLException&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OTableController::initialize: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -845,13 +845,13 @@ } } } - catch(SQLException& e) + catch(const SQLException& ) { - showError(SQLExceptionInfo(e)); + showError( SQLExceptionInfo( ::cppu::getCaughtException() ) ); } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OTableController::appendColumns: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -1251,7 +1251,7 @@ throw; } } - // exceptions are catched outside + // exceptions are caught outside xNewColumn = NULL; if(xColumns->hasByName(pField->GetName())) xColumns->getByName(pField->GetName()) >>= xColumn; @@ -1483,9 +1483,9 @@ } } } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1631,9 +1631,9 @@ sTitle += ::rtl::OUString::valueOf(getCurrentStartNumber()); } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while setting the title!"); + DBG_UNHANDLED_EXCEPTION(); } return sTitle; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
