diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:04:35 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:05:07 +0100 |
commit | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (patch) | |
tree | c2c0b2f76362e442e1cbdec027ea4625f8ed3165 /dbaccess/source/ui | |
parent | 7a7f390db3656b976a5c9fc8d081d5e3c60582e8 (diff) |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'dbaccess/source/ui')
22 files changed, 45 insertions, 45 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 699a4554c158..6bd3ec193b6f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -336,7 +336,7 @@ OApplicationController::~OApplicationController() { if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1276,7 +1276,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case ID_NEW_TABLE_DESIGN: break; default: - OSL_ENSURE(0,"illegal switch call!"); + OSL_FAIL("illegal switch call!"); } if ( bAutoPilot ) getContainer()->PostUserEvent( LINK( this, OApplicationController, OnCreateWithPilot ), reinterpret_cast< void* >( eType ) ); @@ -1697,7 +1697,7 @@ namespace case E_NONE: break; default: - OSL_ENSURE(0,"Invalid ElementType!"); + OSL_FAIL("Invalid ElementType!"); break; } return sToolbar; @@ -2340,7 +2340,7 @@ void OApplicationController::onDeleteEntry() nId = SID_DB_APP_REPORT_DELETE; break; default: - OSL_ENSURE(0,"Invalid ElementType!"); + OSL_FAIL("Invalid ElementType!"); break; } executeChecked(nId,Sequence<PropertyValue>()); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 2642cbc12da0..2b29a33d2632 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -292,7 +292,7 @@ void OApplicationController::refreshTables() } catch(const Exception&) { - OSL_ENSURE(0,"Could not refresh tables!"); + OSL_FAIL("Could not refresh tables!"); } getContainer()->getDetailView()->clearPages(sal_False); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 068464c7830f..138e2d42f8ec 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -254,7 +254,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper() } catch(Exception) { - OSL_ENSURE(0,"Exception thrown while disposing preview frame!"); + OSL_FAIL("Exception thrown while disposing preview frame!"); } for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i) @@ -682,7 +682,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY ); break; default: - OSL_ENSURE(0,"Illegal call!"); + OSL_FAIL("Illegal call!"); } getElementIcons( _eType, nImageId ); @@ -859,7 +859,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType pEntry = lcl_findEntry(*pTreeView,_rOldName,pTreeView->First()); break; default: - OSL_ENSURE(0,"Invalid element type"); + OSL_FAIL("Invalid element type"); } OSL_ENSURE(pEntry,"Do you know that the name isn't existence!"); if ( pEntry ) @@ -944,7 +944,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr } break; default: - OSL_ENSURE(0,"Invalid element type"); + OSL_FAIL("Invalid element type"); } if ( !pTreeView->GetEntryCount() ) showPreview(NULL); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 80977b9a187a..da2acef4be09 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2023,7 +2023,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } catch(Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } break; case SID_FM_DELETEROWS: diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 9e39ac173874..1489be5f92b0 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -951,7 +951,7 @@ void SbaGridControl::SetRowHeight() } catch(Exception&) { - OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); + OSL_FAIL("setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); } } } @@ -1109,11 +1109,11 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) xEmptyReturn.set(xCol->getPropertyValue(PROPERTY_BOUNDFIELD),UNO_QUERY); } else - OSL_ENSURE(0,"SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!"); + OSL_FAIL("SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!"); } catch(Exception&) { - OSL_ENSURE(0,"SbaGridControl::getField Exception occurred!"); + OSL_FAIL("SbaGridControl::getField Exception occurred!"); } return xEmptyReturn; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 72c1723180f2..f1e9e467dd45 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -250,7 +250,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser() DBG_DTOR(SbaTableQueryBrowser,NULL); if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1895,7 +1895,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue } catch(DisposedException&) { - OSL_ENSURE(0,"Object already disposed!"); + OSL_FAIL("Object already disposed!"); } catch(Exception&) { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index e9d903697dba..484126c82da9 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1424,7 +1424,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) break; default: - OSL_ENSURE(0,"Unknown type"); + OSL_FAIL("Unknown type"); } m_pPreviousType = pFieldType; } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6a067dbbfafc..6b102c394253 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -702,7 +702,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr } catch(Exception&) { - OSL_ENSURE(0,"IsReadOnly throws an exception!"); + OSL_FAIL("IsReadOnly throws an exception!"); } } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 5624420c904f..4a35b421af0d 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -310,7 +310,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) pPage = ODriversSettings::CreateUser(this,*m_pOutSet); break; default: - OSL_ENSURE(0,"Wrong state!"); + OSL_FAIL("Wrong state!"); break; } diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 70ab3cc8b51f..75ed025ac6df 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -753,7 +753,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox ) } else { - OSL_ENSURE(0,"DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!"); + OSL_FAIL("DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!"); } } pComp->SelectEntryPos(0); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index b2cf2a0fb2d6..c31a2da8c9e0 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -560,7 +560,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl } break; default: - OSL_ENSURE(0,"ODatabaseExport: Unbekanntes Format"); + OSL_FAIL("ODatabaseExport: Unbekanntes Format"); } } } diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 70b127cc2ec6..c8a2664f3771 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -242,7 +242,7 @@ sal_Bool ORowSetImportExport::insertNewRow() aValue <<= m_xRow->getClob(*aIter); break; default: - OSL_ENSURE(0,"Unknown type"); + OSL_FAIL("Unknown type"); } if(m_xRow->wasNull()) m_xTargetRowUpdate->updateNull(i); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a736feb134f0..3f7daabd1674 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -627,7 +627,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou } catch (Exception&) { - OSL_ENSURE(0,"RTF WRITE!"); + OSL_FAIL("RTF WRITE!"); } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0a949d24703e..7dfb0152bf82 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -178,7 +178,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP SQLExceptionInfo aInfo; if ( !_xDataSource.is() ) { - OSL_ENSURE(0,"createConnection: coult not retrieve the data source!"); + OSL_FAIL("createConnection: coult not retrieve the data source!"); return aInfo; } @@ -192,7 +192,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } catch(Exception&) { - OSL_ENSURE(0,"createConnection: error while retrieving data source properties!"); + OSL_FAIL("createConnection: error while retrieving data source properties!"); } @@ -203,7 +203,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP Reference<XCompletedConnection> xConnectionCompletion(_xDataSource, UNO_QUERY); if (!xConnectionCompletion.is()) { - OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!"); + OSL_FAIL("createConnection: missing an interface ... need an error message here!"); } else { // instantiate the default SDB interaction handler @@ -230,7 +230,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); } catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); } catch(SQLException& e) { aInfo = SQLExceptionInfo(e); } - catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } + catch(Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } return aInfo; } @@ -796,7 +796,7 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return nAlignment; } @@ -810,7 +810,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return eJustify; } @@ -838,7 +838,7 @@ float ConvertFontWeight( ::FontWeight eWeight ) else if( eWeight == WEIGHT_BLACK ) return ::com::sun::star::awt::FontWeight::BLACK; - OSL_ENSURE(0, "Unknown FontWeigth" ); + OSL_FAIL("Unknown FontWeigth" ); return ::com::sun::star::awt::FontWeight::DONTKNOW; } // ----------------------------------------------------------------------------- @@ -865,7 +865,7 @@ float ConvertFontWidth( ::FontWidth eWidth ) else if( eWidth == WIDTH_ULTRA_EXPANDED ) return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; - OSL_ENSURE(0, "Unknown FontWidth" ); + OSL_FAIL("Unknown FontWidth" ); return ::com::sun::star::awt::FontWidth::DONTKNOW; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 1cfa991c5b7e..0d5a8204b02d 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -464,7 +464,7 @@ TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl: OJoinDesignView* pView = getJoinView(); if( pView ) return pView->getTableView()->createTableWindowData(_sComposedName,_sTableName,_sWindowName); - OSL_ENSURE(0,"We should never ever reach this point!"); + OSL_FAIL("We should never ever reach this point!"); return TTableWindowData::value_type(); } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index ece9f28458f9..b32242652983 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -212,7 +212,7 @@ namespace if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_FROM,aFind[0]+1); else - OSL_ENSURE(0,"Column not found!"); + OSL_FAIL("Column not found!"); } // get the position inside the tabe Reference<XNameAccess> xRefColumns = _rDest.GetOriginalColumns(); @@ -222,7 +222,7 @@ namespace if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_TO,aFind[0]+1); else - OSL_ENSURE(0,"Column not found!"); + OSL_FAIL("Column not found!"); } pNewConnData->AppendConnLine(*pIter,sRelatedColumn); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 726f4680c9a1..ae1ae932806b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -336,7 +336,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo ) } } else - OSL_ENSURE(0,"Invalid column id!"); + OSL_FAIL("Invalid column id!"); } //------------------------------------------------------------------------------ void OSelectionBrowseBox::Init() @@ -387,7 +387,7 @@ void OSelectionBrowseBox::Init() } catch(const SQLException&) { - OSL_ENSURE(0,"Catched Exception when asking for database metadata options!"); + OSL_FAIL("Catched Exception when asking for database metadata options!"); m_nMaxColumns = 0; } } @@ -846,7 +846,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes notifyFunctionFieldChanged(sOldLocalizedFunctionName,sLocalizedFunctionName,_bListAction, nColumnId); } else - OSL_ENSURE(0,"Unsupported function inserted!"); + OSL_FAIL("Unsupported function inserted!"); } else diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c40cd4e519a5..7eca4f2f9b5b 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -205,7 +205,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occurred!"); + OSL_FAIL("Exception occurred!"); } try { @@ -234,7 +234,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occurred!"); + OSL_FAIL("Exception occurred!"); } return TRUE; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 5e6ad7f9ab9a..fe761cc4ca4f 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -361,7 +361,7 @@ OQueryController::~OQueryController() DBG_DTOR(OQueryController,NULL); if ( !getBroadcastHelper().bDisposed && !getBroadcastHelper().bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1350,12 +1350,12 @@ void OQueryController::executeQuery() } else { - OSL_ENSURE(0,"Couldn't create a beamer window!"); + OSL_FAIL("Couldn't create a beamer window!"); } } catch(const Exception&) { - OSL_ENSURE(0,"Couldn't create a beamer window!"); + OSL_FAIL("Couldn't create a beamer window!"); } } } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index c05c1a3a2d18..e42211609361 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -234,7 +234,7 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const } catch(const Exception&) { - OSL_ENSURE(0,"ORelationTableView::AddConnection: Exception oocured!"); + OSL_FAIL("ORelationTableView::AddConnection: Exception oocured!"); } } } @@ -301,7 +301,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } catch(Exception&) { - OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); + OSL_FAIL("ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); } return false; } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e3c41b1846f7..6afad1cd9040 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1305,7 +1305,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) m_pRowList->size()); if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) ) { - OSL_ENSURE(0,"(nRow<0) || (nRow>=nListCount)"); + OSL_FAIL("(nRow<0) || (nRow>=nListCount)"); return NULL; } ::boost::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ]; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 4c3ef7d87cd4..e34436da74e6 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -201,7 +201,7 @@ void OTableRowView::copy() //------------------------------------------------------------------------------ void OTableRowView::paste() { - OSL_ENSURE(0,"OTableRowView::Paste : (pseudo-) abstract method called !"); + OSL_FAIL("OTableRowView::Paste : (pseudo-) abstract method called !"); } //------------------------------------------------------------------------------ |