[Libreoffice-commits] .: 29 commits - basic/source connectivity/inc connectivity/source desktop/source drawinglayer/source editeng/source embeddedobj/source fpicker/source framework/source idl/source linguistic/source scripting/source sfx2/source sfx2/workben shell/source svx/source svx/workben ucb/source uui/source xmlhelp/source xmloff/source xmlscript/source xmlscript/test
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:50:36 PDT 2011
basic/source/app/app.cxx | 2
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/classes/sbxmod.cxx | 2
basic/source/runtime/runtime.cxx | 2
basic/source/uno/dlgcont.cxx | 8 -
basic/source/uno/namecont.cxx | 42 ++---
basic/source/uno/scriptcont.cxx | 10 -
connectivity/inc/connectivity/DateConversion.hxx | 20 +-
connectivity/source/commontools/DateConversion.cxx | 4
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2
connectivity/source/commontools/FValue.cxx | 14 -
connectivity/source/commontools/TSkipDeletedSet.cxx | 2
connectivity/source/commontools/TTableHelper.cxx | 4
connectivity/source/commontools/dbexception.cxx | 2
connectivity/source/commontools/dbtools.cxx | 8 -
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/cpool/ZPoolCollection.cxx | 2
connectivity/source/drivers/adabas/BDriver.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 4
connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 2
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 2
connectivity/source/drivers/ado/adoimp.cxx | 6
connectivity/source/drivers/dbase/DNoException.cxx | 12 -
connectivity/source/drivers/dbase/DTable.cxx | 4
connectivity/source/drivers/dbase/dindexnode.cxx | 12 -
connectivity/source/drivers/evoab/LDriver.cxx | 2
connectivity/source/drivers/evoab2/NServices.cxx | 2
connectivity/source/drivers/evoab2/NStatement.cxx | 4
connectivity/source/drivers/file/FConnection.cxx | 2
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2
connectivity/source/drivers/file/FDateFunctions.cxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 2
connectivity/source/drivers/file/FTable.cxx | 4
connectivity/source/drivers/file/fanalyzer.cxx | 2
connectivity/source/drivers/file/fcomp.cxx | 8 -
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 8 -
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 10 -
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 6
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 6
connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 2
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 2
connectivity/source/drivers/kab/KDriver.cxx | 2
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 2
connectivity/source/drivers/macab/MacabDriver.cxx | 2
connectivity/source/drivers/macab/MacabRecords.cxx | 2
connectivity/source/drivers/mozab/MColumnAlias.cxx | 2
connectivity/source/drivers/mozab/MConnection.cxx | 6
connectivity/source/drivers/mozab/MDriver.cxx | 2
connectivity/source/drivers/mozab/MResultSet.cxx | 6
connectivity/source/drivers/mozab/MResultSetMetaData.cxx | 2
connectivity/source/drivers/mozab/MStatement.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 12 -
connectivity/source/drivers/odbc/ORealDriver.cxx | 2
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 2
connectivity/source/drivers/odbcbase/OResultSet.cxx | 6
connectivity/source/drivers/odbcbase/OStatement.cxx | 8 -
connectivity/source/drivers/odbcbase/OTools.cxx | 2
connectivity/source/inc/ado/Aolewrap.hxx | 2
connectivity/source/parse/sqlbison.y | 4
connectivity/source/parse/sqlflex.l | 2
connectivity/source/parse/sqliterator.cxx | 6
connectivity/source/parse/sqlnode.cxx | 12 -
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VIndex.cxx | 2
connectivity/source/sdbcx/VUser.cxx | 2
desktop/source/app/app.cxx | 6
desktop/source/app/check_ext_deps.cxx | 4
desktop/source/deployment/dp_log.cxx | 4
desktop/source/deployment/dp_persmap.cxx | 4
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 8 -
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 2
desktop/source/deployment/manager/dp_extensionmanager.cxx | 4
desktop/source/deployment/manager/dp_informationprovider.cxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 6
desktop/source/deployment/manager/dp_managerfac.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 6
desktop/source/deployment/misc/dp_platform.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 10 -
desktop/source/deployment/registry/dp_backend.cxx | 2
desktop/source/deployment/registry/dp_registry.cxx | 2
desktop/source/deployment/registry/package/dp_package.cxx | 12 -
desktop/source/migration/services/autocorrmigration.cxx | 2
desktop/source/migration/services/basicmigration.cxx | 2
desktop/source/migration/services/jvmfwk.cxx | 5
desktop/source/migration/services/oo3extensionmigration.cxx | 2
desktop/source/migration/services/wordbookmigration.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 6
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4
editeng/source/outliner/outlobj.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 4
fpicker/source/office/commonpicker.cxx | 2
fpicker/source/win32/filepicker/FilePicker.cxx | 2
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 2
fpicker/source/win32/filepicker/customcontrolfactory.cxx | 2
fpicker/source/win32/filepicker/helppopupwindow.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/services/autorecovery.cxx | 2
idl/source/objects/object.cxx | 14 -
idl/source/prj/database.cxx | 2
linguistic/source/lngopt.cxx | 2
scripting/source/inc/util/MiscUtils.hxx | 4
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
scripting/source/provider/URIHelper.cxx | 6
scripting/source/stringresource/stringresource.cxx | 10 -
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appquit.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/appuno.cxx | 32 ++--
sfx2/source/appl/imestatuswindow.cxx | 8 -
sfx2/source/appl/opengrf.cxx | 6
sfx2/source/appl/shutdowniconaqua.mm | 6
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/control/dispatch.cxx | 22 +--
sfx2/source/control/objface.cxx | 8 -
sfx2/source/control/request.cxx | 6
sfx2/source/control/statcach.cxx | 2
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/mailmodelapi.cxx | 4
sfx2/source/dialog/splitwin.cxx | 26 +--
sfx2/source/dialog/taskpane.cxx | 2
sfx2/source/doc/DocumentMetadataAccess.cxx | 2
sfx2/source/doc/Metadatable.cxx | 22 +--
sfx2/source/doc/SfxDocumentMetaData.cxx | 4
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/doctemplates.cxx | 6
sfx2/source/doc/objxtor.cxx | 4
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/view/frame.cxx | 2
sfx2/source/view/frame2.cxx | 2
sfx2/source/view/userinputinterception.cxx | 2
sfx2/source/view/viewfrm.cxx | 6
sfx2/source/view/viewfrm2.cxx | 2
sfx2/workben/custompanel/ctp_factory.cxx | 2
shell/source/cmdmail/cmdmailsuppl.cxx | 2
shell/source/unix/sysshell/recently_used_file_handler.cxx | 6
shell/source/win32/simplemail/senddoc.cxx | 4
svx/source/accessibility/AccessibleTextHelper.cxx | 18 +-
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/fmcomp/gridcell.cxx | 16 +-
svx/source/fmcomp/trace.cxx | 8 -
svx/source/form/datanavi.cxx | 4
svx/source/form/filtnav.cxx | 2
svx/source/form/fmcontrollayout.cxx | 2
svx/source/form/fmdocumentclassification.cxx | 2
svx/source/form/fmpgeimp.cxx | 2
svx/source/form/fmshell.cxx | 21 --
svx/source/form/fmshimp.cxx | 6
svx/source/form/fmsrccfg.cxx | 4
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/fmtextcontrolshell.cxx | 24 +--
svx/source/form/fmvwimp.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/form/formcontrolling.cxx | 2
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 2
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 6
svx/source/sdr/overlay/overlayobject.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdoole2.cxx | 16 +-
svx/source/svdraw/svdopath.cxx | 2
svx/source/svdraw/svdpage.cxx | 2
svx/source/svdraw/svdpagv.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 4
svx/source/table/svdotable.cxx | 2
svx/source/table/tabledesign.cxx | 12 -
svx/source/table/tablehandles.cxx | 2
svx/source/table/tablelayouter.cxx | 4
svx/source/unodraw/unoshape.cxx | 6
svx/workben/msview/xmlconfig.cxx | 2
ucb/source/core/ucb.cxx | 28 +--
ucb/source/core/ucbcmds.cxx | 2
ucb/source/ucp/expand/ucpexpand.cxx | 4
ucb/source/ucp/ext/ucpext_content.cxx | 6
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 6
ucb/source/ucp/file/bc.cxx | 15 --
ucb/source/ucp/file/filinpstr.cxx | 4
ucb/source/ucp/file/filstr.cxx | 4
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 30 +---
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 3
ucb/source/ucp/odma/odma_content.cxx | 2
ucb/source/ucp/odma/odma_inputstream.cxx | 4
ucb/source/ucp/tdoc/tdoc_content.cxx | 72 +++++-----
ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 2
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 6
ucb/source/ucp/tdoc/tdoc_provider.cxx | 39 ++---
ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 8 -
ucb/source/ucp/tdoc/tdoc_storage.cxx | 23 +--
uui/source/iahndl.cxx | 13 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 8 -
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/chart/ColorPropertySet.cxx | 8 -
xmloff/source/chart/SchXMLChartContext.cxx | 4
xmloff/source/chart/SchXMLExport.cxx | 22 +--
xmloff/source/chart/SchXMLImport.cxx | 8 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 8 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 8 -
xmloff/source/chart/SchXMLSeriesHelper.cxx | 8 -
xmloff/source/chart/SchXMLTools.cxx | 10 -
xmloff/source/core/RDFaExportHelper.cxx | 2
xmloff/source/core/RDFaImportHelper.cxx | 8 -
xmloff/source/core/xmlerror.cxx | 2
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/forms/elementimport.cxx | 8 -
xmloff/source/forms/layerimport.cxx | 2
xmloff/source/forms/propertyimport.cxx | 6
xmloff/source/script/XMLEventExport.cxx | 4
xmloff/source/text/XMLIndexTOCContext.cxx | 2
xmloff/source/text/XMLSectionExport.cxx | 6
xmloff/source/text/XMLTextMarkImportContext.cxx | 6
xmloff/source/text/XMLTextNumRuleInfo.cxx | 2
xmloff/source/text/txtlists.cxx | 2
xmloff/source/transform/ChartPlotAreaOASISTContext.cxx | 2
xmloff/source/transform/ChartPlotAreaOOoTContext.cxx | 2
xmloff/source/transform/EventOOoTContext.cxx | 2
xmloff/source/transform/StyleOASISTContext.cxx | 4
xmloff/source/transform/StyleOOoTContext.cxx | 8 -
xmloff/source/xforms/xformsimport.cxx | 6
xmlscript/source/xmldlg_imexp/exp_share.hxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 6
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 48 +++---
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 2
xmlscript/test/imexp.cxx | 8 -
235 files changed, 682 insertions(+), 741 deletions(-)
New commits:
commit f6339b769ce8d115d14a0e1b5f56c34db57b67e0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 23:17:01 2011 +0100
Don't use GetBuffer on a char
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index a8ba2cc..ee76f88 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2697,7 +2697,7 @@ void SfxDispatcher::DebugOutput_Impl() const
{
SfxShell *pShell = GetShell(nShell-1);
const SfxInterface *pIFace = pShell->GetInterface();
- OSL_TRACE("%s", pIFace->GetClassName().GetBuffer());
+ OSL_TRACE("%s", pIFace->GetClassName());
}
DbgGetData()->nTraceOut = nOld;
commit 6a0290ee55ea8bf2fd20b9a2474a5b6b90c83219
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 14:30:57 2011 +0100
OSL_TRACE: Use format string for GetBuffer()
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 9980bb8..b9612aa 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -5402,7 +5402,7 @@ throw (RuntimeException)
aStr += ByteString::CreateFromInt32((long)this);
aStr += " - ";
aStr += ByteString::CreateFromInt32(nLockCount);
- OSL_TRACE( aStr.GetBuffer() );
+ OSL_TRACE( "%s", aStr.GetBuffer() );
#endif
Any a( nLockCount );
@@ -5424,7 +5424,7 @@ throw (RuntimeException)
aStr += ByteString::CreateFromInt32((long)this);
aStr += " - ";
aStr += ByteString::CreateFromInt32(nLockCount);
- OSL_TRACE( aStr.GetBuffer() );
+ OSL_TRACE( "%s", aStr.GetBuffer() );
#endif
// conform to documentation: unlock with lock count == 0 means force a layout
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 52c1845..748e487 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -155,7 +155,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
{
ByteString aTmp( "SfxEvent: ");
aTmp += ByteString( String( aHint.GetEventName() ), RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( aTmp.GetBuffer() );
+ OSL_TRACE( "%s", aTmp.GetBuffer() );
}
#endif
SFX_APP()->Broadcast( aHint );
@@ -1007,7 +1007,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
{
ByteString aTmp( "SfxEvent: ");
aTmp += ByteString( String( rEventHint.GetEventName() ), RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( aTmp.GetBuffer() );
+ OSL_TRACE( "%s", aTmp.GetBuffer() );
}
#endif
Broadcast(rEventHint);
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index db68b1a..80e5a41 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2858,7 +2858,7 @@ void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
#ifdef DBG_UTIL
ByteString aTmp( "SfxEvent: ");
aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( aTmp.GetBuffer() );
+ OSL_TRACE( "%s", aTmp.GetBuffer() );
#endif
document::EventObject aEvent( (frame::XModel *)this, aName );
::cppu::OInterfaceContainerHelper aIC( m_aMutex );
commit 4363d620076d3624d96bdde5ad72d88065858071
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 14:27:45 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 7c0cb01..b1b11d7 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -594,7 +594,7 @@ namespace basic
// a BasicManager which is still in our repository is being deleted.
// That's bad, since by definition, we *own* all instances in our
// repository.
- OSL_ENSURE( false, "ImplRepository::Notify: nobody should tamper with the managers, except ourself!" );
+ OSL_FAIL( "ImplRepository::Notify: nobody should tamper with the managers, except ourself!" );
m_aStore.erase( loop );
break;
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 654fa2e..f7f5f3b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -178,7 +178,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV
}
catch( Exception& )
{
- OSL_ENSURE( false, "DocObjectWrapper::DocObjectWrapper: Caught exception!" );
+ OSL_FAIL( "DocObjectWrapper::DocObjectWrapper: Caught exception!" );
}
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ce029e7..6a62df7 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -884,7 +884,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
aMessage.append( ::rtl::OUStringToOString( rLib.aName, osl_getThreadTextEncoding() ) );
aMessage.append( "'.\n\nException:" );
aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
}
}
@@ -1379,7 +1379,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
aMessage.append( "invalid library element '" );
aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) );
aMessage.append( "'." );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
continue;
}
@@ -1468,7 +1468,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
aMessage.append( "invalid library element '" );
aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) );
aMessage.append( "'." );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
continue;
}
@@ -1893,7 +1893,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
aMessage.append( ::rtl::OUStringToOString( rLib.aName, osl_getThreadTextEncoding() ) );
aMessage.append( "'.\n\nException:" );
aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
return;
}
@@ -2314,7 +2314,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
aMessage.append( ::rtl::OUStringToOString( Name, osl_getThreadTextEncoding() ) );
aMessage.append( "'.\n\nException:" );
aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
return;
}
@@ -2364,7 +2364,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
aMessage.append( "couln't open library element stream - attempted to open library '" );
aMessage.append( ::rtl::OUStringToOString( Name, osl_getThreadTextEncoding() ) );
aMessage.append( "'." );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
return;
}
@@ -3188,7 +3188,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia
break;
}
case END_REACHED:
- OSL_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" );
+ OSL_FAIL( "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" );
break;
}
}
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index ab69955..db0e66b 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -691,7 +691,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
aMessage.append( "invalid library element '" );
aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) );
aMessage.append( "'." );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
continue;
}
@@ -777,7 +777,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
aMessage.append( "invalid library element '" );
aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) );
aMessage.append( "'." );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
continue;
}
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 901aa27..521bec0 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -424,7 +424,7 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
}
catch (const Exception& )
{
- OSL_ENSURE(false, "DBTypeConversion::getValue: caught an exception while asking for the format key!");
+ OSL_FAIL("DBTypeConversion::getValue: caught an exception while asking for the format key!");
}
if (!nKey)
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 512a9cc..85a8a7b 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2157,7 +2157,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const
setTypeKind(DataType::OTHER);
break;
default:
- OSL_ENSURE( false, "ORowSetValue::fill: unsupported type!" );
+ OSL_FAIL( "ORowSetValue::fill: unsupported type!" );
(*this) = _rValueSource.getObject();
break;
}
@@ -2275,7 +2275,7 @@ void ORowSetValue::fill(const Any& _rValue)
if ( _rValue >>= aDummy )
(*this) = aDummy;
else
- OSL_ENSURE( false, "ORowSetValue::fill: unsupported sequence type!" );
+ OSL_FAIL( "ORowSetValue::fill: unsupported sequence type!" );
break;
}
@@ -2297,7 +2297,7 @@ void ORowSetValue::fill(const Any& _rValue)
(*this) = aDateTime;
}
else
- OSL_ENSURE( false, "ORowSetValue::fill: unsupported structure!" );
+ OSL_FAIL( "ORowSetValue::fill: unsupported structure!" );
break;
}
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index f678066..ecf97d4 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -245,7 +245,7 @@ namespace
// if that's not the case, normalize it
if ( bGaps || bDuplicates )
{
- OSL_ENSURE( false, "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" );
+ OSL_FAIL( "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" );
OrdinalPosition nNormalizedPosition = 1;
for ( ::std::vector< ColumnDesc >::iterator normalize = _rColumns.begin();
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index b48aa40..8239f81 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -239,7 +239,7 @@ void SQLExceptionInfo::append( TYPE _eType, const ::rtl::OUString& _rErrorMessag
case SQL_WARNING: aAppend <<= SQLWarning(); break;
case SQL_CONTEXT: aAppend <<= SQLContext(); break;
default:
- OSL_ENSURE( false, "SQLExceptionInfo::append: invalid exception type: this will crash!" );
+ OSL_FAIL( "SQLExceptionInfo::append: invalid exception type: this will crash!" );
break;
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 0abc83b..a73508a 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1438,7 +1438,7 @@ namespace
_xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName;
}
else
- OSL_ENSURE( false, "::dbtools::lcl_getTableNameComponents: this is no table object!" );
+ OSL_FAIL( "::dbtools::lcl_getTableNameComponents: this is no table object!" );
}
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 260ecbe..aa7ca8f 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -469,7 +469,7 @@ namespace
}
catch(SQLException&)
{
- OSL_ENSURE( false, "lcl_createSDBCXColumn: caught an exception!" );
+ OSL_FAIL( "lcl_createSDBCXColumn: caught an exception!" );
}
}
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 19fd82b..e6ac9c9 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -535,7 +535,7 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum)
eNum = adKeyUnique;
break;
default:
- OSL_ENSURE( false, "OAdoKey::Map2KeyRule: invalid key type!" );
+ OSL_FAIL( "OAdoKey::Map2KeyRule: invalid key type!" );
}
return eNum;
}
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index d13fff4..bcd8f11 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -263,7 +263,7 @@ sal_Int32 ADOS::mapAdoType2Object(ObjectTypeEnum objType)
nType = PrivilegeObject::COLUMN;
break;
default:
- OSL_ENSURE( false, "ADOS::mapAdoType2Object: privilege type cannot be translated!" );
+ OSL_FAIL( "ADOS::mapAdoType2Object: privilege type cannot be translated!" );
break;
}
return nType;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 0d02a6c..3b73e8a 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -600,7 +600,7 @@ BOOL ODbaseTable::ReadMemoHeader()
(*m_pMemoStream) >> m_aMemoHeader.db_size;
break;
default:
- OSL_ENSURE( false, "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
+ OSL_FAIL( "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
break;
}
return TRUE;
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 88f0731..23d11e4 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -233,7 +233,7 @@ sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url )
if ( nFileErr != osl_File_E_None )
{
::rtl::OUString sErr = translateFileErrorMessage( nFileErr);
- OSL_ENSURE(false, ::rtl::OUStringToOString( sErr, RTL_TEXTENCODING_ASCII_US ).getStr());
+ OSL_FAIL(::rtl::OUStringToOString( sErr, RTL_TEXTENCODING_ASCII_US ).getStr());
}
::rtl::OUString aVersionInfo;
if ( nFileErr == osl_File_E_None && nBytesRead > 0 && nBytesRead <= 256)
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index a73a241..30cec21 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -477,10 +477,10 @@ rtl::OUString OCommonStatement::getTableName()
OSQLParseNode::getTableComponents( pNodeForTableName, aCatalog, aSchema, aTableName,NULL);
}
else
- OSL_ENSURE( false, "odd table layout" );
+ OSL_FAIL( "odd table layout" );
}
else
- OSL_ENSURE( false, "unusual table layout" );
+ OSL_FAIL( "unusual table layout" );
}
return aTableName;
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 0eec667..410b74b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1607,7 +1607,7 @@ BOOL OResultSet::OpenImpl()
m_nRowCountResult = 1;
break;
default:
- OSL_ENSURE( false, "OResultSet::OpenImpl: unsupported statement type!" );
+ OSL_FAIL( "OResultSet::OpenImpl: unsupported statement type!" );
break;
}
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index bf4bb88..53495b2 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -226,13 +226,13 @@ BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,
void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& /*descriptor*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileTable::addColumn" );
- OSL_ENSURE( false, "OFileTable::addColumn: not implemented!" );
+ OSL_FAIL( "OFileTable::addColumn: not implemented!" );
}
// -----------------------------------------------------------------------------
void OFileTable::dropColumn(sal_Int32 /*_nPos*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileTable::dropColumn" );
- OSL_ENSURE( false, "OFileTable::addColumn: not implemented!" );
+ OSL_FAIL( "OFileTable::addColumn: not implemented!" );
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index d0a235c..99658e4 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -274,7 +274,7 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th
else if (pPrec->getNodeType() == SQL_NODE_GREAT)
ePredicateType = SQLFilterOperator::GREATER;
else
- OSL_ENSURE( false, "OPredicateCompiler::execute_COMPARE: unexpected node type!" );
+ OSL_FAIL( "OPredicateCompiler::execute_COMPARE: unexpected node type!" );
execute(pPredicateNode->getChild(0));
execute(pPredicateNode->getChild(2));
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 753faa9..99cfca9 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -638,7 +638,7 @@ namespace connectivity
}
catch(Exception&)
{
- OSL_ENSURE( false, "ODriverDelegator::preCommit: caught an exception!" );
+ OSL_FAIL( "ODriverDelegator::preCommit: caught an exception!" );
}
}
}
@@ -789,7 +789,7 @@ namespace connectivity
// second round, this time without matching the country
return lcl_getCollationForLocale( _rLocaleString, true );
- OSL_ENSURE( false, "lcl_getCollationForLocale: unknown locale string, falling back to Latin1_General!" );
+ OSL_FAIL( "lcl_getCollationForLocale: unknown locale string, falling back to Latin1_General!" );
return "Latin1_General";
}
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 3f917f5..ce69f2e 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -92,7 +92,7 @@ SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStor
}
catch(Exception&)
{
- OSL_ENSURE( false, "NativeStorageAccess::close: caught an exception while flushing!" );
+ OSL_FAIL( "NativeStorageAccess::close: caught an exception while flushing!" );
}
#ifdef HSQLDB_DBG
{
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index e39f60b..b6ab3e0 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -313,7 +313,7 @@ namespace connectivity
if ( _nMode < 16 )
sMessage += "0";
sMessage += ::rtl::OString::valueOf( _nMode, 16 ).toAsciiUpperCase();
- OSL_ENSURE( false, sMessage.getStr() );
+ OSL_FAIL( sMessage.getStr() );
#endif
StorageContainer::throwJavaException(e,env);
}
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 36ec342..17b7fd8 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -213,7 +213,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb
}
catch(Exception&)
{
- OSL_ENSURE( false, "StorageNativeOutputStream::sync: could not flush output stream!" );
+ OSL_FAIL( "StorageNativeOutputStream::sync: could not flush output stream!" );
}
}
}
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index e05cea5..549d8aa 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -106,7 +106,7 @@ namespace
if ( !_rFunction )
{ // did not find the symbol
- OSL_ENSURE( false, ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
+ OSL_FAIL( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
osl_unloadModule( _rModule );
_rModule = NULL;
}
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 3e19b56..3751b24 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -84,7 +84,7 @@ namespace
if ( !_rFunction )
{ // did not find the symbol
- OSL_ENSURE( false, ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
+ OSL_FAIL( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
osl_unloadModule( _rModule );
_rModule = NULL;
}
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index ec82ba5..a92e231 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -448,7 +448,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
else
{
// Couldn't find a required property...
- OSL_ENSURE(false, ::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") +
+ OSL_FAIL(::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") +
::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US));
}
}
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 72a35ef..7cbd66a 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -174,7 +174,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias );
if ( pos == m_aAliasMap.end() )
{
- OSL_ENSURE( false, "OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias: no programmatic name for this alias!" );
+ OSL_FAIL( "OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias: no programmatic name for this alias!" );
return ::rtl::OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 );
}
return pos->second.programmaticAsciiName;
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index c91bb01..f7bb24e 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -573,11 +573,11 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
"$1$", sParameter
) );
::dbtools::throwGenericSQLException( sError, _rxContext );
- OSL_ENSURE( false, "OConnection::throwSQLException: unreachable (1)!" );
+ OSL_FAIL( "OConnection::throwSQLException: unreachable (1)!" );
}
throwGenericSQLException( _rError.getResId(), _rxContext );
- OSL_ENSURE( false, "OConnection::throwSQLException: unreachable (2)!" );
+ OSL_FAIL( "OConnection::throwSQLException: unreachable (2)!" );
}
if ( _rError.getErrorCondition() != 0 )
@@ -588,7 +588,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter );
else
aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext);
- OSL_ENSURE( false, "OConnection::throwSQLException: unreachable (3)!" );
+ OSL_FAIL( "OConnection::throwSQLException: unreachable (3)!" );
}
throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext );
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 6ca30da..21fb90d 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -283,7 +283,7 @@ namespace
if ( !_rFunction )
{ // did not find the symbol
- OSL_ENSURE( false, ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
+ OSL_FAIL( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
osl_unloadModule( _rModule );
_rModule = NULL;
}
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 9c0da3a..18a1bf6 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -172,7 +172,7 @@ void OResultSet::methodEntry()
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
if ( !m_pTable )
{
- OSL_ENSURE( false, "OResultSet::methodEntry: looks like we're disposed, but how is this possible?" );
+ OSL_FAIL( "OResultSet::methodEntry: looks like we're disposed, but how is this possible?" );
throw DisposedException( ::rtl::OUString(), *this );
}
}
@@ -642,7 +642,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
const Any& /*rValue*/ )
throw (::com::sun::star::lang::IllegalArgumentException)
{
- OSL_ENSURE( false, "OResultSet::convertFastPropertyValue: not implemented!" );
+ OSL_FAIL( "OResultSet::convertFastPropertyValue: not implemented!" );
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
@@ -663,7 +663,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
)
throw (Exception)
{
- OSL_ENSURE( false, "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" );
+ OSL_FAIL( "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" );
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index 170cf18..3ca9036 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
@@ -175,7 +175,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL
if ( !m_pTable || !m_pTable->getConnection() )
{
- OSL_ENSURE( false, "OResultSetMetaData::isSearchable: suspicious: called without table or connection!" );
+ OSL_FAIL( "OResultSetMetaData::isSearchable: suspicious: called without table or connection!" );
return sal_False;
}
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index e00ab8d..d0428c7 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -255,7 +255,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin
}
getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
- OSL_ENSURE( false, "OCommonStatement::parseSql: unreachable!" );
+ OSL_FAIL( "OCommonStatement::parseSql: unreachable!" );
return eSelect;
}
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 772390a..02f580a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -188,7 +188,7 @@ namespace connectivity { namespace mozab {
// -------------------------------------------------------------------
NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)
{
- OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );
+ OSL_FAIL( "MLdapAttributeMap::GetAttributes: not implemented!" );
(void)aProperty;
(void)aCount;
(void)aAttrs;
@@ -220,7 +220,7 @@ namespace connectivity { namespace mozab {
// -------------------------------------------------------------------
NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)
{
- OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );
+ OSL_FAIL( "MLdapAttributeMap::SetAttributeList: not implemented!" );
(void)aProperty;
(void)aAttributeList;
(void)allowInconsistencies;
@@ -230,7 +230,7 @@ namespace connectivity { namespace mozab {
// -------------------------------------------------------------------
NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)
{
- OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );
+ OSL_FAIL( "MLdapAttributeMap::GetProperty: not implemented!" );
(void)aAttribute;
(void)_retval;
return NS_ERROR_NOT_IMPLEMENTED;
@@ -266,7 +266,7 @@ namespace connectivity { namespace mozab {
// -------------------------------------------------------------------
NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)
{
- OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );
+ OSL_FAIL( "MLdapAttributeMap::SetFromPrefs: not implemented!" );
(void)aPrefBranchName;
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -396,7 +396,7 @@ namespace connectivity { namespace mozab {
_card.SetPreferMailFormat(format);
}
else
- OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
+ OSL_FAIL( "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
}
}
}
@@ -439,7 +439,7 @@ namespace connectivity { namespace mozab {
}
}
else
- OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
+ OSL_FAIL( "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
}
_result.insert( prop->first, resultValue );
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 14a77fe..ec2bd0d 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -839,7 +839,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0)
nSet = SQL_SENSITIVE;
break;
default:
- OSL_ENSURE( false, "OStatement_Base::setResultSetType: invalid result set type!" );
+ OSL_FAIL( "OStatement_Base::setResultSetType: invalid result set type!" );
break;
}
@@ -1048,7 +1048,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
setEscapeProcessing( ::comphelper::getBOOL( rValue ) );
break;
default:
- OSL_ENSURE( false, "OStatement_Base::setFastPropertyValue_NoBroadcast: what property?" );
+ OSL_FAIL( "OStatement_Base::setFastPropertyValue_NoBroadcast: what property?" );
break;
}
}
@@ -1093,7 +1093,7 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
rValue <<= getEscapeProcessing();
break;
default:
- OSL_ENSURE( false, "OStatement_Base::getFastPropertyValue: what property?" );
+ OSL_FAIL( "OStatement_Base::getFastPropertyValue: what property?" );
break;
}
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index a44fb41..cdf0d38 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -376,7 +376,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString&
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen at sun.com", "OSQLParseTreeIterator::impl_locateRecordSource" );
if ( !_rComposedName.getLength() )
{
- OSL_ENSURE( false, "OSQLParseTreeIterator::impl_locateRecordSource: no object name at all?" );
+ OSL_FAIL( "OSQLParseTreeIterator::impl_locateRecordSource: no object name at all?" );
return OSQLTable();
}
@@ -605,7 +605,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables,
}
else
{
- OSL_ENSURE( false, "OSQLParseTreeIterator::getTableNode: subquery which is no select_statement: not yet implemented!" );
+ OSL_FAIL( "OSQLParseTreeIterator::getTableNode: subquery which is no select_statement: not yet implemented!" );
}
}
}
@@ -614,7 +614,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables,
pTableNameNode = pTableRef->getChild(0);
}
else
- OSL_ENSURE( false, "OSQLParseTreeIterator::getTableNode: unhandled case!" );
+ OSL_FAIL( "OSQLParseTreeIterator::getTableNode: unhandled case!" );
}
return pTableNameNode;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c85073a..0c13673 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -314,7 +314,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString,
}
catch( const SQLException& )
{
- OSL_ENSURE( false, "OSQLParseNode::parseNodeToStr: this should not throw!" );
+ OSL_FAIL( "OSQLParseNode::parseNodeToStr: this should not throw!" );
// our callers don't expect this method to throw anything. The only known situation
// where impl_parseNodeToString_throw can throw is when there is a cyclic reference
// in the sub queries, but this cannot be the case here, as we do not parse to
@@ -702,7 +702,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
}
catch ( Exception& )
{
- OSL_ENSURE( false, "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occurred!" );
+ OSL_FAIL( "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occurred!" );
}
if ( !m_aChildren[0]->isLeaf() )
{
@@ -1980,7 +1980,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")),SQL_NODE_EQUAL,SQL_EQUAL);
break;
default:
- OSL_ENSURE( false, "OSQLParseNode::negateSearchCondition: unexpected node type!" );
+ OSL_FAIL( "OSQLParseNode::negateSearchCondition: unexpected node type!" );
break;
}
pSearchCondition->replace(pComparison, pNewComparison);
@@ -2369,7 +2369,7 @@ void OSQLParseNode::showParseTree( ::rtl::OUStringBuffer& _inout_rBuffer, sal_uI
default:
OSL_TRACE( "-- %i", int( m_eNodeType ) );
- OSL_ENSURE( false, "OSQLParser::ShowParseTree: unzulaessiger NodeType" );
+ OSL_FAIL( "OSQLParser::ShowParseTree: unzulaessiger NodeType" );
}
}
}
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index ac91069..18e3b78 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -177,7 +177,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumn
}
catch( const Exception& )
{
- OSL_ENSURE( false, "OIndex::getColumns: caught an exception!" );
+ OSL_FAIL( "OIndex::getColumns: caught an exception!" );
}
return const_cast<OIndex*>(this)->m_pColumns;
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 318bf33..0724d36 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -176,7 +176,7 @@ void SAL_CALL OUser::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_I
// -----------------------------------------------------------------------------
void SAL_CALL OUser::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
{
- OSL_ENSURE( false, "OUser::setName: not implemented!" );
+ OSL_FAIL( "OUser::setName: not implemented!" );
// not allowed to throw an SQLException here ...
}
// -----------------------------------------------------------------------------
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 4b12969..e64a907 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -246,7 +246,7 @@ namespace migration
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
- OSL_ENSURE( false, "AutocorrectionMigration::initialize: argument UserData has wrong type!" );
+ OSL_FAIL( "AutocorrectionMigration::initialize: argument UserData has wrong type!" );
}
m_sSourceDir += sSourceSubDir;
break;
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index fa3fa81..cdb5a15 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -235,7 +235,7 @@ namespace migration
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
- OSL_ENSURE( false, "BasicMigration::initialize: argument UserData has wrong type!" );
+ OSL_FAIL( "BasicMigration::initialize: argument UserData has wrong type!" );
}
m_sSourceDir += sSourceUserBasic;
break;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 2ea7efb..c2a3b14 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -301,8 +301,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
{
if ( !(aValue.Value >>= m_sUserDir) )
{
- OSL_ENSURE(
- false,
+ OSL_FAIL(
"[Service implementation " IMPL_NAME
"] XInitialization::initialize: Argument UserData has wrong type.");
}
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index bf61dbb..4ac375c 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -419,7 +419,7 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
- OSL_ENSURE( false, "ExtensionMigration::initialize: argument UserData has wrong type!" );
+ OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" );
}
}
else if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExtensionBlackList" ) ) )
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 4900c02..af49798 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -283,7 +283,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
- OSL_ENSURE( false, "WordbookMigration::initialize: argument UserData has wrong type!" );
+ OSL_FAIL( "WordbookMigration::initialize: argument UserData has wrong type!" );
}
m_sSourceDir += sSourceSubDir;
break;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index ffb90a5..2178d0a 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2115,7 +2115,7 @@ namespace
case META_TEXTRECT_ACTION :
{
/** CHECKED, WORKS WELL */
- // OSL_ENSURE(false, "META_TEXTRECT_ACTION requested (!)");
+ // OSL_FAIL("META_TEXTRECT_ACTION requested (!)");
const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction;
const Rectangle& rRectangle = pA->GetRect();
const sal_uInt32 nStringLength(pA->GetText().Len());
@@ -2729,7 +2729,7 @@ namespace
}
default :
{
- OSL_ENSURE(false, "interpretMetafile: META_MAPMODE_ACTION with unsupported MapUnit (!)");
+ OSL_FAIL("interpretMetafile: META_MAPMODE_ACTION with unsupported MapUnit (!)");
break;
}
}
@@ -3147,7 +3147,7 @@ namespace
}
default:
{
- OSL_ENSURE(false, "Unknown MetaFile Action (!)");
+ OSL_FAIL("Unknown MetaFile Action (!)");
break;
}
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index cf6abfe..7369238 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -850,7 +850,7 @@ namespace drawinglayer
}
catch(const uno::Exception&)
{
- OSL_ENSURE(false, "VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!");
+ OSL_FAIL("VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!");
}
}
@@ -927,7 +927,7 @@ namespace drawinglayer
}
catch( const uno::Exception& )
{
- OSL_ENSURE(false, "VclMetafileProcessor2D: Printing of Control failed, caught an exception!");
+ OSL_FAIL("VclMetafileProcessor2D: Printing of Control failed, caught an exception!");
}
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index d07cae6..59b7112 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1963,7 +1963,7 @@ namespace accessibility
PropertyState eState = aPropSet._getPropertyState( pProperties->Name, mnParagraphIndex );
if ( eState == PropertyState_AMBIGUOUS_VALUE )
{
- OSL_ENSURE( false, "ambiguous property value encountered" );
+ OSL_FAIL( "ambiguous property value encountered" );
}
//if (eState == PropertyState_DIRECT_VALUE)
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 2412dd2..633fd33 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -225,7 +225,7 @@ const ParagraphData& OutlinerParaObject::GetParagraphData(sal_uInt32 nIndex) con
}
else
{
- OSL_ENSURE(false, "OutlinerParaObject::GetParagraphData: Access out of range (!)");
+ OSL_FAIL("OutlinerParaObject::GetParagraphData: Access out of range (!)");
static ParagraphData aEmptyParagraphData;
return aEmptyParagraphData;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index eedf482..4d5db77 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -327,7 +327,7 @@ void OCommonEmbeddedObject::EmbedAndReparentDoc_Impl( const uno::Reference< util
}
catch( const lang::NoSupportException & )
{
- OSL_ENSURE( false, "OCommonEmbeddedObject::EmbedAndReparentDoc: cannot set parent at document!" );
+ OSL_FAIL( "OCommonEmbeddedObject::EmbedAndReparentDoc: cannot set parent at document!" );
}
}
@@ -1061,7 +1061,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_pDocHolder->SetOutplaceFrameProperties( aOutFrameProps );
}
else
- OSL_ENSURE( false, "OCommonEmbeddedObject::setPersistentEntry: illegal type for argument 'OutplaceFrameProperties'!" );
+ OSL_FAIL( "OCommonEmbeddedObject::setPersistentEntry: illegal type for argument 'OutplaceFrameProperties'!" );
}
else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModuleName" ) ) )
{
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 04b5e73..6f2bcfc 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -238,7 +238,7 @@ rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
}
catch(uno::RuntimeException&)
{
- OSL_ENSURE( false, "RuntimeException during event dispatching" );
+ OSL_FAIL( "RuntimeException during event dispatching" );
}
}
}
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 3f1f6eb..31ce79c 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -180,7 +180,7 @@ void SAL_CALL CAsyncEventNotifier::shutdown()
// we are waiting infinite, so error will
// be better detected in form of deadlocks
if (WaitForSingleObject(m_hThread, INFINITE) == WAIT_FAILED) {
- OSL_ENSURE(false, "Waiting for thread termination failed!");
+ OSL_FAIL("Waiting for thread termination failed!");
}
// lock mutex again to reset m_hThread
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index 5332fe4..36f2a37 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -50,7 +50,7 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle,
TCHAR aClsName[256];
ZeroMemory(aClsName,sizeof(aClsName));
if (GetClassName(aControlHandle,aClsName,sizeof(aClsName)) == 0) {
- OSL_ENSURE(false,"Invalid window handle");
+ OSL_FAIL("Invalid window handle");
}
if (0 == _tcsicmp(aClsName,TEXT("button")))
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 42c1ec1..33b26a0 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -608,7 +608,7 @@ void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( )
if ( !UnregisterClass(
(LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) )
{
- OSL_ENSURE( false, "unregister window class failed" );
+ OSL_FAIL( "unregister window class failed" );
}
s_ClassAtom = 0;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 142b2d4..929c46a 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1708,7 +1708,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
(!aNew.FactoryURL.getLength())
)
{
- OSL_ENSURE( false, "AutoRecovery::implts_registerDocument: this should not happen anymore!" );
+ OSL_FAIL( "AutoRecovery::implts_registerDocument: this should not happen anymore!" );
// nowadays, the Basic IDE should already die on the "supports XDocumentRecovery" check. And no other known
// document type fits in here ...
return;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index f623052..42037ca 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -304,7 +304,7 @@ OUString LinguOptions::GetName( INT32 nWID )
if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID)
aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName);
else
- OSL_ENSURE(false, "lng : unknown WID");
+ OSL_FAIL("lng : unknown WID");
return aRes;
}
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index ddedb48..3ddf351 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -115,11 +115,11 @@ public:
}
catch ( css::lang::IllegalArgumentException const & )
{
- OSL_ENSURE( false, "Invalid document model!" );
+ OSL_FAIL( "Invalid document model!" );
}
}
- OSL_ENSURE( false, "Unable to obtain URL for document model!" );
+ OSL_FAIL( "Unable to obtain URL for document model!" );
return rtl::OUString();
}
static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const ::rtl::OUString& url )
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 198a71a..860d4e9 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -418,7 +418,7 @@ public:
}
catch( uno::Exception& )
{
- OSL_ENSURE( false, "DefaultBrowseNode::DefaultBrowseNode: Caught exception!" );
+ OSL_FAIL( "DefaultBrowseNode::DefaultBrowseNode: Caught exception!" );
}
OSL_ENSURE( m_xAggProxy.is(),
"DefaultBrowseNode::DefaultBrowseNode: Wrapped BrowseNode cannot be aggregated!" );
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 0d3a6a9..5b90bb8 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -78,8 +78,7 @@ ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper(
}
catch (uno::Exception&)
{
- OSL_ENSURE(false,
- "Scripting Framework error initialising XSimpleFileAccess");
+ OSL_FAIL("Scripting Framework error initialising XSimpleFileAccess");
}
try
@@ -92,8 +91,7 @@ ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper(
}
catch (uno::Exception&)
{
- OSL_ENSURE(false,
- "Scripting Framework error initialising XUriReferenceFactory");
+ OSL_FAIL("Scripting Framework error initialising XUriReferenceFactory");
}
}
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index df355d5..dcfabe5 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1558,7 +1558,7 @@ Reference< io::XInputStream > BinaryInput::getInputStreamForSection( sal_Int32 n
}
}
else
- OSL_ENSURE( false, "BinaryInput::getInputStreamForSection(): Read past end" );
+ OSL_FAIL( "BinaryInput::getInputStreamForSection(): Read past end" );
return xIn;
}
@@ -1568,7 +1568,7 @@ void BinaryInput::seek( sal_Int32 nPos )
if( nPos <= m_nSize )
m_nCurPos = nPos;
else
- OSL_ENSURE( false, "BinaryInput::seek(): Position past end" );
+ OSL_FAIL( "BinaryInput::seek(): Position past end" );
}
@@ -1581,7 +1581,7 @@ sal_Int16 BinaryInput::readInt16( void )
nRet += 256 * sal_Int16( sal_uInt8( m_pData[m_nCurPos++] ) );
}
else
- OSL_ENSURE( false, "BinaryInput::readInt16(): Read past end" );
+ OSL_FAIL( "BinaryInput::readInt16(): Read past end" );
return nRet;
}
@@ -1599,7 +1599,7 @@ sal_Int32 BinaryInput::readInt32( void )
}
}
else
- OSL_ENSURE( false, "BinaryInput::readInt32(): Read past end" );
+ OSL_FAIL( "BinaryInput::readInt32(): Read past end" );
return nRet;
}
@@ -1613,7 +1613,7 @@ sal_Unicode BinaryInput::readUnicodeChar( void )
nRet += 256 * sal_uInt8( m_pData[m_nCurPos++] );
}
else
- OSL_ENSURE( false, "BinaryInput::readUnicodeChar(): Read past end" );
+ OSL_FAIL( "BinaryInput::readUnicodeChar(): Read past end" );
sal_Unicode cRet = nRet;
return cRet;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 40c7c92..0d6063f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1392,13 +1392,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sFrame));
if ( pItem->ISA( SfxUsrAnyItem ) )
{
- OSL_ENSURE( false, "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
+ OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
pValue[nActProp++].Value = static_cast< const SfxUsrAnyItem* >( pItem )->GetValue();
}
else if ( pItem->ISA( SfxUnoFrameItem ) )
pValue[nActProp++].Value <<= static_cast< const SfxUnoFrameItem* >( pItem )->GetFrame();
else
- OSL_ENSURE( false, "TransformItems: invalid item type for SID_FILLFRAME!" );
+ OSL_FAIL( "TransformItems: invalid item type for SID_FILLFRAME!" );
}
if ( rSet.GetItemState( SID_TEMPLATE, sal_False, &pItem ) == SFX_ITEM_SET )
{
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index a9993b0..6cfafda 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -78,7 +78,7 @@ void ImeStatusWindow::init()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
// Degrade gracefully and use the VCL-supplied default if no
// configuration is available.
}
@@ -96,7 +96,7 @@ bool ImeStatusWindow::isShowing()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
// Degrade gracefully and use the VCL-supplied default if no
// configuration is available.
}
@@ -122,7 +122,7 @@ void ImeStatusWindow::show(bool bShow)
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
}
}
@@ -143,7 +143,7 @@ ImeStatusWindow::~ImeStatusWindow()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.RuntimeException");
+ OSL_FAIL("com.sun.star.uno.RuntimeException");
}
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d1de5e0..50f168c 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -1119,7 +1119,7 @@ namespace sfx2
// ---------------------------------------------------------------------------------------------------------------------
void TaskPaneController_Impl::Dying()
{
- OSL_ENSURE( false, "TaskPaneController_Impl::Dying: unexpected call!" );
+ OSL_FAIL( "TaskPaneController_Impl::Dying: unexpected call!" );
// We are expected to live longer than the ToolPanelDeck we work with. Since we remove ourself, in our dtor,
// as listener from the panel deck, this method here should never be called.
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 70083e6..d668185 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -1341,7 +1341,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
try {
xBaseURI = createBaseURI(m_pImpl->m_xContext, xStorage, URL);
} catch (uno::Exception &) {
- OSL_ENSURE(false, "cannot create base URI");
+ OSL_FAIL("cannot create base URI");
}
}
uno::Reference<task::XInteractionHandler> xIH;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 58f3d6a..a2a85ec 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -285,7 +285,7 @@ public:
virtual bool IsInContent() const { return m_isInContent; }
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > MakeUnoObject()
- { OSL_ENSURE(false, "MetadatableUndo::MakeUnoObject"); throw; }
+ { OSL_FAIL("MetadatableUndo::MakeUnoObject"); throw; }
};
// MetadatableClipboard ----------------------------------------------
@@ -310,7 +310,7 @@ public:
virtual bool IsInContent() const { return m_isInContent; }
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > MakeUnoObject()
- { OSL_ENSURE(false, "MetadatableClipboard::MakeUnoObject"); throw; }
+ { OSL_FAIL("MetadatableClipboard::MakeUnoObject"); throw; }
void OriginNoLongerInBusinessAnymore() { m_pReg = 0; }
};
@@ -777,7 +777,7 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
::rtl::OUString idref;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref))
{
- OSL_ENSURE(false, "unregister: no xml id?");
+ OSL_FAIL("unregister: no xml id?");
return;
}
const XmlIdMap_t::iterator iter( m_pImpl->m_XmlIdMap.find(idref) );
@@ -820,7 +820,7 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
::rtl::OUString idref;
if (!m_pImpl->LookupXmlId( i_rSource, path, idref ))
{
- OSL_ENSURE(false, "no xml id?");
+ OSL_FAIL("no xml id?");
return;
}
XmlIdList_t * pList ( m_pImpl->LookupElementList(path, idref) );
@@ -887,7 +887,7 @@ XmlIdRegistryDocument::JoinMetadatables(
}
else
{
- OSL_ENSURE(false, "JoinMetadatables: no xmlid?");
+ OSL_FAIL("JoinMetadatables: no xmlid?");
return;
}
if (!mergedOwnsRef)
@@ -1202,7 +1202,7 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
const MetadatableClipboard * pLink;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref, pLink))
{
- OSL_ENSURE(false, "unregister: no xml id?");
+ OSL_FAIL("unregister: no xml id?");
return;
}
const ClipboardXmlIdMap_t::iterator iter( m_pImpl->m_XmlIdMap.find(idref) );
@@ -1309,7 +1309,7 @@ void Metadatable::RemoveMetadataReference()
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::RemoveMetadataReference: exception");
+ OSL_FAIL("Metadatable::RemoveMetadataReference: exception");
}
}
@@ -1465,13 +1465,13 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
}
else
{
- OSL_ENSURE(false, "neither RegDoc nor RegClp cannot happen");
+ OSL_FAIL("neither RegDoc nor RegClp cannot happen");
}
}
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::RegisterAsCopyOf: exception");
+ OSL_FAIL("Metadatable::RegisterAsCopyOf: exception");
}
}
@@ -1494,7 +1494,7 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::CreateUndo: exception");
+ OSL_FAIL("Metadatable::CreateUndo: exception");
}
return ::boost::shared_ptr<MetadatableUndo>();
}
@@ -1564,7 +1564,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::JoinMetadatable: exception");
+ OSL_FAIL("Metadatable::JoinMetadatable: exception");
}
}
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 407633f..27276c2 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -168,7 +168,7 @@ void SfxObjectFactory::RegisterViewFactory
ByteString sMessage( "SfxObjectFactory::RegisterViewFactory: duplicate view name '" );
sMessage += ByteString( sViewName, RTL_TEXTENCODING_ASCII_US );
sMessage += "'!";
- OSL_ENSURE( false, sMessage.GetBuffer() );
+ OSL_FAIL( sMessage.GetBuffer() );
break;
}
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c4ba333..f7abd92 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -455,7 +455,7 @@ void SfxDocTplService_Impl::init_Impl()
mxInfo = uno::Reference< XStandaloneDocumentInfo > (
mxFactory->createInstance( aService ), UNO_QUERY );
} catch (uno::RuntimeException &) {
- OSL_ENSURE(false, "SfxDocTplService_Impl::init_Impl: "
+ OSL_FAIL("SfxDocTplService_Impl::init_Impl: "
"cannot create DocumentProperties service");
}
@@ -1037,7 +1037,7 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
}
else
{
- OSL_ENSURE( false, "Unsupported property value type" );
+ OSL_FAIL( "Unsupported property value type" );
}
}
}
@@ -1098,7 +1098,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent,
}
else
{
- OSL_ENSURE( false, "Unsupported property value type" );
+ OSL_FAIL( "Unsupported property value type" );
}
}
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 6d12228..d1ba4e6 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -774,7 +774,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
if ( pBasMgr )
return pBasMgr->GetDialogLibraryContainer().get();
- OSL_ENSURE( false, "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?" );
+ OSL_FAIL( "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?" );
return SFX_APP()->GetDialogContainer();
}
@@ -789,7 +789,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
if ( pBasMgr )
return pBasMgr->GetScriptLibraryContainer().get();
- OSL_ENSURE( false, "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?" );
+ OSL_FAIL( "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?" );
return SFX_APP()->GetBasicContainer();
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 797cd3b..db68b1a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2583,7 +2583,7 @@ sal_Bool SfxBaseModel::IsInitialized() const
{
if ( !m_pData || !m_pData->m_pObjectShell )
{
- OSL_ENSURE( false, "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
+ OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
return sal_False;
}
@@ -3874,7 +3874,7 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame
// destroyed later, and the new one, which we're going to create
continue;
- OSL_ENSURE( false, "SfxBaseModel::FindOrCreateViewFrame_Impl: there already is an SfxFrame for the given XFrame, but no view in it!" );
+ OSL_FAIL( "SfxBaseModel::FindOrCreateViewFrame_Impl: there already is an SfxFrame for the given XFrame, but no view in it!" );
// nowadays, we're the only instance allowed to create an SfxFrame for an XFrame, so this case here should not happen
break;
}
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index a05b94f..dfb6b39 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -267,7 +267,7 @@ namespace sfx2
break;
default:
- OSL_ENSURE( false, "UserInputInterception::handleNotifyEvent: illegal event type!" );
+ OSL_FAIL( "UserInputInterception::handleNotifyEvent: illegal event type!" );
break;
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 382cd44..9e74f96 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -460,7 +460,7 @@ void SfxViewFrame::INetExecute_Impl( SfxRequest &rRequest )
{
case SID_BROWSE_FORWARD:
case SID_BROWSE_BACKWARD:
- OSL_ENSURE( false, "SfxViewFrame::INetExecute_Impl: SID_BROWSE_FORWARD/BACKWARD are dead!" );
+ OSL_FAIL( "SfxViewFrame::INetExecute_Impl: SID_BROWSE_FORWARD/BACKWARD are dead!" );
break;
case SID_CREATELINK:
{
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
index 419671d..f234a14 100644
--- a/sfx2/workben/custompanel/ctp_factory.cxx
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
@@ -103,7 +103,7 @@ namespace sd { namespace colortoolpanel
}
if ( !xParentWindow.is() )
{
- OSL_ENSURE( false, "ToolPanelFactory::createUIElement: no parent window in the args!" );
+ OSL_FAIL( "ToolPanelFactory::createUIElement: no parent window in the args!" );
throw IllegalArgumentException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No parent window provided in the creation arguments. Cannot create tool panel." ) ),
*this,
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index c144dbb..38d15a4 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -513,15 +513,15 @@ extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, co
}
catch(const char* ex)
{
- OSL_ENSURE(false, ex);
+ OSL_FAIL(ex);
}
catch(const xml_parser_exception&)
{
- OSL_ENSURE(false, "XML parser error");
+ OSL_FAIL("XML parser error");
}
catch(const unknown_xml_format_exception&)
{
- OSL_ENSURE(false, "XML format unknown");
+ OSL_FAIL("XML format unknown");
}
}
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 93e6d36..8b88485 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -221,7 +221,7 @@ void initParameter(int argc, char* argv[])
{
if (!isKnownParameter(argv[i]))
{
- OSL_ENSURE(false, "Wrong parameter received");
+ OSL_FAIL("Wrong parameter received");
continue;
}
@@ -324,7 +324,7 @@ int main(int argc, char* argv[])
#endif
)
{
- OSL_ENSURE(false, ex.what());
+ OSL_FAIL(ex.what());
}
return ulRet;
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 3cfd980..781280f 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -898,13 +898,13 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw(
void SAL_CALL SvxRectCtlChildAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ )
throw( RuntimeException )
{
- OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" );
+ OSL_FAIL( "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" );
}
void SAL_CALL SvxRectCtlChildAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ )
throw (RuntimeException)
{
- OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" );
+ OSL_FAIL( "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" );
}
void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException )
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 5374c9b..76925fb 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -906,7 +906,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclSetting = MOUSE_WHEEL_FOCUS_ONLY; break;
case MouseWheelBehavior::SCROLL_ALWAYS: nVclSetting = MOUSE_WHEEL_ALWAYS; break;
default:
- OSL_ENSURE( false, "DbCellControl::Init: invalid MouseWheelBehavior!" );
+ OSL_FAIL( "DbCellControl::Init: invalid MouseWheelBehavior!" );
break;
}
@@ -3361,7 +3361,7 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException )
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::setPosSize: not implemented" );
+ OSL_FAIL( "FmXGridCell::setPosSize: not implemented" );
(void)_XX;
(void)_Y;
(void)_Width;
@@ -3373,14 +3373,14 @@ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_In
//------------------------------------------------------------------
awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::getPosSize: not implemented" );
+ OSL_FAIL( "FmXGridCell::getPosSize: not implemented" );
return awt::Rectangle();
}
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::setVisible: not implemented" );
+ OSL_FAIL( "FmXGridCell::setVisible: not implemented" );
(void)_Visible;
// not allowed to tamper with this for a grid cell
}
@@ -3388,7 +3388,7 @@ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeExcep
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::setEnable: not implemented" );
+ OSL_FAIL( "FmXGridCell::setEnable: not implemented" );
(void)_Enable;
// not allowed to tamper with this for a grid cell
}
@@ -3396,7 +3396,7 @@ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeExcepti
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::setFocus( ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::setFocus: not implemented" );
+ OSL_FAIL( "FmXGridCell::setFocus: not implemented" );
// not allowed to tamper with this for a grid cell
}
@@ -3463,14 +3463,14 @@ void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMou
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::addPaintListener: not implemented" );
+ OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" );
(void)_rxListener;
}
//------------------------------------------------------------------
void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException)
{
- OSL_ENSURE( false, "FmXGridCell::removePaintListener: not implemented" );
+ OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" );
(void)_rxListener;
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 4609a56..58cdb74 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -755,12 +755,12 @@ namespace svxform
case MID_INSERT_CONTROL:
{
- OSL_ENSURE( false, "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" );
+ OSL_FAIL( "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" );
}
break;
default:
- OSL_ENSURE( false, "XFormsPage::DoToolboxAction: unknown ID!" );
+ OSL_FAIL( "XFormsPage::DoToolboxAction: unknown ID!" );
break;
}
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index b6b6673..1a26bc4 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -538,7 +538,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
bool bValidIndex = ( nInsertPos >= 0 ) && ( (size_t)nInsertPos <= pFormItem->GetChildren().size() );
if ( !bValidIndex )
{
- OSL_ENSURE( false, "FmFilterAdapter::disjunctiveTermAdded: invalid index!" );
+ OSL_FAIL( "FmFilterAdapter::disjunctiveTermAdded: invalid index!" );
return;
}
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index f812c56..3a34a56 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -163,7 +163,7 @@ namespace svxform
pCharLocalePropertyName = "CharLocaleComplex";
break;
default:
- OSL_ENSURE( false, "lcl_initializeControlFont: unexpected script type for system locale!" );
+ OSL_FAIL( "lcl_initializeControlFont: unexpected script type for system locale!" );
break;
}
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index bbef532..dfea91e 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -151,7 +151,7 @@ namespace svxform
}
// last: uhm, there is no last resort
- OSL_ENSURE( false, "DocumentClassification::classifyDocument: unknown document!" );
+ OSL_FAIL( "DocumentClassification::classifyDocument: unknown document!" );
}
catch( const Exception& )
{
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index eed59d1..da10512 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -211,7 +211,7 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage, const FmFormPageImpl& rImpl
if ( bForeignIsForm != bOwnIsForm )
{
- OSL_ENSURE( false, "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" );
+ OSL_FAIL( "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" );
// don't attempt to do further assignments, something's completely messed up
break;
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index f7fd5e2..e94ae65 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -742,7 +742,7 @@ bool FmXFormShell::impl_checkDisposed() const
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXFormShell::impl_checkDisposed" );
if ( !m_pShell )
{
- OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" );
+ OSL_FAIL( "FmXFormShell::impl_checkDisposed: already disposed!" );
return true;
}
return false;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index dbc85b5..e295452 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1669,7 +1669,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
if ( xControlPropInfo->hasPropertyByName( FM_PROP_LABEL ) )
xControlSet->setPropertyValue( FM_PROP_LABEL, makeAny( sFieldName + _rFieldPostfix ) );
else
- OSL_ENSURE( false, "FmXFormView::createControlLabelPair: can't set a label for the control!" );
+ OSL_FAIL( "FmXFormView::createControlLabelPair: can't set a label for the control!" );
}
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0a9d79a..54bb40a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1507,7 +1507,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
// Suchen der aktuellen Row
if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) )
{
- OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" );
+ OSL_FAIL( "FormController::textChanged: m_nCurrentFilterPosition is wrong!" );
return;
}
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 81d622d..3cb853b 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -469,7 +469,7 @@ namespace svx
else if ( aError.hasValue() )
displayException( aError );
else
- OSL_ENSURE( false, "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" );
+ OSL_FAIL( "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" );
return false;
}
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 47999b4..777cdb2 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -386,7 +386,7 @@ namespace sdr
{
// empty scene, no 3d action should be necessary. Prepare some
// fallback size
- OSL_ENSURE(false, "No need to get ViewInformation3D from an empty scene (!)");
+ OSL_FAIL("No need to get ViewInformation3D from an empty scene (!)");
aContentRange.expand(basegfx::B3DPoint(-100.0, -100.0, -100.0));
aContentRange.expand(basegfx::B3DPoint( 100.0, 100.0, 100.0));
}
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 7e70f0b..53528e6 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -69,7 +69,7 @@ namespace sdr
if(!nPointCount)
{
- OSL_ENSURE(false, "PolyPolygon object without geometry detected, this should not be created (!)");
+ OSL_FAIL("PolyPolygon object without geometry detected, this should not be created (!)");
basegfx::B2DPolygon aFallbackLine;
aFallbackLine.append(basegfx::B2DPoint(0.0, 0.0));
aFallbackLine.append(basegfx::B2DPoint(1000.0, 1000.0));
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index bb6719a..bcf023a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -197,7 +197,7 @@ namespace sdr { namespace contact {
m_xControlView.set( m_xControl, UNO_QUERY );
if ( !m_xControlWindow.is() || !m_xControlView.is() )
{
- OSL_ENSURE( false, "ControlHolder::operator=: invalid XControl, missing required interfaces!" );
+ OSL_FAIL( "ControlHolder::operator=: invalid XControl, missing required interfaces!" );
clear();
}
}
@@ -1055,7 +1055,7 @@ namespace sdr { namespace contact {
UnoControlContactHelper::adjustControlGeometry_throw( m_aControl, pUnoObject->GetLogicRect(), _rViewTransformation, m_aZoomLevelNormalization );
}
else
- OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" );
+ OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" );
}
catch( const Exception& )
{
@@ -1135,7 +1135,7 @@ namespace sdr { namespace contact {
{
if ( m_bCreatingControl )
{
- OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" );
+ OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" );
// We once had a situation where this was called reentrantly, which lead to all kind of strange effects. All
// those affected the grid control, which is the only control so far which is visible in design mode (and
// not only in alive mode).
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 32584c2..3e81f2f 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -73,7 +73,7 @@ namespace sdr
// Default implementation has to assert a missing implementation. It cannot
// be useful to have overlay object derivations which have no visualisation
// at all
- OSL_ENSURE(false, "OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)");
+ OSL_FAIL("OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)");
return drawinglayer::primitive2d::Primitive2DSequence();
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a4edebb..0a39ec7 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2039,7 +2039,7 @@ SdrHdl* SdrPathObj::GetHdl(sal_uInt32 nHdlNum) const
{
// #i73248#
// Warn the user that this is ineffective and show alternatives. Should not be used at all.
- OSL_ENSURE(false, "SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)");
+ OSL_FAIL("SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)");
// to have an alternative, get single handle using the ineffective way
SdrHdl* pRetval = 0;
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 6f5c424..36f6dad 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -436,7 +436,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con
}
else
{
- OSL_ENSURE(false, "SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)");
+ OSL_FAIL("SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)");
// None of the known OutputDevices is the target of this paint, use
// a temporary SdrPageWindow for this Redraw.
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 2947c54..23127da 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2452,7 +2452,7 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const
{
// #i73248#
// Warn the user that this is ineffective and show alternatives. Should not be used at all.
- OSL_ENSURE(false, "SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)");
+ OSL_FAIL("SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)");
// to have an alternative, get single handle using the ineffective way
SdrHdl* pRetval = 0;
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index a1501aa..86a417f 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -89,7 +89,7 @@ void TableEdgeHdl::SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, T
}
else
{
- OSL_ENSURE( false, "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" );
+ OSL_FAIL( "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" );
}
}
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 59d9250..0c2e34e 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -210,7 +210,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor
}
else
{
- OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" );
+ OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" );
}
return false;
@@ -234,7 +234,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY,
}
else
{
- OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" );
+ OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" );
}
return pLine;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index ef321fc..cca4ffb 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1487,14 +1487,14 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN
void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" );
+ OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" );
}
//----------------------------------------------------------------------
void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" );
+ OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" );
}
//----------------------------------------------------------------------
@@ -3825,7 +3825,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
}
return *pSeq;
}
- OSL_ENSURE( false, "SvxShape::_getSupportedServiceNames: could not determine object type!" );
+ OSL_FAIL( "SvxShape::_getSupportedServiceNames: could not determine object type!" );
uno::Sequence< OUString > aSeq;
return aSeq;
}
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 8325bac..0ec79b9 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -200,8 +200,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
}
@@ -219,8 +218,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
@@ -233,8 +231,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
@@ -786,14 +783,14 @@ bool UniversalContentBroker::configureUcb()
if (m_aArguments.getLength() < 2
|| !(m_aArguments[0] >>= aKey1) || !(m_aArguments[1] >>= aKey2))
{
- OSL_ENSURE(false, "UniversalContentBroker::configureUcb(): Bad arguments");
+ OSL_FAIL("UniversalContentBroker::configureUcb(): Bad arguments");
return false;
}
ContentProviderDataList aData;
if (!getContentProviderData(aKey1, aKey2, aData))
{
- OSL_ENSURE(false, "UniversalContentBroker::configureUcb(): No configuration");
+ OSL_FAIL("UniversalContentBroker::configureUcb(): No configuration");
return false;
}
@@ -823,8 +820,7 @@ void UniversalContentBroker::prepareAndRegister(
}
else
- OSL_ENSURE(false,
- "UniversalContentBroker::prepareAndRegister(): Bad argument placeholders");
+ OSL_FAIL("UniversalContentBroker::prepareAndRegister(): Bad argument placeholders");
}
}
@@ -836,8 +832,7 @@ bool UniversalContentBroker::getContentProviderData(
{
if ( !m_xSMgr.is() || !rKey1.getLength() || !rKey2.getLength() )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - Invalid argument!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - Invalid argument!" );
return false;
}
@@ -913,8 +908,7 @@ bool UniversalContentBroker::getContentProviderData(
catch ( container::NoSuchElementException& )
{
// getByHierarchicalName
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"caught NoSuchElementException!" );
}
}
@@ -922,16 +916,14 @@ bool UniversalContentBroker::getContentProviderData(
}
catch ( uno::RuntimeException& )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
return false;
}
catch ( uno::Exception& )
{
// createInstance, createInstanceWithArguments
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - caught Exception!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught Exception!" );
return false;
}
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 6aad4da..ea53702 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1438,7 +1438,7 @@ void globalTransfer_(
"BUG: UnsupportedNameClashException not allowed here!" );
if (exc.NameClash != ucb::NameClash::ERROR) {
- OSL_ENSURE( false, "BUG: NameClash::ERROR expected!" );
+ OSL_FAIL( "BUG: NameClash::ERROR expected!" );
}
// No chance to solve name clashes, because I'm not able to detect
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index cd5f3e4..85bf661 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -385,7 +385,7 @@ namespace ucb { namespace ucp { namespace ext
}
default:
- OSL_ENSURE( false, "Content::getParentURL: unhandled case!" );
+ OSL_FAIL( "Content::getParentURL: unhandled case!" );
break;
}
return ::rtl::OUString();
@@ -514,11 +514,11 @@ namespace ucb { namespace ucp { namespace ext
}
default:
- OSL_ENSURE( false, "Content::getPropertyValues: unhandled case!" );
+ OSL_FAIL( "Content::getPropertyValues: unhandled case!" );
break;
}
- OSL_ENSURE( false, "Content::getPropertyValues: unreachable!" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list