diff options
Diffstat (limited to 'extensions')
22 files changed, 100 insertions, 100 deletions
diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index 209885f6a475..5f7f6a26719f 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -107,7 +107,7 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st } else { - OSL_ENSURE( sal_False, "unknown listener" ); + OSL_FAIL( "unknown listener" ); } } @@ -135,7 +135,7 @@ void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun } else { - OSL_ENSURE( sal_False, "unknown listener" ); + OSL_FAIL( "unknown listener" ); } } diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index db097ce89cfb..914ba8163870 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -181,7 +181,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "ButtonNavigationHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "ButtonNavigationHandler::setPropertyValue: cannot handle this id!" ); } } @@ -265,7 +265,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "ButtonNavigationHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "ButtonNavigationHandler::actuatingPropertyChanged: cannot handle this id!" ); } } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index aa293ce11d0a..23b061844a8c 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -185,7 +185,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::actuatingPropertyChanged( ListCellRange ): caught an exception while resetting the string items!" ); + OSL_FAIL( "OPropertyBrowserController::actuatingPropertyChanged( ListCellRange ): caught an exception while resetting the string items!" ); } } } @@ -238,7 +238,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); + OSL_FAIL( "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); } } @@ -356,7 +356,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 24fdc7fc28c3..8c42d311e162 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -198,7 +198,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); } } @@ -297,7 +297,7 @@ namespace pcr } catch ( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); + OSL_FAIL( "CellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); } } return xReturn; @@ -326,7 +326,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::getAddressFromCellBinding: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::getAddressFromCellBinding: caught an exception!" ); } return bReturn; @@ -376,7 +376,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); } return sAddress; @@ -452,7 +452,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::isCellIntegerBindingAllowed: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::isCellIntegerBindingAllowed: caught an exception!" ); // are there really control models which survive isCellBindingAllowed, but don't have a ClassId // property? bAllow = false; @@ -489,7 +489,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::isCellBindingAllowed: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::isCellBindingAllowed: caught an exception!" ); bAllow = false; } } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index cb5aac0137b6..b00b1ceafb55 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -140,7 +140,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EditPropertyHandler::getPropertyValue: caught an exception!" ); + OSL_FAIL( "EditPropertyHandler::getPropertyValue: caught an exception!" ); } return aReturn; @@ -181,7 +181,7 @@ namespace pcr case TEXTTYPE_MULTILINE: bMultiLine = sal_True; bRichText = sal_False; break; case TEXTTYPE_RICHTEXT: bMultiLine = sal_True; bRichText = sal_True; break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: invalid text type!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: invalid text type!" ); } m_xComponent->setPropertyValue( PROPERTY_MULTILINE, makeAny( bMultiLine ) ); @@ -190,12 +190,12 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: cannot handle this id!" ); } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -314,7 +314,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "EditPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); } } diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 0d1120658d86..54f78e55a013 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -109,7 +109,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::isEForm: caught an exception!" ); + OSL_FAIL( "EFormsHelper::isEForm: caught an exception!" ); } return false; } @@ -202,7 +202,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::canBindToDataType: caught an exception!" ); + OSL_FAIL( "EFormsHelper::canBindToDataType: caught an exception!" ); } return bCan; @@ -219,7 +219,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::isListEntrySink: caught an exception!" ); + OSL_FAIL( "EFormsHelper::isListEntrySink: caught an exception!" ); } return bIs; } @@ -328,7 +328,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getFormModelNames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getFormModelNames: caught an exception!" ); } } } @@ -354,7 +354,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getBindingNames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getBindingNames: caught an exception!" ); } } @@ -371,7 +371,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getFormModelByName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getFormModelByName: caught an exception!" ); } return xReturn; } @@ -390,7 +390,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentFormModel: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" ); } return xModel; } @@ -407,7 +407,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentFormModel: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" ); } return sModelName; } @@ -424,7 +424,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentBinding: caught an exception!" ); } return xBinding; @@ -442,7 +442,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentBindingName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentBindingName: caught an exception!" ); } return sBindingName; } @@ -460,7 +460,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentListSourceBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentListSourceBinding: caught an exception!" ); } return xReturn; } @@ -477,7 +477,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::setListSourceBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::setListSourceBinding: caught an exception!" ); } } @@ -503,7 +503,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::setBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::setBinding: caught an exception!" ); } } @@ -637,7 +637,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getModelElementUIName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getModelElementUIName: caught an exception!" ); } return sUIName; @@ -712,7 +712,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getAllElementUINames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getAllElementUINames: caught an exception!" ); } _rElementNames.resize( rMapUINameToElement.size() ); @@ -741,7 +741,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::firePropertyChange: caught an exception!" ); + OSL_FAIL( "EFormsHelper::firePropertyChange: caught an exception!" ); } } @@ -778,7 +778,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::firePropertyChanges: caught an exception!" ); + OSL_FAIL( "EFormsHelper::firePropertyChanges: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 72fdca1ab2e0..99db682d4ac1 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -164,7 +164,7 @@ namespace pcr sMessage += "\n(have been asked for the \""; sMessage += ::rtl::OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "\" property.)"; - OSL_ENSURE( sal_False, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif } return aReturn; @@ -280,7 +280,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -538,7 +538,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsPropertyHandler::onInteractivePropertySelection: caught an exception!" ); + OSL_FAIL( "EFormsPropertyHandler::onInteractivePropertySelection: caught an exception!" ); } // something went wrong here ...(but has been asserted already) diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index b676176bf375..e865f99b6431 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2022,7 +2022,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); } } @@ -2096,7 +2096,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_initComponentMetaData_throw: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_initComponentMetaData_throw: caught an exception!" ); } } @@ -2350,7 +2350,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" ); } return xReturn; } @@ -2678,7 +2678,7 @@ namespace pcr catch (SQLException& e) { aErrorInfo = e; } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" ); } if ( aErrorInfo.isValid() ) @@ -2770,7 +2770,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" ); } return bChanged; } diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 725706febe98..dbec1862d10f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -239,7 +239,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::commitLinkPairs: caught an exception while setting the properties!" ); + OSL_FAIL( "FormLinkDialog::commitLinkPairs: caught an exception while setting the properties!" ); } } @@ -343,7 +343,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::initializeLinks: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::initializeLinks: caught an exception!" ); } } @@ -394,7 +394,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getFormDataSourceType: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getFormDataSourceType: caught an exception!" ); } return sReturn; } @@ -433,7 +433,7 @@ namespace pcr catch (const SQLException& e ) { aErrorInfo = e; } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getFormFields: caught a non-SQL exception!" ); + OSL_FAIL( "FormLinkDialog::getFormFields: caught a non-SQL exception!" ); } if ( aErrorInfo.isValid() ) @@ -500,7 +500,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getCanonicUnderlyingTable: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getCanonicUnderlyingTable: caught an exception!" ); } return xTable; } @@ -565,7 +565,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getExistingRelation: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getExistingRelation: caught an exception!" ); } return ( _rLeftFields.getLength() > 0 ) && ( _rLeftFields[ 0 ].getLength() > 0 ); @@ -641,7 +641,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::initializeSuggest: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::initializeSuggest: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index c13c7193d7d7..16dc70b05187 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -517,7 +517,7 @@ namespace pcr nStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; break; default: - OSL_ENSURE( sal_False, "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); + OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); break; } diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 3802e68dd039..df06374fe2d2 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -121,7 +121,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::EnumRepresentation: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::EnumRepresentation: caught an exception!" ); } } @@ -136,7 +136,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::getDescriptions: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } return ::std::vector< ::rtl::OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); @@ -153,7 +153,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::impl_getValues: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::impl_getValues: caught an exception!" ); } } @@ -602,7 +602,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "GenericPropertyHandler::impl_ensurePropertyMap: caught an exception!" ); + OSL_FAIL( "GenericPropertyHandler::impl_ensurePropertyMap: caught an exception!" ); } } } diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 65e5507deb34..e813e205267c 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -216,7 +216,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandlerHelper::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + OSL_FAIL( "PropertyHandlerHelper::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } } @@ -246,7 +246,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandlerHelper::convertToControlValue: caught an exception while converting via TypeConverter!" ); + OSL_FAIL( "PropertyHandlerHelper::convertToControlValue: caught an exception while converting via TypeConverter!" ); } } diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 3bf379813739..774757ee3b34 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -110,7 +110,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ListSelectionDialog::initialize: caught an exception!" ); + OSL_FAIL( "ListSelectionDialog::initialize: caught an exception!" ); } } @@ -129,7 +129,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ListSelectionDialog::commitSelection: caught an exception!" ); + OSL_FAIL( "ListSelectionDialog::commitSelection: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx index 70de26669887..dfb80d409e16 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.cxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx @@ -79,7 +79,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandler::getContextValueByName: caught an exception!" ); + OSL_FAIL( "PropertyHandler::getContextValueByName: caught an exception!" ); } return aReturn; } diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 3c1da2b3b53b..dce1d0265fb7 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -401,7 +401,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::attachFrame: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" ); } } @@ -470,7 +470,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::suspendPropertyHandlers_nothrow: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::suspendPropertyHandlers_nothrow: caught an exception!" ); } } return sal_True; @@ -1192,7 +1192,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::describePropertyLine: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::describePropertyLine: caught an exception!" ); } } @@ -1590,7 +1590,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::rebuildPropertyUI: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::rebuildPropertyUI: caught an exception!" ); } getPropertyBox().ChangeEntry( aDescriptor ); diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 721d7d95c22d..ed546e700ae2 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -103,7 +103,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::PushButtonNavigation: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::PushButtonNavigation: caught an exception!" ); } } @@ -142,7 +142,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentButtonType: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentButtonType: caught an exception!" ); } return aReturn; } @@ -174,7 +174,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentButtonType: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentButtonType: caught an exception!" ); } } @@ -206,7 +206,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentButtonTypeState: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentButtonTypeState: caught an exception!" ); } return eState; @@ -237,7 +237,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentTargetURL: caught an exception!" ); } return aReturn; } @@ -254,7 +254,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); } } @@ -273,7 +273,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); } return eState; diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 3a64005d3541..211d021361e0 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -91,7 +91,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionHelper::canTriggerSubmissions: caught an exception!" ); + OSL_FAIL( "SubmissionHelper::canTriggerSubmissions: caught an exception!" ); } return false; } @@ -173,7 +173,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::getPropertyValue: caught an exception!" ); + OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: caught an exception!" ); } return aReturn; @@ -213,12 +213,12 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::setPropertyValue: cannot handle this id!" ); } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "SubmissionPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -318,7 +318,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::describePropertyLine: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::describePropertyLine: cannot handle this id!" ); return LineDescriptor(); } @@ -352,7 +352,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); } } @@ -389,7 +389,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::convertToPropertyValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::convertToPropertyValue: cannot handle this id!" ); } return aPropertyValue; @@ -430,7 +430,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::convertToControlValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::convertToControlValue: cannot handle this id!" ); } return aControlValue; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 6900e5c6d756..fa7e03149137 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -269,7 +269,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "TabOrderDialog::AutoOrderClickHdl: caught an exception!" ); + OSL_FAIL( "TabOrderDialog::AutoOrderClickHdl: caught an exception!" ); } return 0; diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 63600fc4c827..5e73bef47f1c 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.cxx @@ -61,7 +61,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "UnoURL::UnoURL: caught an exception!" ); + OSL_FAIL( "UnoURL::UnoURL: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 2b7b99692d87..c536c6f98f9a 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -60,7 +60,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: setSave: caught an exception!" ); + OSL_FAIL( "XSDDataType: setSave: caught an exception!" ); } } @@ -75,7 +75,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: getSave: caught an exception!" ); + OSL_FAIL( "XSDDataType: getSave: caught an exception!" ); } return aReturn; } @@ -90,7 +90,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: getFacet: caught an exception!" ); + OSL_FAIL( "XSDDataType: getFacet: caught an exception!" ); } return aReturn; } @@ -141,7 +141,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::classify: caught an exception!" ); + OSL_FAIL( "XSDDataType::classify: caught an exception!" ); } return nTypeClass; } @@ -167,7 +167,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" ); + OSL_FAIL( "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" ); } } @@ -181,7 +181,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::hasFacet: caught an exception!" ); + OSL_FAIL( "XSDDataType::hasFacet: caught an exception!" ); } return bReturn; } @@ -195,7 +195,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" ); + OSL_FAIL( "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" ); } return aReturn; } @@ -241,7 +241,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::copyFacetsFrom: caught an exception!" ); + OSL_FAIL( "XSDDataType::copyFacetsFrom: caught an exception!" ); } } diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index 7e6440ae5a8c..d0fdac11ccd1 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -82,7 +82,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::XSDValidationHelper: caught an exception while examining the introspectee!" ); + OSL_FAIL( "XSDValidationHelper::XSDValidationHelper: caught an exception while examining the introspectee!" ); } } @@ -103,7 +103,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getAvailableDataTypeNames: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getAvailableDataTypeNames: caught an exception!" ); } } @@ -160,7 +160,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getValidatingDataTypeName: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getValidatingDataTypeName: caught an exception!" ); } return sDataTypeName; } @@ -182,7 +182,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getDataTypeByName: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getDataTypeByName: caught an exception!" ); } return pReturn; @@ -217,7 +217,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::cloneDataType: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::cloneDataType: caught an exception!" ); } return true; } @@ -234,7 +234,7 @@ namespace pcr if ( !xRepository->hasByName( _rName ) ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::removeDataTypeFromRepository: invalid repository and/or data type!" ); + OSL_FAIL( "XSDValidationHelper::removeDataTypeFromRepository: invalid repository and/or data type!" ); return false; } @@ -242,7 +242,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::removeDataTypeFromRepository: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::removeDataTypeFromRepository: caught an exception!" ); return false; } return true; @@ -322,7 +322,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::copyDataType: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::copyDataType: caught an exception!" ); } } @@ -374,7 +374,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::findDefaultFormatForIntrospectee: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::findDefaultFormatForIntrospectee: caught an exception!" ); } } @@ -401,7 +401,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getBasicTypeNameForClass: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getBasicTypeNameForClass: caught an exception!" ); } return sReturn; diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index c7d6661ddf9d..2ee1e3364507 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -363,7 +363,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, } catch(InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!\n"); + OSL_FAIL( "### InvalidRegistryException!\n"); } } return sal_False; |