diff options
Diffstat (limited to 'dbaccess/source/ui/tabledesign')
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f4c4228b761b..a503ea80638b 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TEditControl.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2001-04-02 09:54:18 $ + * last change: $Author: fs $ $Date: 2001-04-03 14:14:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1106,7 +1106,7 @@ void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const OTypeInfo* _ SwitchType( _pTypeInfo ); break; default: - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); } SetControlText(nRow,nColId,_pTypeInfo ? _pTypeInfo->aUIName : ::rtl::OUString()); } @@ -1133,7 +1133,7 @@ void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const String& _rNe break; case FIELD_TYPE: - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); break; case FIELD_DESCR: @@ -1155,7 +1155,7 @@ void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const String& _rNe case FIELD_PROPERTY_NUMTYPE: // pFieldDescr->SetNumType( _rNewData ); - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); break; case FIELD_PROPERTY_AUTOINC: @@ -1217,7 +1217,7 @@ String OTableEditorCtrl::GetData( long nRow, sal_uInt16 nColId ) return String::CreateFromInt32(pFieldDescr->GetPrecision()); case FIELD_PROPERTY_NUMTYPE: - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableEditorCtrl::GetData: invalid column!"); // return pFieldDescr->GetNumType(); case FIELD_PROPERTY_AUTOINC: diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 06dd2ad0a612..01ed9ff62a42 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: fs $ $Date: 2001-04-03 08:45:36 $ + * last change: $Author: fs $ $Date: 2001-04-03 14:14:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -670,7 +670,7 @@ void SAL_CALL OTableController::initialize( const Sequence< Any >& aArguments ) } catch(SQLException&) { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::initialize: caught an exception!"); } } // ----------------------------------------------------------------------------- @@ -1021,7 +1021,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ } else { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::appendColumns: invalid field name!"); } } @@ -1033,7 +1033,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ } catch(Exception&) { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::appendColumns: caught an exception!"); } } // ----------------------------------------------------------------------------- @@ -1069,7 +1069,7 @@ void OTableController::appendKey(Reference<XKeysSupplier>& _rxSup) } catch(Exception&) { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::appendKey: caught an exception!"); } } // ----------------------------------------------------------------------------- @@ -1399,7 +1399,7 @@ void OTableController::alterColumns() } else { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::alterColumns: invalid column!"); } } else if(xColumnFactory.is() && xAlter.is() && nPos < nColumnCount) @@ -1422,7 +1422,7 @@ void OTableController::alterColumns() } else { - OSL_ASSERT(0); + OSL_ENSURE(sal_False, "OTableController::alterColumns: invalid column (2)!"); } } else |