diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:27:59 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:05:06 +0100 |
commit | 7a7f390db3656b976a5c9fc8d081d5e3c60582e8 (patch) | |
tree | 3db070da58fcf207c7fea9647de2dd9ef9400970 /dbaccess/source/ui | |
parent | 4882ec6c95c249cd181e71714ffe1f2cb6b85608 (diff) |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'dbaccess/source/ui')
25 files changed, 74 insertions, 74 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 639d74115353..699a4554c158 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1931,7 +1931,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const break; default: - OSL_ENSURE( false, "OApplicationController::openElement: illegal object type!" ); + OSL_FAIL( "OApplicationController::openElement: illegal object type!" ); break; } return xRet; @@ -2039,7 +2039,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, break; default: - OSL_ENSURE( false, "OApplicationController::newElement: illegal type!" ); + OSL_FAIL( "OApplicationController::newElement: illegal type!" ); break; } @@ -2278,7 +2278,7 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const ::rtl return; default: - OSL_ENSURE( false, "OApplicationController::showPreviewFor: unexpected element type!" ); + OSL_FAIL( "OApplicationController::showPreviewFor: unexpected element type!" ); break; } } @@ -2651,7 +2651,7 @@ IMPL_LINK( OApplicationController, OnFirstControllerConnected, void*, /**/ ) if ( !m_xModel.is() ) { - OSL_ENSURE( false, "OApplicationController::OnFirstControllerConnected: too late!" ); + OSL_FAIL( "OApplicationController::OnFirstControllerConnected: too late!" ); } // if we have forms or reports which contain macros/scripts, then show a warning @@ -2974,7 +2974,7 @@ Any SAL_CALL OApplicationController::getSelection( ) throw (RuntimeException) case E_FORM: aCurrentSelection[0].Type = DatabaseObjectContainer::FORMS; break; case E_REPORT: aCurrentSelection[0].Type = DatabaseObjectContainer::REPORTS; break; default: - OSL_ENSURE( false, "OApplicationController::getSelection: unexpected current element type!" ); + OSL_FAIL( "OApplicationController::getSelection: unexpected current element type!" ); break; } } diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 1af86b65d2d7..2642cbc12da0 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -452,7 +452,7 @@ namespace case DatabaseObject::FORM: eType = E_FORM; break; case DatabaseObject::REPORT: eType = E_REPORT; break; default: - OSL_ENSURE( false, "lcl_objectType2ElementType: unsupported object type!" ); + OSL_FAIL( "lcl_objectType2ElementType: unsupported object type!" ); // this should have been caught earlier } return eType; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 4cfce1d3ab95..068464c7830f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -374,7 +374,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& _r return; } } - OSL_ENSURE( false, "OAppDetailPageHelper::describeCurrentSelectionForControl: invalid control!" ); + OSL_FAIL( "OAppDetailPageHelper::describeCurrentSelectionForControl: invalid control!" ); } // ----------------------------------------------------------------------------- @@ -430,7 +430,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e } break; default: - OSL_ENSURE( false, "OAppDetailPageHelper::describeCurrentSelectionForType: unexpected type!" ); + OSL_FAIL( "OAppDetailPageHelper::describeCurrentSelectionForType: unexpected type!" ); break; } diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4e629c52d1ed..5069fe0643b3 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -738,7 +738,7 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane break; default: - OSL_ENSURE( false, "OApplicationDetailView::impl_fillTaskPaneData: illegal element type!" ); + OSL_FAIL( "OApplicationDetailView::impl_fillTaskPaneData: illegal element type!" ); } MnemonicGenerator aAllMnemonics( m_aExternalMnemonics ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 1bdeb80ba45d..80977b9a187a 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -283,7 +283,7 @@ SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl() //------------------------------------------------------------------ Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" ); return NULL; } @@ -315,27 +315,27 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( //------------------------------------------------------------------ Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" ); return NULL; } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" ); } //------------------------------------------------------------------ Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" ); return NULL; } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" ); } //------------------------------------------------------------------ @@ -354,19 +354,19 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Re //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose( ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" ); } //------------------------------------------------------------------ @@ -405,73 +405,73 @@ Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" ); } //------------------------------------------------------------------ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" ); + OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" ); } //------------------------------------------------------------------ diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 76fa37d62bf8..18a9b471e602 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -200,7 +200,7 @@ sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType ) default: break; } - OSL_ENSURE( false, "SbaTableQueryBrowser::getDatabaseObjectType: folder types and 'Unknown' not allowed here!" ); + OSL_FAIL( "SbaTableQueryBrowser::getDatabaseObjectType: folder types and 'Unknown' not allowed here!" ); return DatabaseObject::TABLE; } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index eaa199d78184..d17750d96319 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -152,7 +152,7 @@ void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< Prop if ( xDispatch == xController ) { - OSL_ENSURE( false, "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" ); + OSL_FAIL( "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" ); xDispatch.clear(); } @@ -233,7 +233,7 @@ OGenericUnoController::OGenericUnoController() ,m_bReadOnly(sal_False) ,m_bCurrentlyModified(sal_False) { - OSL_ENSURE( false, "OGenericUnoController::OGenericUnoController: illegal call!" ); + OSL_FAIL( "OGenericUnoController::OGenericUnoController: illegal call!" ); // This ctor only exists because the MSVC compiler complained about an unresolved external // symbol. It should not be used at all. Since using it yields strange runtime problems, // we simply abort here. @@ -612,7 +612,7 @@ void OGenericUnoController::InvalidateFeature_Impl() ::rtl::OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); sMessage += ::rtl::OString::valueOf( aNextFeature.nId ); sMessage += ::rtl::OString( " has been invalidated, but is not supported!" ); - OSL_ENSURE( false, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); } #endif if ( m_aSupportedFeatures.end() != aFeaturePos ) @@ -1155,7 +1155,7 @@ Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( Runtim // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException ) { - OSL_ENSURE( false, "OGenericUnoController::attachModel: not supported!" ); + OSL_FAIL( "OGenericUnoController::attachModel: not supported!" ); return sal_False; } @@ -1487,7 +1487,7 @@ sal_uInt16 OGenericUnoController::registerCommandURL( const ::rtl::OUString& _rC ++nFeatureId; if ( nFeatureId == LAST_USER_DEFINED_FEATURE ) { - OSL_ENSURE( false, "OGenericUnoController::registerCommandURL: no more space for user defined features!" ); + OSL_FAIL( "OGenericUnoController::registerCommandURL: no more space for user defined features!" ); return 0L; } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 73727f4fd21b..72c1723180f2 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3324,7 +3324,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa if ( ( eLeft == etQueryContainer ) && ( eRight == etTableContainer ) ) return COMPARE_LESS; - OSL_ENSURE( false, "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" ); + OSL_FAIL( "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" ); return COMPARE_EQUAL; } @@ -3480,7 +3480,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const break; default: - OSL_ENSURE( false, "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" ); + OSL_FAIL( "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" ); break; } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 653f80138a6c..5efe35ddf0cb 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -598,14 +598,14 @@ namespace //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); + OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); + OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index cfdc2dd3842f..25ffd31753d8 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -108,7 +108,7 @@ namespace dbaui break; default: - OSL_ENSURE( false, "TextResetOperator::operateOn: unexpected event ID!" ); + OSL_FAIL( "TextResetOperator::operateOn: unexpected event ID!" ); // all those IDs should have been filtered out by payAttentionTo break; } diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index d9466a39663e..aa99429ed1f4 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -309,7 +309,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, break; default: - OSL_ENSURE( false, "OSaveAsDlg::OSaveAsDlg: Type not supported yet!" ); + OSL_FAIL( "OSaveAsDlg::OSaveAsDlg: Type not supported yet!" ); } implInit(); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index f9769f541153..70ab3cc8b51f 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -268,7 +268,7 @@ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate nPredicateType = SQLFilterOperator::NOT_SQLNULL; break; default: - OSL_ENSURE( false, "DlgFilterCrit::GetOSQLPredicateType: unknown predicate string!" ); + OSL_FAIL( "DlgFilterCrit::GetOSQLPredicateType: unknown predicate string!" ); break; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index dcf5ade1d83c..b643f52166b9 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -274,7 +274,7 @@ namespace && !lcl_hasDetails( aDisplayInfo ) ) { - OSL_ENSURE( false, "lcl_buildExceptionChain: useles exception: no state, no error code, no message!" ); + OSL_FAIL( "lcl_buildExceptionChain: useles exception: no state, no error code, no message!" ); continue; } @@ -480,7 +480,7 @@ namespace case BUTTON_RETRY: nButtonID = BUTTONID_RETRY; break; case BUTTON_HELP: nButtonID = BUTTONID_HELP; break; default: - OSL_ENSURE( false, "lcl_addButton: invalid button id!" ); + OSL_FAIL( "lcl_addButton: invalid button id!" ); break; } _rDialog.AddButton( _eType, nButtonID, _bDefault ? BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON : 0 ); @@ -705,7 +705,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) case SQLExceptionInfo::SQL_EXCEPTION: eType = Error; break; case SQLExceptionInfo::SQL_WARNING: eType = Warning; break; case SQLExceptionInfo::SQL_CONTEXT: eType = Info; break; - default: OSL_ENSURE( false, "OSQLMessageBox::Construct: invalid type!" ); + default: OSL_FAIL( "OSQLMessageBox::Construct: invalid type!" ); } } impl_initImage( eType ); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 7f95797015af..655484d69920 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -111,7 +111,7 @@ void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, if ( !xSrcConnection.is() || !i_rDestConnection.is() ) { - OSL_ENSURE( false, "OTableCopyHelper::insertTable: no connection/s!" ); + OSL_FAIL( "OTableCopyHelper::insertTable: no connection/s!" ); return; } diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 55c55a2a15dc..a736feb134f0 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -248,7 +248,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor { if ( !m_xResultSet.is() ) { - OSL_ENSURE( false, "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" ); + OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" ); m_aSelection.realloc( 0 ); } } @@ -257,7 +257,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor { if ( m_bBookmarkSelection && !m_xRowLocate.is() ) { - OSL_ENSURE( false, "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" ); + OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" ); m_aSelection.realloc( 0 ); } } diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 63a98f5aee6c..600fb72c68be 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -480,14 +480,14 @@ const DummyCopySource& DummyCopySource::Instance() //------------------------------------------------------------------------ ::rtl::OUString DummyCopySource::getQualifiedObjectName() const { - OSL_ENSURE( false, "DummyCopySource::getQualifiedObjectName: not to be called!" ); + OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" ); return ::rtl::OUString(); } //------------------------------------------------------------------------ bool DummyCopySource::isView() const { - OSL_ENSURE( false, "DummyCopySource::isView: not to be called!" ); + OSL_FAIL( "DummyCopySource::isView: not to be called!" ); return false; } @@ -509,27 +509,27 @@ Sequence< ::rtl::OUString > DummyCopySource::getColumnNames() const //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DummyCopySource::getPrimaryKeyColumnNames() const { - OSL_ENSURE( false, "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); + OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); return Sequence< ::rtl::OUString >(); } //------------------------------------------------------------------------ OFieldDescription* DummyCopySource::createFieldDescription( const ::rtl::OUString& /*_rColumnName*/ ) const { - OSL_ENSURE( false, "DummyCopySource::createFieldDescription: not to be called!" ); + OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" ); return NULL; } //------------------------------------------------------------------------ ::rtl::OUString DummyCopySource::getSelectStatement() const { - OSL_ENSURE( false, "DummyCopySource::getSelectStatement: not to be called!" ); + OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" ); return ::rtl::OUString(); } //------------------------------------------------------------------------ ::utl::SharedUNOComponent< XPreparedStatement > DummyCopySource::getPreparedSelectStatement() const { - OSL_ENSURE( false, "DummyCopySource::getPreparedSelectStatement: not to be called!" ); + OSL_FAIL( "DummyCopySource::getPreparedSelectStatement: not to be called!" ); return ::utl::SharedUNOComponent< XPreparedStatement >(); } diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 959f02a20ef1..ce798c5deba0 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -203,7 +203,7 @@ namespace dbaui nImageResourceID = TABLE_TREE_ICON; break; default: - OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" ); + OSL_FAIL( "ImageProvider::getDefaultImage: invalid database object type!" ); break; } return nImageResourceID; @@ -228,7 +228,7 @@ namespace dbaui nImageResourceID = TABLEFOLDER_TREE_ICON; break; default: - OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" ); + OSL_FAIL( "ImageProvider::getDefaultImage: invalid database object type!" ); break; } diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index d0bca46d2e16..fc9cf3a7fa1f 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -172,7 +172,7 @@ namespace dbaui break; default: - OSL_ENSURE( false, "OLinkedDocumentsAccess::implOpen: invalid open mode!" ); + OSL_FAIL( "OLinkedDocumentsAccess::implOpen: invalid open mode!" ); break; } aArguments.put( "OpenMode", sOpenMode ); diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index fc65cb18d670..b1dbfb27558d 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -117,7 +117,7 @@ namespace dbaui ) return; - OSL_ENSURE( false, "SetItemPropertyStorage::getPropertyValue: unsupported item type!" ); + OSL_FAIL( "SetItemPropertyStorage::getPropertyValue: unsupported item type!" ); } //-------------------------------------------------------------------- @@ -129,7 +129,7 @@ namespace dbaui ) return; - OSL_ENSURE( false, "SetItemPropertyStorage::setPropertyValue: unsupported item type!" ); + OSL_FAIL( "SetItemPropertyStorage::setPropertyValue: unsupported item type!" ); } //........................................................................ diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 7d67b18ea317..65399065dbce 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1705,7 +1705,7 @@ bool OJoinTableView::allowQueries() const // ----------------------------------------------------------------------------- void OJoinTableView::onNoColumns_throw() { - OSL_ENSURE( false, "OTableWindow::onNoColumns_throw: cannot really handle this!" ); + OSL_FAIL( "OTableWindow::onNoColumns_throw: cannot really handle this!" ); throw SQLException(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 0dc3caa9dbc5..ece9f28458f9 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -198,7 +198,7 @@ namespace Reference<XPropertySet> xColumn; if ( !( _rxSourceForeignKeyColumns->getByName(*pIter) >>= xColumn ) ) { - OSL_ENSURE( false, "addConnections: invalid foreign key column!" ); + OSL_FAIL( "addConnections: invalid foreign key column!" ); continue; } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 3f3134254322..c40cd4e519a5 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -278,7 +278,7 @@ void OTableWindow::impl_updateImage() if ( !aImage ) { - OSL_ENSURE( false, "OTableWindow::impl_updateImage: no images!" ); + OSL_FAIL( "OTableWindow::impl_updateImage: no images!" ); return; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index ea2610498581..5e6ad7f9ab9a 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -863,7 +863,7 @@ void OQueryController::impl_initialize() ::rtl::OUString sIndependentSQLCommand; if ( rArguments.get_ensureType( "IndependentSQLCommand", sIndependentSQLCommand ) ) { - OSL_ENSURE( false, "OQueryController::impl_initialize: IndependentSQLCommand is regognized for compatibility only!" ); + OSL_FAIL( "OQueryController::impl_initialize: IndependentSQLCommand is regognized for compatibility only!" ); sCommand = sIndependentSQLCommand; m_nCommandType = CommandType::COMMAND; } @@ -871,7 +871,7 @@ void OQueryController::impl_initialize() ::rtl::OUString sCurrentQuery; if ( rArguments.get_ensureType( "CurrentQuery", sCurrentQuery ) ) { - OSL_ENSURE( false, "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" ); + OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" ); sCommand = sCurrentQuery; m_nCommandType = CommandType::QUERY; } @@ -879,7 +879,7 @@ void OQueryController::impl_initialize() sal_Bool bCreateView( sal_False ); if ( rArguments.get_ensureType( "CreateView", bCreateView ) && bCreateView ) { - OSL_ENSURE( false, "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" ); + OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" ); m_nCommandType = CommandType::TABLE; } @@ -903,7 +903,7 @@ void OQueryController::impl_initialize() m_sName = ::rtl::OUString(); break; default: - OSL_ENSURE( false, "OQueryController::impl_initialize: logic error in code!" ); + OSL_FAIL( "OQueryController::impl_initialize: logic error in code!" ); throw RuntimeException(); } @@ -911,7 +911,7 @@ void OQueryController::impl_initialize() sal_Bool bGraphicalDesign( sal_True ); if ( rArguments.get_ensureType( (::rtl::OUString)PROPERTY_QUERYDESIGNVIEW, bGraphicalDesign ) ) { - OSL_ENSURE( false, "OQueryController::impl_initialize: QueryDesignView is regognized for compatibility only!" ); + OSL_FAIL( "OQueryController::impl_initialize: QueryDesignView is regognized for compatibility only!" ); m_bGraphicalDesign = bGraphicalDesign; } diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index d93f9d3bd6c9..e3e86ae44b1b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1095,7 +1095,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r case CopyTableContinuation::AskUser: break; // stop asking the listeners, ask the user default: - OSL_ENSURE( false, "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" ); + OSL_FAIL( "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" ); // ask next listener continue; } @@ -1384,7 +1384,7 @@ void CopyTableWizard::impl_doCopy_nothrow() if( !xTable.is() ) { - OSL_ENSURE( false, "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" ); + OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" ); break; } @@ -1401,7 +1401,7 @@ void CopyTableWizard::impl_doCopy_nothrow() xTable = rWizard.createTable(); if ( !xTable.is() ) { - OSL_ENSURE( false, "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" ); + OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" ); break; } } @@ -1449,7 +1449,7 @@ void CopyTableWizard::impl_doCopy_nothrow() break; default: - OSL_ENSURE( false, "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" ); + OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" ); break; } } diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 42d1f3ad1234..8e029adfdbde 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -223,7 +223,7 @@ namespace dbaui if ( nDisapprovePos != -1 ) _rContinuations[ nDisapprovePos ]->select(); else - OSL_ENSURE( false, "BasicInteractionHandler::implHandle: no handler for NO!" ); + OSL_FAIL( "BasicInteractionHandler::implHandle: no handler for NO!" ); break; case RET_CANCEL: @@ -232,13 +232,13 @@ namespace dbaui else if ( nDisapprovePos != -1 ) _rContinuations[ nDisapprovePos ]->select(); else - OSL_ENSURE( false, "BasicInteractionHandler::implHandle: no handler for CANCEL!" ); + OSL_FAIL( "BasicInteractionHandler::implHandle: no handler for CANCEL!" ); break; case RET_RETRY: if ( nRetryPos != -1 ) _rContinuations[ nRetryPos ]->select(); else - OSL_ENSURE( false, "BasicInteractionHandler::implHandle: where does the RETRY come from?" ); + OSL_FAIL( "BasicInteractionHandler::implHandle: where does the RETRY come from?" ); break; } } |