[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff binfilter/filter binfilter/legacysmgr filter/source lotuswordpro/source oox/source unoxml/source writerperfect/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Mar 19 06:08:26 PDT 2011
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 9 +---
binfilter/bf_forms/source/component/forms_Filter.cxx | 8 +--
binfilter/bf_forms/source/component/forms_FormComponent.cxx | 6 +-
binfilter/bf_forms/source/misc/forms_limitedformats.cxx | 8 +--
binfilter/bf_svtools/source/config/svt_itemholder1.cxx | 2
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx | 2
binfilter/bf_svtools/source/config/svt_viewoptions.cxx | 4 -
binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 2
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 4 -
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 2
binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx | 4 -
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 4 -
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 2
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtcache.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx | 4 -
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 4 -
binfilter/bf_xmloff/source/forms/elementimport_impl.hxx | 4 -
binfilter/bf_xmloff/source/forms/xmloff_attriblistmerge.cxx | 4 -
binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx | 8 +--
binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx | 21 ++++------
binfilter/bf_xmloff/source/forms/xmloff_eventimport.cxx | 2
binfilter/bf_xmloff/source/forms/xmloff_formattributes.cxx | 12 ++---
binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx | 10 ++--
binfilter/bf_xmloff/source/forms/xmloff_formlayerexport.cxx | 2
binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx | 8 +--
binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx | 12 ++---
binfilter/bf_xmloff/source/forms/xmloff_officeforms.cxx | 4 -
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx | 11 ++---
binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx | 17 +++-----
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 2
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 4 -
binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 4 -
filter/source/config/cache/basecontainer.cxx | 2
filter/source/config/cache/cacheitem.cxx | 2
filter/source/config/cache/filtercache.cxx | 10 ++--
filter/source/config/cache/filterfactory.cxx | 20 ++++-----
filter/source/config/cache/typedetection.cxx | 4 -
filter/source/msfilter/mscodec.cxx | 6 +-
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/msoleexp.cxx | 6 +-
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 10 ++--
filter/source/xmlfilterdetect/filterdetect.cxx | 2
filter/source/xsltfilter/XSLTFilter.cxx | 2
lotuswordpro/source/filter/genericfilter.cxx | 2
oox/source/core/binarycodec.cxx | 6 +-
unoxml/source/dom/documentbuilder.cxx | 10 ++--
unoxml/source/dom/elementlist.cxx | 2
unoxml/source/xpath/xpathapi.cxx | 4 -
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 2
writerperfect/source/wpsimp/msworks_genericfilter.cxx | 2
54 files changed, 144 insertions(+), 150 deletions(-)
New commits:
commit 5f97cb68c8c22e19812559a107e0d339b725f772
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 19 14:08:24 2011 +0100
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index b9ecbbd..0b48462 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -1245,8 +1245,7 @@ bool ODatabaseForm::fillParameters(::osl::ResettableMutexGuard& _rClearForNotifi
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False,
- ::rtl::OString( "ODatabaseForm::fillParameters: master-detail parameter number " )
+ OSL_FAIL( ::rtl::OString( "ODatabaseForm::fillParameters: master-detail parameter number " )
+= ::rtl::OString::valueOf( sal_Int32(aFind->second + 1) ));
}
++aFind;
@@ -2018,7 +2017,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "ODatabaseForm::reset_impl: could not initialize the master-detail-driven parameters!");
+ OSL_FAIL("ODatabaseForm::reset_impl: could not initialize the master-detail-driven parameters!");
}
}
}
@@ -2476,7 +2475,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
{
// can't throw an exception other than a RuntimeException (which would not be appropriate),
// so we ignore (and only assert) this
- OSL_ENSURE( sal_False, "ODatabaseForm::setGroup: invalid arguments!" );
+ OSL_FAIL( "ODatabaseForm::setGroup: invalid arguments!" );
continue;
}
@@ -2670,7 +2669,7 @@ void ODatabaseForm::stopSharingConnection( )
//------------------------------------------------------------------------------
sal_Bool ODatabaseForm::implEnsureConnection()
{
- OSL_ENSURE( sal_False, "ODatabaseForm::implEnsureConnection: this should be dead code, we're in binfilter here!" );
+ OSL_FAIL( "ODatabaseForm::implEnsureConnection: this should be dead code, we're in binfilter here!" );
return sal_False;
}
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index 21676b8..e294f2a 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -107,13 +107,13 @@ namespace frm
{
if ( !m_xField.is() )
{
- OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: improperly initialized: no field!" );
+ OSL_FAIL( "OFilterControl::ensureInitialized: improperly initialized: no field!" );
return sal_False;
}
if ( !m_xMetaData.is() )
{
- OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: improperly initialized: no database meta data!" );
+ OSL_FAIL( "OFilterControl::ensureInitialized: improperly initialized: no database meta data!" );
return sal_False;
}
@@ -133,7 +133,7 @@ namespace frm
}
if ( !m_xFormatter.is() )
{
- OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: no number formatter!" );
+ OSL_FAIL( "OFilterControl::ensureInitialized: no number formatter!" );
// no fallback anymore
return sal_False;
}
@@ -545,7 +545,7 @@ namespace frm
Reference< XPropertySet > xControlModel;
if ( !(*pValue >>= xControlModel ) || !xControlModel.is() )
{
- OSL_ENSURE( sal_False, "OFilterControl::initialize: invalid control model argument!" );
+ OSL_FAIL( "OFilterControl::initialize: invalid control model argument!" );
continue;
}
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index 39912f8..9df6978 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -417,7 +417,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
+ OSL_FAIL("OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
}
}
@@ -432,7 +432,7 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
+ OSL_FAIL("OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
}
::comphelper::operator<<( _rxOutStream, sHelpText);
}
@@ -1374,7 +1374,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
}
else
{
- OSL_ENSURE(sal_False, "OBoundControlModel::connectToField: property NAME not supported!");
+ OSL_FAIL("OBoundControlModel::connectToField: property NAME not supported!");
setField(NULL,sal_False);
}
}
diff --git a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
index 754651e..3eaaf68 100644
--- a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
+++ b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
@@ -80,7 +80,7 @@ namespace frm
return s_aSystem;
}
- OSL_ENSURE(sal_False, "getLocale: invalid enum value!");
+ OSL_FAIL("getLocale: invalid enum value!");
return s_aSystem;
}
@@ -135,7 +135,7 @@ namespace frm
}
}
- OSL_ENSURE(sal_False, "lcl_getFormatTable: invalid id!");
+ OSL_FAIL("lcl_getFormatTable: invalid id!");
return NULL;
}
@@ -199,7 +199,7 @@ namespace frm
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "OLimitedFormats::ensureTableInitialized: adding the key to the formats collection failed!");
+ OSL_FAIL("OLimitedFormats::ensureTableInitialized: adding the key to the formats collection failed!");
}
#endif
}
@@ -243,7 +243,7 @@ namespace frm
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "OLimitedFormats::setAggregateSet: invalid handle!");
+ OSL_FAIL("OLimitedFormats::setAggregateSet: invalid handle!");
}
}
#endif
diff --git a/binfilter/bf_svtools/source/config/svt_itemholder1.cxx b/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
index e1ed2b5..ddee47b 100644
--- a/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
+++ b/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
@@ -106,7 +106,7 @@ ItemHolder1::ItemHolder1()
sMsg += ::rtl::OString(rEx.Message.getStr(),
rEx.Message.getLength(),
RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, sMsg.getStr());
+ OSL_FAIL(sMsg.getStr());
}
}
#else
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 1b450c2..3f88c17 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -504,7 +504,7 @@ SvtModuleOptions_Impl::~SvtModuleOptions_Impl()
*//*-*************************************************************************************************************/
void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< ::rtl::OUString >& )
{
- OSL_ENSURE( sal_False, "SvtModuleOptions_Impl::Notify()\nNot implemented yet!\n" );
+ OSL_FAIL( "SvtModuleOptions_Impl::Notify()\nNot implemented yet!\n" );
}
/*-****************************************************************************************************//**
diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
index 3faa450..2df9a6f 100644
--- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
@@ -105,7 +105,7 @@ namespace css = ::com::sun::star;
sMsg.appendAscii("Unexpected exception catched. Original message was:\n\"" ); \
sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \
sMsg.appendAscii("\"" ); \
- OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); \
+ OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); \
}
//_________________________________________________________________________________________________________________
@@ -452,7 +452,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType ,
}
}
break;
- default : OSL_ENSURE( sal_False, "SvtViewOptions::SvtViewOptions()\nThese view type is unknown! All following calls at these instance will do nothing!\n" );
+ default : OSL_FAIL( "SvtViewOptions::SvtViewOptions()\nThese view type is unknown! All following calls at these instance will do nothing!\n" );
}
}
diff --git a/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx b/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
index 91fffc7..0581e7e 100644
--- a/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
@@ -187,7 +187,7 @@ namespace binfilter
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ImageResourceAccess::getImageStream: caught an exception!" );
+ OSL_FAIL( "ImageResourceAccess::getImageStream: caught an exception!" );
}
return pReturn;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index fed1667..33cbf26 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -555,7 +555,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rPam.Exchange();
/*N*/ if( !rPam.Move( fnMoveBackward, fnGoNode ))
/*N*/ {
-/*N*/ OSL_ENSURE( sal_False, "kein Node mehr vorhanden" );
+/*N*/ OSL_FAIL( "kein Node mehr vorhanden" );
/*N*/ return sal_False;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index fa274e2..1fbc190 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -745,7 +745,7 @@ BOOL SwAuthorField::PutValue( const uno::Any& rAny, BYTE nMId )
/*?*/ nFmt = (sal_uInt32)nNumberingType;
/*N*/ break;
/*N*/ default:
-/*?*/ OSL_ENSURE( sal_False, "SwDocStatFieldType::Expand: unbekannter SubType" );
+/*?*/ OSL_FAIL( "SwDocStatFieldType::Expand: unbekannter SubType" );
/*N*/ }
/*N*/
/*N*/ String sRet;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 7ea00c3..804994a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -603,7 +603,7 @@ SvStream& SwFmtNoBalancedColumns::Store(SvStream &rStrm, USHORT ) const
/*M*/ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Create(SvStream &rStrm, USHORT) const
/*M*/ {
-/*M*/ OSL_ENSURE( sal_False, "SwHeaderAndFooterEatSpacingItem::Create called for old fileformat" );
+/*M*/ OSL_FAIL( "SwHeaderAndFooterEatSpacingItem::Create called for old fileformat" );
/*M*/ BYTE n;
/*M*/ rStrm >> n;
/*M*/ return new SwHeaderAndFooterEatSpacingItem( RES_HEADER_FOOTER_EAT_SPACING, BOOL(n) );
@@ -612,7 +612,7 @@ SvStream& SwFmtNoBalancedColumns::Store(SvStream &rStrm, USHORT ) const
/*M*/ SvStream& SwHeaderAndFooterEatSpacingItem::Store(SvStream &rStrm, USHORT ) const
/*M*/ {
-/*M*/ OSL_ENSURE( sal_False, "SwHeaderAndFooterEatSpacingItem::Store called for old fileformat" );
+/*M*/ OSL_FAIL( "SwHeaderAndFooterEatSpacingItem::Store called for old fileformat" );
/*M*/ rStrm << BYTE(GetValue());
/*M*/ return rStrm;
/*M*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 3c1a805..ccff752 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -543,7 +543,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ {
/*N*/ if( ((SwTxtFrm*)GetFollow())->IsLocked() )
/*N*/ {
-/*?*/ OSL_ENSURE( sal_False, "+SwTxtFrm::JoinFrm: Follow ist locked." );
+/*?*/ OSL_FAIL( "+SwTxtFrm::JoinFrm: Follow ist locked." );
/*?*/ UNDO_SWAP( this )
/*?*/ return;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
index 6f69f4c..c366291 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
@@ -138,7 +138,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*M*/ case SVX_LINE_SPACE_FIX:
/*M*/ nFirstLineOfs = pSpace->GetLineHeight();
/*M*/ break;
-/*M*/ default: OSL_ENSURE( sal_False, ": unknown LineSpaceRule" );
+/*M*/ default: OSL_FAIL( ": unknown LineSpaceRule" );
/*M*/ }
/*M*/ switch( pSpace->GetInterLineSpaceRule() )
/*M*/ {
@@ -164,7 +164,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*M*/ nFirstLineOfs += pSpace->GetInterLineSpace();
/*M*/ break;
/*M*/ }
-/*M*/ default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
+/*M*/ default: OSL_FAIL( ": unknown InterLineSpaceRule" );
/*M*/ }
/*M*/ }
/*M*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 206f1a4..6df8054 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1565,7 +1565,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*?*/ pInf->GetParaPortion()->SetFixLineHeight();
/*?*/ }
/*?*/ break;
-/*?*/ default: OSL_ENSURE( sal_False, ": unknown LineSpaceRule" );
+/*?*/ default: OSL_FAIL( ": unknown LineSpaceRule" );
/*N*/ }
/*N*/ if( !IsParaLine() )
/*N*/ switch( pSpace->GetInterLineSpaceRule() )
@@ -1592,7 +1592,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*?*/ nLineHeight += pSpace->GetInterLineSpace();
/*?*/ break;
/*N*/ }
-/*N*/ default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
+/*N*/ default: OSL_FAIL( ": unknown InterLineSpaceRule" );
/*N*/ }
/*N*/ }
/*N*/ #if OSL_DEBUG_LEVEL > 1
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index 0b2989c..fd7a011 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -433,7 +433,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*?*/ case i18n::ScriptType::COMPLEX : return SW_CTL;
/*?*/ }
/*?*/
-/*?*/ OSL_ENSURE( sal_False, "Somebody tells lies about the script type!" );
+/*?*/ OSL_FAIL( "Somebody tells lies about the script type!" );
/*?*/ return SW_LATIN;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
index e9c4b51..3a4ddbc 100644
--- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
@@ -357,7 +357,7 @@ namespace binfilter {
/*?*/ nNettoHeight = rRegDiff;
/*?*/ break;
/*?*/ }
-/*?*/ default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
+/*?*/ default: OSL_FAIL( ": unknown InterLineSpaceRule" );
/*N*/ }
/*N*/ pDesc->SetRegHeight( rRegDiff );
/*N*/ pDesc->SetRegAscent( rRegDiff - nNettoHeight +
diff --git a/binfilter/bf_sw/source/core/text/sw_txtcache.cxx b/binfilter/bf_sw/source/core/text/sw_txtcache.cxx
index 32eb21d..5e5880c 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtcache.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtcache.cxx
@@ -206,7 +206,7 @@ namespace binfilter {
/*N*/ nCacheIdx = pTxtLine->GetCachePos();
/*N*/ else
/*N*/ {
-/*?*/ OSL_ENSURE( sal_False, "+SetPara: InsertCache failed." );
+/*?*/ OSL_FAIL( "+SetPara: InsertCache failed." );
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
index e58e1ae..c9b7d70 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
@@ -121,7 +121,7 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ break;
/*N*/ #if OSL_DEBUG_LEVEL > 1
/*N*/ default :
-/*N*/ OSL_ENSURE( sal_False, "Unsupported direction" );
+/*N*/ OSL_FAIL( "Unsupported direction" );
/*N*/ break;
/*N*/ #endif
/*N*/ }
@@ -148,7 +148,7 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*?*/ break;
/*?*/ #if OSL_DEBUG_LEVEL > 1
/*?*/ default :
-/*?*/ OSL_ENSURE( sal_False, "Unsupported direction" );
+/*?*/ OSL_FAIL( "Unsupported direction" );
/*?*/ break;
/*?*/ #endif
/*?*/ }
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index d2783b3..5841f66 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -805,7 +805,7 @@ void SwXTextCursor::DeleteAndInsert(const String& rText)
//OPT: GetSystemCharSet
if( !pDoc->Insert(*_pStartCrsr, rText) )
{
- OSL_ENSURE( sal_False, "Doc->Insert(Str) failed." );
+ OSL_FAIL( "Doc->Insert(Str) failed." );
}
SwXTextCursor::SelectPam(*pUnoCrsr, sal_True);
_pStartCrsr->Left(rText.Len(), CRSR_SKIP_CHARS);
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index 7bca41b..a911c7f 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -1207,7 +1207,7 @@ void SwXTextRange::DeleteAndInsert(const String& rText) throw( uno::RuntimeExce
{
if( !pLclDoc->Insert(aNewCrsr, rText) )
{
- OSL_ENSURE( sal_False, "Doc->Insert(Str) failed." );
+ OSL_FAIL( "Doc->Insert(Str) failed." );
}
SwXTextCursor::SelectPam(aNewCrsr, sal_True);
aNewCrsr.Left(rText.Len(), CRSR_SKIP_CHARS);
@@ -1936,7 +1936,7 @@ void SwXTextCursor::SetString(SwCursor& rCrsr, const OUString& rString)
//OPT: GetSystemCharSet
if( !pDoc->Insert(rCrsr, aText) )
{
- OSL_ENSURE( sal_False, "Doc->Insert(Str) failed." );
+ OSL_FAIL( "Doc->Insert(Str) failed." );
}
SwXTextCursor::SelectPam(rCrsr, sal_True);
rCrsr.Left(nTxtLen, CRSR_SKIP_CHARS);
diff --git a/binfilter/bf_xmloff/source/forms/elementimport_impl.hxx b/binfilter/bf_xmloff/source/forms/elementimport_impl.hxx
index d61520f..7047eb6 100644
--- a/binfilter/bf_xmloff/source/forms/elementimport_impl.hxx
+++ b/binfilter/bf_xmloff/source/forms/elementimport_impl.hxx
@@ -51,7 +51,7 @@ SvXMLImportContext* OContainerImport< BASE >::CreateChildContext(
return implCreateControlWrapper(_nPrefix, _rLocalName);
else
{
- OSL_ENSURE(sal_False, "OContainerImport::CreateChildContext: don't have an element!");
+ OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!");
return NULL;
}
}
@@ -73,7 +73,7 @@ template <class BASE>
m_xMeAsContainer = ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >(xReturn, ::com::sun::star::uno::UNO_QUERY);
if (!m_xMeAsContainer.is())
{
- OSL_ENSURE(sal_False, "OContainerImport::createElement: invalid element (no XNameContainer) created!");
+ OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!");
xReturn.clear();
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_attriblistmerge.cxx b/binfilter/bf_xmloff/source/forms/xmloff_attriblistmerge.cxx
index e203a76..7f5190e 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_attriblistmerge.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_attriblistmerge.cxx
@@ -62,7 +62,7 @@ namespace xmloff
if (aLookupSublist == m_aLists.end())
{
- OSL_ENSURE(sal_False, "OAttribListMerger::seekToIndex: invalid index!");
+ OSL_FAIL("OAttribListMerger::seekToIndex: invalid index!");
return sal_False;
}
_rSubList = *aLookupSublist;
@@ -85,7 +85,7 @@ namespace xmloff
return sal_True;
}
- OSL_ENSURE(sal_False, "OAttribListMerger::seekToName: did not find the name!");
+ OSL_FAIL("OAttribListMerger::seekToName: did not find the name!");
return sal_False;
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
index a2addad..fa5de12 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
@@ -153,7 +153,7 @@ namespace xmloff
Reference< XPersistObject > xPersistence(m_xProps, UNO_QUERY);
if (!xPersistence.is())
{
- OSL_ENSURE(sal_False, "OElementExport::exportServiceNameAttribute: no XPersistObject!");
+ OSL_FAIL("OElementExport::exportServiceNameAttribute: no XPersistObject!");
return;
}
@@ -1320,7 +1320,7 @@ namespace xmloff
break;
default:
- OSL_ENSURE(sal_False, "OControlExport::examineControl: unknown control type (class id)!");
+ OSL_FAIL("OControlExport::examineControl: unknown control type (class id)!");
break;
}
@@ -1388,7 +1388,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OControlExport::exportCellBindingAttributes: caught an exception!" );
+ OSL_FAIL( "OControlExport::exportCellBindingAttributes: caught an exception!" );
}
}
@@ -1415,7 +1415,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OControlExport::exportCellListSourceRange: caught an exception!" );
+ OSL_FAIL( "OControlExport::exportCellListSourceRange: caught an exception!" );
}
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
index acaa1b0..f46dbd4 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
@@ -211,7 +211,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OElementImport::EndElement: could not set the properties (using the XMultiPropertySet)!");
+ OSL_FAIL("OElementImport::EndElement: could not set the properties (using the XMultiPropertySet)!");
}
}
@@ -230,8 +230,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("OElementImport::EndElement: could not set the property \"")
+ OSL_FAIL(::rtl::OString("OElementImport::EndElement: could not set the property \"")
+= ::rtl::OString(aPropValues->Name.getStr(), aPropValues->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString("\"!"));
}
@@ -252,7 +251,7 @@ namespace xmloff
// insert the element into the parent container
if (!m_sName.getLength())
{
- OSL_ENSURE(sal_False, "OElementImport::EndElement: did not find a name attribute!");
+ OSL_FAIL("OElementImport::EndElement: did not find a name attribute!");
m_sName = implGetDefaultName();
}
@@ -289,7 +288,7 @@ namespace xmloff
continue;
return sReturn;
}
- OSL_ENSURE(sal_False, "OElementImport::implGetDefaultName: did not find a free name!");
+ OSL_FAIL("OElementImport::implGetDefaultName: did not find a free name!");
return sUnnamedName;
}
@@ -337,7 +336,7 @@ namespace xmloff
xReturn = Reference< XPropertySet >(xPure, UNO_QUERY);
}
else
- OSL_ENSURE(sal_False, "OElementImport::createElement: no service name to create an element!");
+ OSL_FAIL("OElementImport::createElement: no service name to create an element!");
return xReturn;
}
@@ -451,7 +450,7 @@ namespace xmloff
Reference< XPropertySetInfo > xPropsInfo = m_xElement->getPropertySetInfo();
if (!xPropsInfo.is())
{
- OSL_ENSURE(sal_False, "OControlImport::StartElement: no PropertySetInfo!");
+ OSL_FAIL("OControlImport::StartElement: no PropertySetInfo!");
return;
}
@@ -595,7 +594,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while retrieving the class id!" );
+ OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the class id!" );
}
const sal_Char* pValueProperty = NULL;
@@ -631,7 +630,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while retrieving the current value property!" );
+ OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the current value property!" );
}
}
}
@@ -648,7 +647,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while restoring the value property!" );
+ OSL_FAIL( "OControlImport::EndElement: caught an exception while restoring the value property!" );
}
}
@@ -1435,7 +1434,7 @@ namespace xmloff
}
else
{
- OSL_ENSURE(sal_False, "OFormImport::implTranslateStringListProperty: invalid value (empty)!");
+ OSL_FAIL("OFormImport::implTranslateStringListProperty: invalid value (empty)!");
}
aProp.Value <<= aList;
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_eventimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_eventimport.cxx
index 2c04402..62501e6 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_eventimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_eventimport.cxx
@@ -129,7 +129,7 @@ namespace xmloff
Reference< XEventAttacherManager > xEventManager(_rxContainer, UNO_QUERY);
if (!xEventManager.is())
{
- OSL_ENSURE(sal_False, "ODefaultEventAttacherManager::setEvents: invalid argument!");
+ OSL_FAIL("ODefaultEventAttacherManager::setEvents: invalid argument!");
return;
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formattributes.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formattributes.cxx
index e43d269..8b5aecd 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_formattributes.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_formattributes.cxx
@@ -73,7 +73,7 @@ namespace xmloff
case CCA_TITLE: return "title";
case CCA_VALUE: return "value";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getCommonControlAttributeName: invalid id (maybe you or-ed two flags?)!");
+ OSL_FAIL("OAttributeMetaData::getCommonControlAttributeName: invalid id (maybe you or-ed two flags?)!");
}
return "";
}
@@ -117,7 +117,7 @@ namespace xmloff
case faOrder: return "order";
case faTabbingCycle: return "tab-cycle";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getFormAttributeName: invalid id!");
+ OSL_FAIL("OAttributeMetaData::getFormAttributeName: invalid id!");
}
return "";
}
@@ -145,7 +145,7 @@ namespace xmloff
case DA_LIST_SOURCE: return "list-source";
case DA_LIST_SOURCE_TYPE: return "list-source-type";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getDatabaseAttributeName: invalid id (maybe you or-ed two flags?)!");
+ OSL_FAIL("OAttributeMetaData::getDatabaseAttributeName: invalid id (maybe you or-ed two flags?)!");
}
return "";
}
@@ -166,7 +166,7 @@ namespace xmloff
case BA_LIST_LINKING_TYPE: return "list-linkage-type";
case BA_LIST_CELL_RANGE: return "source-cell-range";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getBindingAttributeName: invalid id (maybe you or-ed two flags?)!");
+ OSL_FAIL("OAttributeMetaData::getBindingAttributeName: invalid id (maybe you or-ed two flags?)!");
}
return "";
}
@@ -196,7 +196,7 @@ namespace xmloff
case SCA_STATE: return "state";
case SCA_COLUMN_STYLE_NAME: return "column-style-name";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getSpecialAttributeName: invalid id (maybe you or-ed two flags?)!");
+ OSL_FAIL("OAttributeMetaData::getSpecialAttributeName: invalid id (maybe you or-ed two flags?)!");
}
return "";
}
@@ -216,7 +216,7 @@ namespace xmloff
case ofaAutomaticFocus: return "automatic-focus";
case ofaApplyDesignMode: return "apply-design-mode";
default:
- OSL_ENSURE(sal_False, "OAttributeMetaData::getOfficeFormsAttributeName: invalid id!");
+ OSL_FAIL("OAttributeMetaData::getOfficeFormsAttributeName: invalid id!");
}
return "";
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
index 211869e..5f0ba10 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
@@ -218,7 +218,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FormCellBindingHelper::getStringAddressFromCellBinding: caught an exception!" );
+ OSL_FAIL( "FormCellBindingHelper::getStringAddressFromCellBinding: caught an exception!" );
}
return sAddress;
@@ -247,7 +247,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FormCellBindingHelper::getStringAddressFromCellListSource: caught an exception!" );
+ OSL_FAIL( "FormCellBindingHelper::getStringAddressFromCellListSource: caught an exception!" );
}
return sAddress;
@@ -283,7 +283,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: caught an exception!" );
+ OSL_FAIL( "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: caught an exception!" );
}
return bYesItIs;
@@ -438,7 +438,7 @@ namespace xmloff
}
catch ( const Exception& )
{
- OSL_ENSURE( sal_False, "FormCellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" );
+ OSL_FAIL( "FormCellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" );
}
}
return xReturn;
@@ -469,7 +469,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FormCellBindingHelper::doConvertAddressRepresentations: caught an exception!" );
+ OSL_FAIL( "FormCellBindingHelper::doConvertAddressRepresentations: caught an exception!" );
}
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formlayerexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formlayerexport.cxx
index 12102b4..6df7f22 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_formlayerexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_formlayerexport.cxx
@@ -93,7 +93,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OFormLayerXMLExport::examine: could not examine the draw page!");
+ OSL_FAIL("OFormLayerXMLExport::examine: could not examine the draw page!");
}
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
index c30b485..41c8d9e 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
@@ -110,7 +110,7 @@ namespace xmloff
if (!xSI->supportsService(SERVICE_FORMSCOLLECTION))
{
- OSL_ENSURE(sal_False, "OFormLayerXMLExport_Impl::implCheckPage: invalid collection (is no com.sun.star.form.Forms)!");
+ OSL_FAIL("OFormLayerXMLExport_Impl::implCheckPage: invalid collection (is no com.sun.star.form.Forms)!");
// nothing to do
return sal_False;
}
@@ -220,7 +220,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OFormLayerXMLExport_Impl::exportCollectionElements: caught an exception ... skipping the current element!");
+ OSL_FAIL("OFormLayerXMLExport_Impl::exportCollectionElements: caught an exception ... skipping the current element!");
continue;
}
}
@@ -555,13 +555,13 @@ namespace xmloff
}
}
else
- OSL_ENSURE( sal_False, "OFormLayerXMLExport_Impl::collectGridAutoStyles: invalid grid column encountered!" );
+ OSL_FAIL( "OFormLayerXMLExport_Impl::collectGridAutoStyles: invalid grid column encountered!" );
}
}
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OFormLayerXMLExport_Impl::collectGridAutoStyles: error examining the grid colums!" );
+ OSL_FAIL( "OFormLayerXMLExport_Impl::collectGridAutoStyles: error examining the grid colums!" );
}
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
index a34434c..7d02a01 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
@@ -286,11 +286,11 @@ namespace xmloff
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::applyControlNumberStyle: couldn't set the format!");
+ OSL_FAIL("OFormLayerXMLImport_Impl::applyControlNumberStyle: couldn't set the format!");
}
}
else
- OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::applyControlNumberStyle: did not find the style with the given name!");
+ OSL_FAIL("OFormLayerXMLImport_Impl::applyControlNumberStyle: did not find the style with the given name!");
}
}
@@ -452,7 +452,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::endPage: unable to knit the control references (caught an exception)!");
+ OSL_FAIL("OFormLayerXMLImport_Impl::endPage: unable to knit the control references (caught an exception)!");
}
// now that we have all children of the forms collection, attach the events
@@ -478,7 +478,7 @@ namespace xmloff
if (m_aCurrentPageIds->second.end() != aPos)
xReturn = aPos->second;
else
- OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::lookupControlId: invalid control id (did not find it)!");
+ OSL_FAIL("OFormLayerXMLImport_Impl::lookupControlId: invalid control id (did not find it)!");
}
return xReturn;
}
@@ -554,7 +554,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell!" );
+ OSL_FAIL( "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell!" );
}
}
m_aCellValueBindings.clear();
@@ -581,7 +581,7 @@ namespace xmloff
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell range!" );
+ OSL_FAIL( "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell range!" );
}
}
m_aCellRangeListSources.clear();
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_officeforms.cxx b/binfilter/bf_xmloff/source/forms/xmloff_officeforms.cxx
index e4f0107..eaeb488 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_officeforms.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_officeforms.cxx
@@ -113,7 +113,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OFormsRootImport::StartElement: caught an exception while setting the document properties!");
+ OSL_FAIL("OFormsRootImport::StartElement: caught an exception while setting the document properties!");
}
}
@@ -182,7 +182,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OFormsRootExport::addModelAttributes: caught an exception while retrieving the document properties!");
+ OSL_FAIL("OFormsRootExport::addModelAttributes: caught an exception while retrieving the document properties!");
}
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx
index d93186b..7898c92 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx
@@ -280,7 +280,7 @@ namespace xmloff
pSequenceIterator = new OSequenceIterator< sal_Int64 >(aValue);
break;
default:
- OSL_ENSURE(sal_False, "OPropertyExport::exportRemainingProperties: unsupported sequence tyoe !");
+ OSL_FAIL("OPropertyExport::exportRemainingProperties: unsupported sequence tyoe !");
break;
}
if (pSequenceIterator)
@@ -590,7 +590,7 @@ namespace xmloff
break;
case TypeClass_HYPER:
// TODO
- OSL_ENSURE(sal_False, "OPropertyExport::implConvertAny: missing implementation for sal_Int64!");
+ OSL_FAIL("OPropertyExport::implConvertAny: missing implementation for sal_Int64!");
break;
case TypeClass_ENUM:
{
@@ -632,7 +632,7 @@ namespace xmloff
// if any other types are added here, please remember to adjust implGetPropertyXMLType accordingly
// no more options ...
- OSL_ENSURE(sal_False, "OPropertyExport::implConvertAny: unsupported value type!");
+ OSL_FAIL("OPropertyExport::implConvertAny: unsupported value type!");
break;
}
// let the unit converter format is as string
@@ -708,8 +708,7 @@ namespace xmloff
// the property must exist
if (!m_xPropertyInfo->hasPropertyByName(_rPropertyName))
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("OPropertyExport::dbg_implCheckProperty: no property with the name ") +=
+ OSL_FAIL(::rtl::OString("OPropertyExport::dbg_implCheckProperty: no property with the name ") +=
::rtl::OString(_rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US) +=
::rtl::OString("!"));
return;
@@ -724,7 +723,7 @@ namespace xmloff
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OPropertyExport::dbg_implCheckProperty: caught an exception, could not check the property!");
+ OSL_FAIL("OPropertyExport::dbg_implCheckProperty: caught an exception, could not check the property!");
}
}
#endif // DBG_UTIL - dbg_implCheckProperty
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
index 723765c..e32a544 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
@@ -74,8 +74,7 @@ namespace xmloff
}
else
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is ")
+ OSL_FAIL(::rtl::OString("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is ")
+= ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString(")!"));
return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
@@ -136,7 +135,7 @@ namespace xmloff
implPushBackPropertyValue( aNewValue );
}
else
- OSL_ENSURE( sal_False, "OPropertyImport::handleAttribute: can't handle attributes which do not describe properties!" );
+ OSL_FAIL( "OPropertyImport::handleAttribute: can't handle attributes which do not describe properties!" );
}
//---------------------------------------------------------------------
@@ -200,7 +199,7 @@ namespace xmloff
break;
case TypeClass_HYPER:
{
- OSL_ENSURE(sal_False, "OPropertyImport::convertString: 64-bit integers not implemented yet!");
+ OSL_FAIL("OPropertyImport::convertString: 64-bit integers not implemented yet!");
}
break;
case TypeClass_DOUBLE:
@@ -279,11 +278,11 @@ namespace xmloff
}
}
else
- OSL_ENSURE(sal_False, "OPropertyImport::convertString: unsupported property type!");
+ OSL_FAIL("OPropertyImport::convertString: unsupported property type!");
}
break;
default:
- OSL_ENSURE(sal_False, "OPropertyImport::convertString: invalid type class!");
+ OSL_FAIL("OPropertyImport::convertString: invalid type class!");
}
return aReturn;
@@ -338,8 +337,7 @@ namespace xmloff
}
else
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("OPropertyElementsContext::CreateChildContext: unknown child element (\"")
+ OSL_FAIL(::rtl::OString("OPropertyElementsContext::CreateChildContext: unknown child element (\"")
+= ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString("\")!"));
return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName);
@@ -387,8 +385,7 @@ namespace xmloff
}
else
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("OSinglePropertyContext::CreateChildContext: unknown child element (\"")
+ OSL_FAIL(::rtl::OString("OSinglePropertyContext::CreateChildContext: unknown child element (\"")
+= ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString("\")!"));
return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName);
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
index 2bdb91f..e29fa23 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
@@ -598,7 +598,7 @@ vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter(
}
else
{
- OSL_ENSURE(sal_False, "here is no TypeProvider or the ImplId is wrong");
+ OSL_FAIL("here is no TypeProvider or the ImplId is wrong");
bDelInfo = sal_True;
}
}
diff --git a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
index 482bbce..6e7638f 100644
--- a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
@@ -249,12 +249,12 @@ sal_Bool bf_MigrateFilter::importImpl(const Sequence< ::com::sun::star::beans::P
}
catch(IOException& /*e*/)
{
- OSL_ENSURE(sal_False, "IO exception.");
+ OSL_FAIL("IO exception.");
bRetval = sal_False;
}
catch(IllegalArgumentException& /*e*/)
{
- OSL_ENSURE(sal_False, "uno url invalid");
+ OSL_FAIL("uno url invalid");
bRetval = sal_False;
}
}
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index 20ccf45..ddbb52d 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -485,11 +485,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt )
}
catch( const IllegalArgumentException & )
{
- OSL_ENSURE( sal_False, "IllegalArgumentException catched" );
+ OSL_FAIL( "IllegalArgumentException catched" );
}
catch( const NoSuchElementException & )
{
- OSL_ENSURE( sal_False, "NoSuchElementException catched" );
+ OSL_FAIL( "NoSuchElementException catched" );
}
}
}
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 8996fd3..bf01fb8 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 1767b40..41a769f 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 44986ac..9b8e90f 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 f53ca94..4fc372b 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 77eed3e..b7bb7a5 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 65c9184..c81de18 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 35ea8a4..4e695ea 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 3e92ede..0df8ea7 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 fabcefe..be95b96 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 2f50eec..35f749f 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 91297d1..a62f048 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 0e5a6da..7bec7a6 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 8304ab9..d2840eb 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 9ffeec1..5e92902 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 138b712..a9c54db 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 2940c87..6299c3d 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 d168677..210d5ef 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 6957914..a736bff 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;
More information about the Libreoffice-commits
mailing list