diff options
Diffstat (limited to 'extensions/source')
19 files changed, 55 insertions, 67 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 8783c7ad8aae..b2698154fd03 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -215,7 +215,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) String sMsg(String::CreateFromAscii("::getColumns : catched an exception (")); sMsg += String(e.Message); sMsg.AppendAscii(") ..."); - DBG_ERROR( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer()); + OSL_FAIL( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer()); #endif } @@ -748,9 +748,7 @@ BibDataManager::BibDataManager() { } -/* -------------------------------------------------- - --------------------------------------------------*/ BibDataManager::~BibDataManager() { Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); @@ -864,16 +862,12 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) OSL_FAIL("Exception in BibDataManager::InsertFields"); } } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< awt::XControlModel > BibDataManager::updateGridModel() { return updateGridModel( m_xForm ); } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) { try @@ -903,9 +897,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< return m_xGridModel; } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) { Reference< XForm > xResult; @@ -1185,9 +1177,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } } -/* -------------------------------------------------- - --------------------------------------------------*/ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) { ResetIdentifierMapping(); @@ -1649,9 +1639,7 @@ void BibDataManager::CreateMappingDialog(Window* pParent) } delete pDlg; } -/* -------------------------------------------------- - --------------------------------------------------*/ ::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent) { ::rtl::OUString uRet; diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index be3eccf99205..976b4a4bbbe6 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -269,7 +269,7 @@ void LdapConnection::initConnection() } else { - OSL_ENSURE( false, "LdapConnection::findUserDn-could not get DN for User "); + OSL_FAIL( "LdapConnection::findUserDn-could not get DN for User "); } return userDn ; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ba80d2f9deaa..9fddfd0635e0 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -227,9 +227,9 @@ namespace dbp } catch(Exception&) { - DBG_ERROR( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") - += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("!")); + OSL_FAIL( ( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") + += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("!") ).getStr() ); } } } diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index e0680441a85a..8aef979c00c1 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -208,7 +208,7 @@ namespace logging sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); sMessage.append( "\nerror code: " ); sMessage.append( (sal_Int32)res ); - OSL_ENSURE( false, sMessage.makeStringAndClear() ); + OSL_FAIL( sMessage.makeStringAndClear() ); } #endif if ( m_eFileValidity == eValid ) diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 80517c680e01..6648d1773560 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -333,7 +333,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, OUString msg(OUSTR("[automation bridge] Property ") + aPropertyName + OUSTR(" is read-only")); OString sMsg = OUStringToOString(msg, osl_getThreadTextEncoding()); - OSL_ENSURE(0, sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); // ignore silently return; } diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx index ef3c7bd3ee8d..01e10ddc1f14 100644 --- a/extensions/source/plugin/aqua/sysplug.cxx +++ b/extensions/source/plugin/aqua/sysplug.cxx @@ -488,11 +488,11 @@ long MacPluginComm::doIt() break; case eNPP_Initialize: TRACE( "eNPP_Initialize" ); - OSL_ENSURE( false, "NPP_Initialize: not implemented!" ); + OSL_FAIL( "NPP_Initialize: not implemented!" ); break; case eNPP_GetJavaClass: TRACE( "eNPP_GetJavaClass" ); - OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" ); + OSL_FAIL( "NPP_GetJavaClass: not implemented!" ); break; } return nRet; diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 59e62c15188d..a65ff1b5e766 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -271,11 +271,11 @@ long PluginComm_Impl::doIt() break; case eNPP_Initialize: TRACE( "eNPP_Initialize" ); - OSL_ENSURE( false, "NPP_Initialize: not implemented!" ); + OSL_FAIL( "NPP_Initialize: not implemented!" ); break; case eNPP_GetJavaClass: TRACE( "eNPP_GetJavaClass" ); - OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" ); + OSL_FAIL( "NPP_GetJavaClass: not implemented!" ); break; } return nRet; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index e9f0243a4134..ce558559b21f 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -282,21 +282,21 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); + OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); impl_notify_throw( Control, FOCUS_GAINED ); } //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); + OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); impl_notify_throw( Control, VALUE_CHANGED ); } //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); + OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); impl_notify_throw( CurrentControl, ACTIVATE_NEXT ); } @@ -338,15 +338,15 @@ namespace pcr switch ( rControlEvent.eType ) { case FOCUS_GAINED: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" ); m_pContext->focusGained( rControlEvent.xControl ); break; case VALUE_CHANGED: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" ); m_pContext->valueChanged( rControlEvent.xControl ); break; case ACTIVATE_NEXT: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" ); m_pContext->activateNextControl( rControlEvent.xControl ); break; } @@ -919,7 +919,7 @@ namespace pcr ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "')!" ); - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif if ( _rLine.xHandler.is() ) @@ -950,7 +950,7 @@ namespace pcr ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "')!" ); - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif if ( _rLine.xHandler.is() ) @@ -1264,7 +1264,7 @@ namespace pcr m_aOrderedLines[ nFocusControlPos ]->second.pLine->GrabFocus(); } else - OSL_ENSURE( false, "OBrowserListBox::PreNotify: internal error, invalid focus control position!" ); + OSL_FAIL( "OBrowserListBox::PreNotify: internal error, invalid focus control position!" ); } } diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index f78349c651e5..e7b8c072438a 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -374,7 +374,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { - OSL_ENSURE( false, "CachedInspectorUI::registerControlObserver: not expected to be called!" ); + OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to // register listeners themself m_rMaster.getDelegatorUI()->registerControlObserver( _Observer ); @@ -383,7 +383,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { - OSL_ENSURE( false, "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); + OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to // register listeners themself m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer ); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index bbfef69b8ebe..b676176bf375 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -618,7 +618,7 @@ namespace pcr case 1: nWritingMode = WritingMode2::RL_TB; break; case 2: nWritingMode = WritingMode2::CONTEXT; break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" ); + OSL_FAIL( "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" ); nWritingMode = WritingMode2::CONTEXT; break; } @@ -754,7 +754,7 @@ namespace pcr case WritingMode2::RL_TB: nNormalized = 1; break; case WritingMode2::CONTEXT: nNormalized = 2; break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" ); + OSL_FAIL( "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" ); nNormalized = 2; break; } @@ -2015,7 +2015,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" ); break; } // switch @@ -3140,7 +3140,7 @@ namespace pcr return sValue; } - OSL_ENSURE( false, "ValueListCommandUI::getSQLCommand: unexpected property type!" ); + OSL_FAIL( "ValueListCommandUI::getSQLCommand: unexpected property type!" ); return sValue; } @@ -3215,7 +3215,7 @@ namespace pcr xCommandUI = new ValueListCommandUI( xComponentProperties ); break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" ); + OSL_FAIL( "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" ); return false; } @@ -3296,7 +3296,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( false, "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" ); } } return bHas; diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 209b466cfe9f..d93f023e4add 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -376,7 +376,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" ); + OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" ); break; } } @@ -443,7 +443,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" ); + OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" ); break; } } @@ -491,7 +491,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::describePropertyLine: huh?" ); + OSL_FAIL( "FormGeometryHandler::describePropertyLine: huh?" ); break; } } @@ -547,7 +547,7 @@ namespace pcr } break; default: - OSL_ENSURE( false, "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" ); + OSL_FAIL( "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" ); break; } } @@ -706,7 +706,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" ); + OSL_FAIL( "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" ); break; } } diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index ef4d8d1f4e02..3802e68dd039 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -516,7 +516,7 @@ namespace pcr } catch( const UnknownPropertyException& ) { - OSL_ENSURE( false, "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" ); + OSL_FAIL( "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" ); } } } @@ -533,7 +533,7 @@ namespace pcr } catch( const UnknownPropertyException& ) { - OSL_ENSURE( false, "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" ); + OSL_FAIL( "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" ); } } m_aPropertyListeners.removeInterface( _rxListener ); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index c885df94a79b..3c1da2b3b53b 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1257,7 +1257,7 @@ namespace pcr ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); sMessage += "'!"; - OSL_ENSURE( false, sMessage ); + OSL_FAIL( sMessage ); } #endif // finally insert this property control @@ -1365,7 +1365,7 @@ namespace pcr // also okay, we expect that the handler has disabled the UI as necessary break; default: - OSL_ENSURE( false, "OPropertyBrowserController::Clicked: unknown result value!" ); + OSL_FAIL( "OPropertyBrowserController::Clicked: unknown result value!" ); break; } } diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index 4f88c2a0bed9..d8b97c0c9faf 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -355,7 +355,7 @@ namespace pcr case InteractiveSelectionResult_Success: case InteractiveSelectionResult_Pending: - OSL_ENSURE( false, "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" ); + OSL_FAIL( "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" ); // This means that we cannot know the new property value, which either has already been set // at the first component ("Success"), or will be set later on once the asynchronous input // is finished ("Pending"). So, we also cannot forward this new property value to the other @@ -372,7 +372,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" ); + OSL_FAIL( "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" ); break; } diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index e2e6c0d7fd49..318b14293d6f 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -181,7 +181,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer ::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "'!" ); - DBG_ERROR( sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); } #endif } @@ -226,7 +226,7 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt ::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "'!" ); - DBG_ERROR( sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); } #endif } @@ -428,7 +428,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, // some structs case uno::TypeClass_STRUCT: - OSL_ENSURE( false, "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" ); + OSL_FAIL( "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" ); if ( _rValue.getValueType().equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) ) { // weird enough, the string representation of dates, as used @@ -572,7 +572,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ break; case uno::TypeClass_STRUCT: - OSL_ENSURE( false, "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" ); + OSL_FAIL( "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" ); if ( _rTargetType.equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) ) { // weird enough, the string representation of dates, as used diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index ff87b3d51724..ee5cc2a0ea3f 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -447,7 +447,7 @@ namespace res Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, "OpenOfficeResourceBundle::getElementNames: not implemented!" ); + OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources return Sequence< ::rtl::OUString >( ); } @@ -478,7 +478,7 @@ namespace res ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, "OpenOfficeResourceBundle::hasElements: not implemented!" ); + OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources return ::sal_Bool( ); } diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx index 22d9d8c52872..324fefa16b6f 100644 --- a/extensions/source/svg/svgaction.cxx +++ b/extensions/source/svg/svgaction.cxx @@ -1449,7 +1449,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL: default : ByteString aDbgOut( "SVGActionWriter::ImplWriteActions: unsupported MetaAction #" ); aDbgOut.Append( ByteString::CreateFromInt32( nType ) ); - DBG_ERROR( aDbgOut.GetBuffer() ); + OSL_FAIL( aDbgOut.GetBuffer() ); break; #endif } diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index ff1c2abc919e..b25854fc64a1 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -380,7 +380,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) case HELP_BUTTON: break; default: - OSL_ENSURE( false, "UpdateHandler::actionPerformed: unknown command!" ); + OSL_FAIL( "UpdateHandler::actionPerformed: unknown command!" ); } } @@ -650,7 +650,7 @@ rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResour } catch( const uno::Exception& ) { - OSL_ENSURE( false, "UpdateHandler::loadString: caught an exception!" ); + OSL_FAIL( "UpdateHandler::loadString: caught an exception!" ); sString = UNISTRING("Missing ") + sKey; } @@ -686,7 +686,7 @@ void UpdateHandler::loadStrings() } catch( const uno::Exception& ) { - OSL_ENSURE( false, "UpdateHandler::loadStrings: could not create the resource loader!" ); + OSL_FAIL( "UpdateHandler::loadStrings: could not create the resource loader!" ); } if ( !xLoader.is() ) return; @@ -699,7 +699,7 @@ void UpdateHandler::loadStrings() } catch( const resource::MissingResourceException& ) { - OSL_ENSURE( false, "UpdateHandler::loadStrings: missing the resource bundle!" ); + OSL_FAIL( "UpdateHandler::loadStrings: missing the resource bundle!" ); } if ( !xBundle.is() ) return; @@ -792,7 +792,7 @@ void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, } catch( const beans::UnknownPropertyException& ) { - OSL_ENSURE( false, "UpdateHandler::setControlProperty: caught an exception!" ); + OSL_FAIL( "UpdateHandler::setControlProperty: caught an exception!" ); } } @@ -803,7 +803,7 @@ void UpdateHandler::showControl( const rtl::OUString &rCtrlName, bool bShow ) if ( !xContainer.is() ) { - OSL_ENSURE( false, "UpdateHandler::showControl: could not get control container!" ); + OSL_FAIL( "UpdateHandler::showControl: could not get control container!" ); return; } @@ -819,7 +819,7 @@ void UpdateHandler::focusControl( DialogControls eID ) if ( !xContainer.is() ) { - OSL_ENSURE( false, "UpdateHandler::focusControl: could not get control container!" ); + OSL_FAIL( "UpdateHandler::focusControl: could not get control container!" ); return; } diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index c757bcb55e5c..5a59b4e070fe 100755 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -284,7 +284,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & } catch( const uno::Exception& ) { - OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); + OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); } if ( !xInfoProvider.is() ) return false; @@ -310,7 +310,7 @@ bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rx } catch( const uno::Exception& ) { - OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); + OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); } if ( !xInfoProvider.is() ) return false; |