diff options
-rw-r--r-- | filter/source/config/cache/basecontainer.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/cacheitem.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 10 | ||||
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 20 | ||||
-rw-r--r-- | filter/source/config/cache/typedetection.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/mscodec.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msoleexp.cxx | 6 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 10 | ||||
-rw-r--r-- | filter/source/xmlfilterdetect/filterdetect.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/genericfilter.cxx | 2 | ||||
-rw-r--r-- | oox/source/core/binarycodec.cxx | 6 | ||||
-rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 10 | ||||
-rw-r--r-- | unoxml/source/dom/elementlist.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/xpath/xpathapi.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/wpsimp/msworks_genericfilter.cxx | 2 |
18 files changed, 47 insertions, 47 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index e4b55af57132..8dfc423af3a7 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -458,7 +458,7 @@ sal_Bool SAL_CALL BaseContainer::hasElements() css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const ::rtl::OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { - OSL_ENSURE(sal_False, "not pure virtual ... but not realy implemented .-)"); + OSL_FAIL("not pure virtual ... but not realy implemented .-)"); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< ::rtl::OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d4524f80e984..28ae0a8e27e9 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -360,7 +360,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, default: break; } - OSL_ENSURE(sal_False, "isSubSet() ... this point should not be reached!"); + OSL_FAIL("isSubSet() ... this point should not be reached!"); return sal_False; } diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 24da6611ec72..ad357fd6e9f3 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -218,7 +218,7 @@ void FilterCache::load(EFillState eRequired, ) ) { - OSL_ENSURE(sal_False, "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!"); + OSL_FAIL("Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!"); } #endif @@ -940,7 +940,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect #endif { #if OSL_DEBUG_LEVEL > 0 - OSL_ENSURE(sal_False, ::rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(::rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); #endif aValue.clear(); } @@ -1701,7 +1701,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe sMsg.append (sActLocale ); sMsg.appendAscii("' failed. Please check your filter configuration."); - OSL_ENSURE(sal_False, _FILTER_CONFIG_TO_ASCII_(sMsg.makeStringAndClear())); + OSL_FAIL(_FILTER_CONFIG_TO_ASCII_(sMsg.makeStringAndClear())); #endif return; } @@ -1911,7 +1911,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType case E_DETECTSERVICE : { - OSL_ENSURE(sal_False, "Cant load detect services on demand. Who use this unsupported feature?"); + OSL_FAIL("Cant load detect services on demand. Who use this unsupported feature?"); } break; } @@ -2263,7 +2263,7 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, sal_Int32 nOrder = sValue.toInt32(); if (nOrder > 0) { - OSL_ENSURE(sal_False, "FilterCache::impl_interpretDataVal4Filter()\nCant move Order value from filter to type on demand!\n"); + OSL_FAIL("FilterCache::impl_interpretDataVal4Filter()\nCant move Order value from filter to type on demand!\n"); _FILTER_CONFIG_LOG_2_("impl_interpretDataVal4Filter(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(rItem).getStr()) } } diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 06689db3bdf5..94352721dd0e 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -143,7 +143,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan if (!m_rCache->hasItem(FilterCache::E_FILTER, sFilter) && m_rCache->hasItem(FilterCache::E_TYPE, sFilter)) { - OSL_ENSURE(sal_False, "Who use this deprecated functionality?"); + OSL_FAIL("Who use this deprecated functionality?"); _FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -246,7 +246,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0); if (pos != -1) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'"); + OSL_FAIL("DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'"); ::rtl::OUStringBuffer sPatchedQuery(256); sPatchedQuery.appendAscii("matchByDocumentService="); sPatchedQuery.append (sNewQuery.copy(7) ); @@ -271,7 +271,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // <- SAFE ---------------------- if (lTokens.find(QUERY_IDENTIFIER_GETPREFERREDFILTERFORTYPE) != lTokens.end()) - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use prop search at the TypeDetection container!"); + OSL_FAIL("DEPRECATED!\nPlease use prop search at the TypeDetection container!"); else if (lTokens.find(QUERY_IDENTIFIER_MATCHBYDOCUMENTSERVICE) != lTokens.end()) lEnumSet = impl_queryMatchByDocumentService(lTokens); @@ -307,43 +307,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize #ifdef COMP_HACK if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )); } else if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math"))) { - OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); + OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )); } #endif diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 93b926cc3cc6..97ad7a9278cd 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -137,7 +137,7 @@ TypeDetection::~TypeDetection() #if OSL_DEBUG_LEVEL > 0 if (stlDescriptor.find(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ))) != stlDescriptor.end()) - OSL_ENSURE(sal_False, "Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!"); + OSL_FAIL("Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!"); #endif css::util::URL aURL; @@ -202,7 +202,7 @@ TypeDetection::~TypeDetection() // update descriptor and set last chance for return. if (!sType.getLength() && sLastChance.getLength()) { - OSL_ENSURE(sal_False, "set first flat detected type without a registered deep detection service as \"last chance\" ... nevertheless some other deep detections said \"NO\". I TRY IT!"); + OSL_FAIL("set first flat detected type without a registered deep detection service as \"last chance\" ... nevertheless some other deep detections said \"NO\". I TRY IT!"); sType = sLastChance; } } diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index ce8bd54fd041..f530dde3f1a3 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -190,7 +190,7 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ), (sal_Int16)0 ); } else - OSL_ENSURE( sal_False, "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!\n" ); return bResult; } @@ -333,10 +333,10 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa lcl_PrintDigest(m_pDocId, "DocId value"); } else - OSL_ENSURE( sal_False, "Unexpected document ID!\n" ); + OSL_FAIL( "Unexpected document ID!\n" ); } else - OSL_ENSURE( sal_False, "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!\n" ); return bResult; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index f5e3172f4664..014569241fc8 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7748,7 +7748,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Could not set visual area of the object!\n" ); + OSL_FAIL( "Could not set visual area of the object!\n" ); } } diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index ca691767477b..c9c13ed4881a 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -130,7 +130,7 @@ sal_Bool UseOldMSExport() } } - OSL_ENSURE( sal_False, "Could not get access to configuration entry!\n" ); + OSL_FAIL( "Could not get access to configuration entry!\n" ); return sal_False; } @@ -268,13 +268,13 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto } catch( embed::NoVisualAreaSizeException& ) { - OSL_ENSURE( sal_False, "Could not get visual area size!\n" ); + OSL_FAIL( "Could not get visual area size!\n" ); aSize.Width = 5000; aSize.Height = 5000; } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Unexpected exception while getting visual area size!\n" ); + OSL_FAIL( "Unexpected exception while getting visual area size!\n" ); aSize.Width = 5000; aSize.Height = 5000; } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index be367005d217..44b06d05e255 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -126,7 +126,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star Reference < XDocumentHandler > xHandler( mxMSF->createInstanceWithArguments( sXMLImportService, aAnys ), UNO_QUERY ); if(! xHandler.is()) { - OSL_ENSURE(sal_False, "XMLReader::Read: %s Unable to create service instance xHandler\n" ); + OSL_FAIL("XMLReader::Read: %s Unable to create service instance xHandler\n" ); return sal_False; } Reference < XImporter > xImporter( xHandler, UNO_QUERY ); @@ -141,7 +141,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star //********************* Reference< XInterface > xConvBridge(mxMSF->createInstance( udConvertClass ), UNO_QUERY); if(! xConvBridge.is()){ - OSL_ENSURE( sal_False,"XMLReader::Read: %s service missing\n" ); + OSL_FAIL( "XMLReader::Read: %s service missing\n" ); return sal_False; } if (xStatusIndicator.is()) @@ -208,7 +208,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star if (xStatusIndicator.is()) xStatusIndicator->end(); - OSL_ENSURE( sal_False, ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); return sal_False; } if (xStatusIndicator.is()) { @@ -238,7 +238,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star // Set up converter bridge. Reference< com::sun::star::xml::XExportFilter > xConverter(mxMSF->createInstance(udConvertClass ), UNO_QUERY); if(! xConverter.is()){ - OSL_ENSURE( sal_False, "xml export sub service missing" ); + OSL_FAIL( "xml export sub service missing" ); return sal_False; } @@ -327,7 +327,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star catch( Exception& ) #endif { - OSL_ENSURE( sal_False, ::rtl::OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( ::rtl::OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) xStatusIndicator->end(); return sal_False; diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index ddf8926567e0..ec0a61c34a8a 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -179,7 +179,7 @@ Reference< com::sun::star::frame::XModel > xModel; } catch(Exception &) { - OSL_ENSURE( sal_False, "An Exception occurred while opening File stream" ); + OSL_FAIL( "An Exception occurred while opening File stream" ); } if (sTypeName.getLength()) { diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index b54ebe91df4b..e4ded85b4f2a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -306,7 +306,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) OString aMessage("XSLTFilter::error was called: "); aMessage += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMessage); + OSL_FAIL(aMessage); } m_bError = sal_True; osl_setCondition(m_cTransformed); diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx index 0e5a6da345ff..7bec7a650e2b 100644 --- a/lotuswordpro/source/filter/genericfilter.cxx +++ b/lotuswordpro/source/filter/genericfilter.cxx @@ -47,7 +47,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index d2f81d31b9ee..5169f67bbb74 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -199,7 +199,7 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ), (sal_Int16)0 ); } else - OSL_ENSURE( sal_False, "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!\n" ); return bResult; } @@ -307,10 +307,10 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData bResult = sal_False; } else - OSL_ENSURE( sal_False, "Unexpected document ID!\n" ); + OSL_FAIL( "Unexpected document ID!\n" ); } else - OSL_ENSURE( sal_False, "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!\n" ); return bResult; } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index b65fffc632da..c1cefe1efc9c 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -94,7 +94,7 @@ namespace DOM is.aInputStream = aContent.openStream(); } catch (com::sun::star::uno::Exception) { - OSL_ENSURE(sal_False, "exception in default entity resolver"); + OSL_FAIL("exception in default entity resolver"); is.aInputStream = Reference< XInputStream >(); } return is; @@ -228,7 +228,7 @@ namespace DOM return nread; } catch (com::sun::star::uno::Exception& ex) { (void) ex; - OSL_ENSURE(sal_False, OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); return -1; } } @@ -248,7 +248,7 @@ namespace DOM return 0; } catch (com::sun::star::uno::Exception& ex) { (void) ex; - OSL_ENSURE(sal_False, OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); return -1; } } @@ -300,7 +300,7 @@ namespace DOM OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 warning\n"))); buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx))); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } // default error handler triggers assertion @@ -309,7 +309,7 @@ namespace DOM OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error\n"))); buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx))); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } } // extern "C" diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 5b0d96758459..f458b1928d23 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -72,7 +72,7 @@ namespace DOM } catch (Exception &e){ OString aMsg("Exception caught while registering NodeList as listener:\n"); aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMsg.getStr()); + OSL_FAIL(aMsg.getStr()); } } diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index a800cefc5f52..ee729a9451e3 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -283,7 +283,7 @@ namespace XPath buf.appendAscii(str); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } static void structured_error_func(void * userData, xmlErrorPtr error) @@ -298,7 +298,7 @@ namespace XPath } OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } } // extern "C" diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx index d1686773ffe9..210d5ef2a51b 100644 --- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx +++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx @@ -69,7 +69,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx index 695791431103..a736bff9edb3 100644 --- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx +++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx @@ -69,7 +69,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; |