[Libreoffice-commits] .: basic/source connectivity/source desktop/source embeddedobj/source embeddedobj/test fpicker/source framework/source sfx2/source shell/source svx/source ucb/source xmloff/source xmlscript/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Mar 19 06:09:41 PDT 2011
basic/source/uno/namecont.cxx | 6
basic/source/uno/scriptcont.cxx | 2
connectivity/source/commontools/conncleanup.cxx | 12
connectivity/source/commontools/dbtools.cxx | 16 -
connectivity/source/commontools/parameters.cxx | 27 -
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 10
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/cpool/ZPoolCollection.cxx | 22 -
connectivity/source/drivers/ado/AConnection.cxx | 3
connectivity/source/drivers/ado/APreparedStatement.cxx | 2
connectivity/source/drivers/ado/AResultSet.cxx | 2
connectivity/source/drivers/ado/AStatement.cxx | 2
connectivity/source/drivers/evoab/LColumnAlias.cxx | 2
connectivity/source/drivers/evoab/LConfigAccess.cxx | 4
connectivity/source/drivers/evoab/LFolderList.cxx | 2
connectivity/source/drivers/evoab/LTable.cxx | 2
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/mozab/MConfigAccess.cxx | 6
connectivity/source/drivers/mozab/MResultSet.cxx | 2
connectivity/source/drivers/mozab/MServices.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx | 2
connectivity/source/manager/mdrivermanager.cxx | 2
desktop/source/app/app.cxx | 12
desktop/source/app/appinit.cxx | 6
desktop/source/app/dispatchwatcher.cxx | 6
desktop/source/app/langselect.cxx | 6
desktop/source/app/userinstall.cxx | 4
desktop/source/migration/migration.cxx | 16 -
desktop/source/migration/services/autocorrmigration.cxx | 4
desktop/source/migration/services/basicmigration.cxx | 4
desktop/source/migration/services/wordbookmigration.cxx | 4
embeddedobj/source/commonembedding/embedobj.cxx | 8
embeddedobj/source/commonembedding/miscobj.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 16 -
embeddedobj/source/general/docholder.cxx | 2
embeddedobj/source/msole/closepreventer.cxx | 4
embeddedobj/source/msole/olecomponent.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 2
embeddedobj/source/msole/oleregister.cxx | 2
embeddedobj/source/msole/olevisual.cxx | 4
embeddedobj/test/MainThreadExecutor/register.cxx | 2
embeddedobj/test/mtexecutor/mteregister.cxx | 2
fpicker/source/unx/kde_unx/UnxFPentry.cxx | 2
fpicker/source/win32/filepicker/FilePicker.cxx | 2
fpicker/source/win32/filepicker/FilterContainer.cxx | 4
fpicker/source/win32/filepicker/PreviewCtrl.cxx | 4
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 2
fpicker/source/win32/filepicker/filepickerstate.cxx | 12
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 4
fpicker/source/win32/folderpicker/MtaFop.cxx | 6
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 6
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/services/autorecovery.cxx | 4
framework/source/services/sessionlistener.cxx | 6
sfx2/source/appl/appopen.cxx | 2
sfx2/source/doc/docfile.cxx | 16 -
sfx2/source/doc/docmacromode.cxx | 2
sfx2/source/doc/guisaveas.cxx | 4
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/objstor.cxx | 10
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/view/ipclient.cxx | 6
shell/source/win32/workbench/TestProxySet.cxx | 8
shell/source/win32/workbench/TestSmplMail.cxx | 6
shell/source/win32/workbench/TestSysShExec.cxx | 10
svx/source/accessibility/AccessibleControlShape.cxx | 16 -
svx/source/fmcomp/dbaexchange.cxx | 10
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/gridcell.cxx | 8
svx/source/form/dataaccessdescriptor.cxx | 4
svx/source/form/dbtoolsclient.cxx | 2
svx/source/form/fmPropBrw.cxx | 12
svx/source/form/fmcontrolbordermanager.cxx | 10
svx/source/form/fmcontrollayout.cxx | 2
svx/source/form/fmdocumentclassification.cxx | 2
svx/source/form/fmpage.cxx | 2
svx/source/form/fmpgeimp.cxx | 2
svx/source/form/fmshimp.cxx | 6
svx/source/form/fmtextcontrolfeature.cxx | 6
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmtools.cxx | 2
svx/source/form/fmundo.cxx | 14
svx/source/form/formcontrolfactory.cxx | 2
svx/source/form/formcontroller.cxx | 4
svx/source/form/formfeaturedispatcher.cxx | 6
svx/source/form/formtoolbars.cxx | 2
svx/source/svdraw/svdoole2.cxx | 6
svx/source/svdraw/svdouno.cxx | 2
svx/source/tbxctrls/tbxcolor.cxx | 2
svx/source/unodraw/recoveryui.cxx | 4
svx/source/unodraw/unoshap4.cxx | 2
ucb/source/cacher/cachedcontentresultset.cxx | 34 +-
ucb/source/cacher/cachedcontentresultsetstub.cxx | 4
ucb/source/cacher/contentresultsetwrapper.cxx | 72 ++---
ucb/source/cacher/dynamicresultsetwrapper.cxx | 4
ucb/source/core/provprox.cxx | 9
ucb/source/core/ucbcmds.cxx | 13
ucb/source/core/ucbprops.cxx | 3
ucb/source/core/ucbstore.cxx | 197 ++++----------
ucb/source/sorter/sortresult.cxx | 14
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 15 -
ucb/source/ucp/hierarchy/hierarchydata.cxx | 78 +----
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 12
ucb/source/ucp/odma/odma_content.cxx | 18 -
ucb/source/ucp/package/pkgcontent.cxx | 115 ++------
ucb/source/ucp/package/pkgdatasupplier.cxx | 12
ucb/source/ucp/package/pkgprovider.cxx | 3
ucb/source/ucp/tdoc/tdoc_content.cxx | 29 --
ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 6
ucb/source/ucp/webdav/LockSequence.cxx | 6
ucb/source/ucp/webdav/NeonSession.cxx | 17 -
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 30 --
ucb/source/ucp/webdav/webdavcontent.cxx | 34 --
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 2
xmloff/source/forms/attriblistmerge.cxx | 4
xmloff/source/forms/elementexport.cxx | 16 -
xmloff/source/forms/elementimport.cxx | 24 -
xmloff/source/forms/elementimport_impl.hxx | 4
xmloff/source/forms/eventimport.cxx | 2
xmloff/source/forms/formattributes.cxx | 12
xmloff/source/forms/formcellbinding.cxx | 10
xmloff/source/forms/formlayerexport.cxx | 2
xmloff/source/forms/gridcolumnproptranslator.cxx | 18 -
xmloff/source/forms/layerexport.cxx | 4
xmloff/source/forms/layerimport.cxx | 12
xmloff/source/forms/officeforms.cxx | 4
xmloff/source/forms/propertyexport.cxx | 11
xmloff/source/forms/propertyimport.cxx | 20 -
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/style/xmlexppr.cxx | 2
xmloff/source/transform/XMLFilterRegistration.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 2
136 files changed, 603 insertions(+), 785 deletions(-)
New commits:
commit 7c66790faa8491c0d28c6cde38ea08c054ec59b5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 19 14:09:49 2011 +0100
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 469cc18..a40c52b 100755
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1415,7 +1415,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Problem during storing of library!\n" );
+ OSL_FAIL( "Problem during storing of library!\n" );
// TODO: error handling?
}
}
@@ -1558,7 +1558,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Problem during storing of library index file!\n" );
+ OSL_FAIL( "Problem during storing of library index file!\n" );
// TODO: error handling?
}
}
@@ -2080,7 +2080,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Problem during storing of libraries!\n" );
+ OSL_FAIL( "Problem during storing of libraries!\n" );
sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 5596d36..da84717 100755
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -715,7 +715,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Problem on storing of password library!\n" );
+ OSL_FAIL( "Problem on storing of password library!\n" );
// TODO: error handling
}
}
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index b88ded8..ba85315 100755
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -73,7 +73,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" );
+ OSL_FAIL( "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" );
}
}
@@ -87,7 +87,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startPropertyListening: caught an exception!" );
+ OSL_FAIL( "OAutoConnectionDisposer::startPropertyListening: caught an exception!" );
}
}
@@ -108,7 +108,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" );
+ OSL_FAIL( "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" );
}
}
@@ -123,7 +123,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startRowSetListening: caught an exception!" );
+ OSL_FAIL( "OAutoConnectionDisposer::startRowSetListening: caught an exception!" );
}
m_bRSListening = sal_True;
}
@@ -138,7 +138,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" );
+ OSL_FAIL( "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" );
}
m_bRSListening = sal_False;
}
@@ -220,7 +220,7 @@ namespace dbtools
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OAutoConnectionDisposer::clearConnection: caught an exception!");
+ OSL_FAIL("OAutoConnectionDisposer::clearConnection: caught an exception!");
}
}
//---------------------------------------------------------------------
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 2deb7d8..0ada28c 100755
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -313,7 +313,7 @@ Reference< XConnection > getConnection_allowException(
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "dbtools::getConnection: error while retrieving data source properties!");
+ OSL_FAIL("dbtools::getConnection: error while retrieving data source properties!");
}
if(bPwdReq && !sPwd.getLength())
{ // password required, but empty -> connect using an interaction handler
@@ -354,7 +354,7 @@ Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rData
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!");
+ OSL_FAIL("::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!");
}
return xReturn;
}
@@ -745,7 +745,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: could not set the MaxRows!" );
+ OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: could not set the MaxRows!" );
// oh damn. Not much of a chance to recover, we will no retrieve the complete
// full blown result set
}
@@ -760,7 +760,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
break;
default:
- OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: oops! unhandled state here!" );
+ OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: oops! unhandled state here!" );
eState = FAILED;
}
}
@@ -770,7 +770,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
catch( const SQLException& e ) { if ( _pErrorInfo ) *_pErrorInfo = SQLExceptionInfo( e ); }
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" );
+ OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" );
}
return xFields;
@@ -1067,7 +1067,7 @@ try
::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
sMessage += pResult->Name;
sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
- OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
+ OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
#endif
}
}
@@ -1262,7 +1262,7 @@ try
}
catch(const Exception&)
{
- OSL_ENSURE( sal_False, "TransferFormComponentProperties: caught an exception!" );
+ OSL_FAIL( "TransferFormComponentProperties: caught an exception!" );
}
}
@@ -1382,7 +1382,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "::getCurrentSettingsComposer : caught an exception !" );
+ OSL_FAIL( "::getCurrentSettingsComposer : caught an exception !" );
}
return xReturn;
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 58c191f..b94596f 100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -227,7 +227,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::collectInnerParameters: caught an exception!" );
+ OSL_FAIL( "ParameterManager::collectInnerParameters: caught an exception!" );
}
}
}
@@ -417,7 +417,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::analyzeFieldLinks: caught an exception!" );
+ OSL_FAIL( "ParameterManager::analyzeFieldLinks: caught an exception!" );
}
}
@@ -574,7 +574,7 @@ namespace dbtools
// does the name denote a valid column in the parent?
if ( !_rxParentColumns->hasByName( *pMasterFields ) )
{
- OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
+ OSL_FAIL( "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
continue;
}
@@ -584,7 +584,7 @@ namespace dbtools
|| ( aParamInfo->second.aInnerIndexes.empty() )
)
{
- OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
+ OSL_FAIL( "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
continue;
}
@@ -623,8 +623,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False,
- ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+ OSL_FAIL( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+= ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
+= ::rtl::OString( " could not be filled!" ) );
}
@@ -665,7 +664,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while calling the handler!" );
+ OSL_FAIL( "ParameterManager::completeParameters: caught an exception while calling the handler!" );
}
if ( !pParams->wasSelected() )
@@ -695,7 +694,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while propagating the values!" );
+ OSL_FAIL( "ParameterManager::completeParameters: caught an exception while propagating the values!" );
}
return true;
}
@@ -766,7 +765,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::getConnection: could not retrieve the connection of the !" );
+ OSL_FAIL( "ParameterManager::getConnection: could not retrieve the connection of the !" );
}
return _rxConnection.is();
}
@@ -789,7 +788,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::cacheConnectionInfo: caught an exception!" );
+ OSL_FAIL( "ParameterManager::cacheConnectionInfo: caught an exception!" );
}
}
@@ -845,7 +844,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::getParentColumns: caught an exception!" );
+ OSL_FAIL( "ParameterManager::getParentColumns: caught an exception!" );
}
return _out_rxParentColumns.is();
}
@@ -900,7 +899,7 @@ namespace dbtools
{
// if this name is unknown in the parent columns, then we don't have a source
// for copying the value to the detail columns
- OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: this should have been stripped long before!" );
+ OSL_FAIL( "ParameterManager::resetParameterValues: this should have been stripped long before!" );
continue;
}
@@ -912,7 +911,7 @@ namespace dbtools
|| ( aParamInfo->second.aInnerIndexes.empty() )
)
{
- OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: nothing known about this detail field!" );
+ OSL_FAIL( "ParameterManager::resetParameterValues: nothing known about this detail field!" );
continue;
}
@@ -944,7 +943,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: caught an exception!" );
+ OSL_FAIL( "ParameterManager::resetParameterValues: caught an exception!" );
}
}
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index f757334..a042711 100755
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -141,7 +141,7 @@ namespace param
return pProperties->Name;
}
- OSL_ENSURE( sal_False, "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" );
+ OSL_FAIL( "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" );
return ::rtl::OUString();
}
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 3cab4cc..a4bd5ae 100755
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -93,7 +93,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OPredicateInputController::getSeparatorChars: caught an exception!" );
+ OSL_FAIL( "OPredicateInputController::getSeparatorChars: caught an exception!" );
}
return sal_False;
}
@@ -133,7 +133,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OPredicateInputController::OPredicateInputController: caught an exception!" );
+ OSL_FAIL( "OPredicateInputController::OPredicateInputController: caught an exception!" );
}
}
@@ -226,7 +226,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" );
+ OSL_FAIL( "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" );
}
sal_Bool bDecDiffers = ( nCtxDecSep != nFmtDecSep );
@@ -343,7 +343,7 @@ namespace dbtools
sReturn = pOdbcSpec->getChild(1)->getTokenValue();
}
else
- OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" );
+ OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" );
}
else
{
@@ -376,7 +376,7 @@ namespace dbtools
);
}
else
- OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" );
+ OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" );
}
delete pParseNode;
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 3300f9f..355e688 100755
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -212,7 +212,7 @@ namespace dbtools
break;
default:
- OSL_ENSURE(sal_False, "lcl_ensureUpToDateComposer_nothrow: no table, no query, no statement - what else ?!");
+ OSL_FAIL("lcl_ensureUpToDateComposer_nothrow: no table, no query, no statement - what else ?!");
break;
}
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index f4f7f8f..664ffa6 100755
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -233,7 +233,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt
xDriver = new ODriverWrapper(xDriverProxy, pConnectionPool);
}
else
- OSL_ENSURE(sal_False, "OConnectionPool::getDriverByURL: could not instantiate a proxy factory!");
+ OSL_FAIL("OConnectionPool::getDriverByURL: could not instantiate a proxy factory!");
}
}
@@ -363,7 +363,7 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::O
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "createWithServiceFactory: error while instantiating the provider service!");
+ OSL_FAIL("createWithServiceFactory: error while instantiating the provider service!");
}
return xInterface;
}
@@ -382,7 +382,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
Reference< XServiceInfo > xSI(_rxConfProvider, UNO_QUERY);
if (!xSI.is())
{
- OSL_ENSURE(sal_False, "::createWithProvider: no XServiceInfo interface on the provider!");
+ OSL_FAIL("::createWithProvider: no XServiceInfo interface on the provider!");
}
else
{
@@ -392,7 +392,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
}
catch(const Exception&)
{
- OSL_ENSURE(sal_False, "::createWithProvider: unable to check the service conformance of the provider given!");
+ OSL_FAIL("::createWithProvider: unable to check the service conformance of the provider given!");
}
}
#endif
@@ -413,7 +413,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!");
+ OSL_FAIL("OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!");
}
}
return xInterface;
@@ -430,25 +430,24 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co
if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath))
{
if (!::cppu::extractInterface(xNode, xDirectAccess->getByName(_rPath)))
- OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
+ OSL_FAIL("OConfigurationNode::openNode: could not open the node!");
}
else if (xHierarchyAccess.is())
{
if (!::cppu::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath)))
- OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
+ OSL_FAIL("OConfigurationNode::openNode: could not open the node!");
}
}
catch(const NoSuchElementException&)
{
- OSL_ENSURE(sal_False,
- ::rtl::OString("::openNode: there is no element named ")
+ OSL_FAIL(::rtl::OString("::openNode: there is no element named ")
+= ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString("!"));
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OConfigurationNode::openNode: caught an exception while retrieving the node!");
+ OSL_FAIL("OConfigurationNode::openNode: caught an exception while retrieving the node!");
}
return xNode;
}
@@ -472,8 +471,7 @@ Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference<
catch(NoSuchElementException& e)
{
OSL_UNUSED( e ); // make compiler happy
- OSL_ENSURE(sal_False,
- ::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
+ OSL_FAIL(::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
+= ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
+= ::rtl::OString("!"));
}
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 55c1e73..c9e076d 100755
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -577,8 +577,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
{
// we can not assert here because we could be in d&d
/*
- OSL_ENSURE(sal_False,
- ( ::rtl::OString("getTypeInfoFromType: assuming column type ")
+ OSL_FAIL(( ::rtl::OString("getTypeInfoFromType: assuming column type ")
+= ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding())
+= ::rtl::OString("\" (expected type name ")
+= ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding())
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 5b7056c..eabdef9 100755
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -99,7 +99,7 @@ OPreparedStatement::~OPreparedStatement()
{
if (m_pParameters)
{
- OSL_ENSURE( sal_False, "OPreparedStatement::~OPreparedStatement: not disposed!" );
+ OSL_FAIL( "OPreparedStatement::~OPreparedStatement: not disposed!" );
m_pParameters->Release();
m_pParameters = NULL;
}
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 366ac23..e787831 100755
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -112,7 +112,7 @@ void OResultSet::construct()
osl_incrementInterlockedCount( &m_refCount );
if (!m_pRecordSet)
{
- OSL_ENSURE( sal_False, "OResultSet::construct: no RecordSet!" );
+ OSL_FAIL( "OResultSet::construct: no RecordSet!" );
Reference< XInterface > xInt( *this );
osl_decrementInterlockedCount( &m_refCount );
::dbtools::throwFunctionSequenceException( xInt );
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2708607..fb7daae 100755
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -735,7 +735,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
catch( const Exception& e )
{
bModified = sal_True; // will ensure that the property is set
- OSL_ENSURE( sal_False, "OStatement_Base::convertFastPropertyValue: caught something strange!" );
+ OSL_FAIL( "OStatement_Base::convertFastPropertyValue: caught something strange!" );
(void)e;
}
return bModified;
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index fa627ea..ea5a4a6 100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -198,7 +198,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OColumnAlias::setAlias: could not read my driver's configuration data!" );
+ OSL_FAIL( "OColumnAlias::setAlias: could not read my driver's configuration data!" );
}
}
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 7777fb2..e7e4652 100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -96,7 +96,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
+ OSL_FAIL( "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
}
// outta here
@@ -149,7 +149,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "getFullPathExportingCommand: caught an exception!" );
+ OSL_FAIL( "getFullPathExportingCommand: caught an exception!" );
}
}
return sFullPathExportingCommand;
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index b8f88e9..0e54596 100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -474,7 +474,7 @@ sal_Bool OEvoabFolderList::seekRow(IResultSetHelper::Movement eCursorPosition)
break;
default:
- OSL_ENSURE( sal_False, "OEvoabFolderList::seekRow: unsupported positioning!" );
+ OSL_FAIL( "OEvoabFolderList::seekRow: unsupported positioning!" );
break;
}
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index deab8ca..41ac377 100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -663,7 +663,7 @@ sal_Bool OEvoabTable::setColumnAliases()
}
}
else
- OSL_ENSURE( sal_False, "OEvoabTable::setColumnAliases: did not find one of the aliases!" );
+ OSL_FAIL( "OEvoabTable::setColumnAliases: did not find one of the aliases!" );
}
if(!bFound)
aColumnFinalName = aColumnReadName;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 3c673af..737e32d 100755
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -175,7 +175,7 @@ namespace
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "isCaseSensitiveParentFolder: caught an unexpected exception!" );
+ OSL_FAIL( "isCaseSensitiveParentFolder: caught an unexpected exception!" );
}
return nIsCS;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 1e77309..71d2f3e 100755
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1725,7 +1725,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
}
catch (Exception&)
{
- OSL_ENSURE(sal_False, "OResultSet::setBoundedColumns: caught an Exception!");
+ OSL_FAIL("OResultSet::setBoundedColumns: caught an Exception!");
}
}
// in this case we got more select columns as columns exist in the table
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index c139b97..95d71ed 100755
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -855,7 +855,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "lcl_getSystemLocale: caught an exception!" );
+ OSL_FAIL( "lcl_getSystemLocale: caught an exception!" );
}
if ( !sLocaleString.getLength() )
{
@@ -893,7 +893,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ODriverDelegator::onConnectedNewDatabase: caught an exception!" );
+ OSL_FAIL( "ODriverDelegator::onConnectedNewDatabase: caught an exception!" );
}
}
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index cc240d0..4609b10 100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -92,7 +92,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
+ OSL_FAIL( "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
}
// outta here
@@ -149,7 +149,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "getDescription: caught an exception!" );
+ OSL_FAIL( "getDescription: caught an exception!" );
}
}
if (sDescription.getLength() == 0)
@@ -177,7 +177,7 @@ namespace connectivity
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "getPreferredProfileName: caught an exception!" );
+ OSL_FAIL( "getPreferredProfileName: caught an exception!" );
}
}
return sPreferredName;
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index c1468ee..5ed1f0d 100755
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -1440,7 +1440,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
}
catch (Exception&)
{
- OSL_ENSURE(sal_False, "OResultSet::setBoundedColumns: caught an Exception!");
+ OSL_FAIL("OResultSet::setBoundedColumns: caught an Exception!");
}
}
}
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index b9867f2..4856d29 100755
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -122,7 +122,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere
if (NULL == s_pCreationFunc)
{ // did not find the symbol
- OSL_ENSURE(sal_False, "MozabDriver::registerClient: could not find the symbol for creating the factory!");
+ OSL_FAIL("MozabDriver::registerClient: could not find the symbol for creating the factory!");
osl_unloadModule(s_hModule);
s_hModule = NULL;
}
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index e3828a5..1e09198 100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -697,7 +697,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString&
xResEntry->setValue( m_rColumnAlias.getProgrammaticNameOrFallbackToUTF8Alias( aDBColumnName ), rValue.getString() );
break;
default:
- OSL_ENSURE( sal_False, "invalid data type!" );
+ OSL_FAIL( "invalid data type!" );
break;
}
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index fccc363..89feab7 100755
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -418,7 +418,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
}
catch (Exception&)
{
- OSL_ENSURE(sal_False, "OSDBCDriverManager::initializeDriverPrecedence: caught an exception while sorting the drivers!");
+ OSL_FAIL("OSDBCDriverManager::initializeDriverPrecedence: caught an exception while sorting the drivers!");
}
}
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4f0738c..a8af3ea 100755
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1584,7 +1584,7 @@ int Desktop::Main()
UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
if ( instErr_fin != UserInstall::E_None)
{
- OSL_ENSURE(sal_False, "userinstall failed");
+ OSL_FAIL("userinstall failed");
if ( instErr_fin == UserInstall::E_NoDiskSpace )
HandleBootstrapErrors( BE_USERINSTALL_NOTENOUGHDISKSPACE );
else if ( instErr_fin == UserInstall::E_NoWriteAccess )
@@ -2705,7 +2705,7 @@ void Desktop::OpenClients()
{
OUString aMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Could not disable AutoRecovery.\n"))
+ e.Message;
- OSL_ENSURE(sal_False, OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL(OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
else
@@ -2747,7 +2747,7 @@ void Desktop::OpenClients()
{
OUString aMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Error during recovery\n"))
+ e.Message;
- OSL_ENSURE(sal_False, OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL(OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
@@ -2770,7 +2770,7 @@ void Desktop::OpenClients()
{
OUString aMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Registration of session listener failed\n"))
+ e.Message;
- OSL_ENSURE(sal_False, OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL(OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
}
if (
@@ -2788,7 +2788,7 @@ void Desktop::OpenClients()
{
OUString aMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Error in session management\n"))
+ e.Message;
- OSL_ENSURE(sal_False, OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL(OUStringToOString(aMessage, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
}
@@ -3255,7 +3255,7 @@ void Desktop::DoFirstRunInitializations()
}
catch(const ::com::sun::star::uno::Exception&)
{
- OSL_ENSURE( sal_False, "Desktop::DoFirstRunInitializations: caught an exception while trigger job executor ..." );
+ OSL_FAIL( "Desktop::DoFirstRunInitializations: caught an exception while trigger job executor ..." );
}
}
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 39967e9..2effa42 100755
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -314,11 +314,11 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
} catch (com::sun::star::uno::Exception&) {
// no error handling needed...
// acceptor just won't come up
- OSL_ENSURE(sal_False, "Acceptor could not be created.");
+ OSL_FAIL("Acceptor could not be created.");
}
} else {
// there is already an acceptor with this description
- OSL_ENSURE(sal_False, "Acceptor already exists.");
+ OSL_FAIL("Acceptor already exists.");
}
}
@@ -368,7 +368,7 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString)
// this is the last reference and the acceptor will be destructed
rMap.erase(aAcceptString);
} else {
- OSL_ENSURE(sal_False, "Found no acceptor to remove");
+ OSL_FAIL("Found no acceptor to remove");
}
}
}
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 5f6446e..8dfed9d 100755
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -340,7 +340,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
{
OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Desktop::OpenDefault() IllegalArgumentException while calling XNotifyingDispatch: "));
- OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
}
@@ -399,14 +399,14 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: "))
+ iae.Message;
- OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
catch (com::sun::star::io::IOException& ioe)
{
OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Dispatchwatcher IOException while calling loadComponentFromURL: "))
+ ioe.Message;
- OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index b775bf2..a4bc670 100755
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -271,7 +271,7 @@ bool LanguageSelection::prepareLanguage()
catch (Exception& e)
{
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
}
@@ -399,7 +399,7 @@ Reference< XNameAccess > LanguageSelection::getConfigAccess(const sal_Char* pPat
} catch (com::sun::star::uno::Exception& e)
{
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
return xNameAccess;
}
@@ -549,7 +549,7 @@ void LanguageSelection::resetUserLanguage()
catch ( Exception& e)
{
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
m_eStatus = LS_STATUS_CONFIGURATIONACCESS_BROKEN;
}
}
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index c80ade8..a41dccd 100755
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -128,7 +128,7 @@ namespace desktop {
catch (Exception const & e)
{
OString msg(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
- OSL_ENSURE(sal_False, msg.getStr());
+ OSL_FAIL(msg.getStr());
}
return false;
@@ -284,7 +284,7 @@ namespace desktop {
{
OString aMsg("create_user_install(): ");
aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
return UserInstall::E_Creation;
}
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index e755dda..5a6caf1 100755
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -231,7 +231,7 @@ void Migration::migrateSettingsIfNecessary()
{
OString aMsg("doMigration() exception: ");
aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
OSL_ENSURE(bResult, "Migration has not been successfull");
(void)bResult;
@@ -334,7 +334,7 @@ sal_Bool MigrationImpl::doMigration()
OString aMsg("An unexpected exception was thrown during migration");
aMsg += "\nOldVersion: " + OUStringToOString(m_aInfo.productname, RTL_TEXTENCODING_ASCII_US);
aMsg += "\nDataPath : " + OUStringToOString(m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
// prevent running the migration multiple times
@@ -349,7 +349,7 @@ void MigrationImpl::refresh()
if (xRefresh.is())
xRefresh->refresh();
else
- OSL_ENSURE(sal_False, "could not get XRefresh interface from default config provider. No refresh done.");
+ OSL_FAIL("could not get XRefresh interface from default config provider. No refresh done.");
}
@@ -860,7 +860,7 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa
} catch (com::sun::star::uno::Exception& e)
{
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
return xNameAccess;
}
@@ -890,14 +890,14 @@ void MigrationImpl::copyFiles()
OString msg("Cannot copy ");
msg += OUStringToOString(*i_file, RTL_TEXTENCODING_UTF8) + " to "
+ OUStringToOString(destName, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, msg.getStr());
+ OSL_FAIL(msg.getStr());
}
++i_file;
}
}
else
{
- OSL_ENSURE(sal_False, "copyFiles: UserInstall does not exist");
+ OSL_FAIL("copyFiles: UserInstall does not exist");
}
}
@@ -946,13 +946,13 @@ void MigrationImpl::runServices()
OString aMsg("Execution of migration service failed (Exception caught).\nService: ");
aMsg += OUStringToOString(i_mig->service, RTL_TEXTENCODING_ASCII_US) + "\nMessage: ";
aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
} catch (...)
{
OString aMsg("Execution of migration service failed (Exception caught).\nService: ");
aMsg += OUStringToOString(i_mig->service, RTL_TEXTENCODING_ASCII_US) +
"\nNo message available";
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
}
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index e64a907..ebf5f25 100755
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -188,14 +188,14 @@ namespace migration
::rtl::OString aMsg( "AutocorrectionMigration::copyFiles: cannot copy " );
aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
+ ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( sal_False, aMsg.getStr() );
+ OSL_FAIL( aMsg.getStr() );
}
++aI;
}
}
else
{
- OSL_ENSURE( sal_False, "AutocorrectionMigration::copyFiles: no user installation!" );
+ OSL_FAIL( "AutocorrectionMigration::copyFiles: no user installation!" );
}
}
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index cdb5a15..b3b68e9 100755
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -177,14 +177,14 @@ namespace migration
::rtl::OString aMsg( "BasicMigration::copyFiles: cannot copy " );
aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
+ ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( sal_False, aMsg.getStr() );
+ OSL_FAIL( aMsg.getStr() );
}
++aI;
}
}
else
{
- OSL_ENSURE( sal_False, "BasicMigration::copyFiles: no user installation!" );
+ OSL_FAIL( "BasicMigration::copyFiles: no user installation!" );
}
}
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index ccb6d52..4e93a59 100755
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -224,7 +224,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
::rtl::OString aMsg( "WordbookMigration::copyFiles: cannot copy " );
aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
+ ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( sal_False, aMsg.getStr() );
+ OSL_FAIL( aMsg.getStr() );
}
}
++aI;
@@ -232,7 +232,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
}
else
{
- OSL_ENSURE( sal_False, "WordbookMigration::copyFiles: no user installation!" );
+ OSL_FAIL( "WordbookMigration::copyFiles: no user installation!" );
}
}
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 79cc15b..476dc80 100755
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -215,7 +215,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
else
{
- OSL_ENSURE( sal_False, "Unacceptable state switch!\n" );
+ OSL_FAIL( "Unacceptable state switch!\n" );
throw uno::RuntimeException(); // TODO
}
}
@@ -287,7 +287,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
else
{
- OSL_ENSURE( sal_False, "Unacceptable state switch!\n" );
+ OSL_FAIL( "Unacceptable state switch!\n" );
throw uno::RuntimeException(); // TODO
}
}
@@ -360,7 +360,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
else
{
- OSL_ENSURE( sal_False, "Unacceptable state switch!\n" );
+ OSL_FAIL( "Unacceptable state switch!\n" );
throw uno::RuntimeException(); // TODO
}
}
@@ -373,7 +373,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
else
{
- OSL_ENSURE( sal_False, "Unacceptable state switch!\n" );
+ OSL_FAIL( "Unacceptable state switch!\n" );
throw uno::RuntimeException(); // TODO
}
}
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 12681f0..59bdae5 100755
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -322,7 +322,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect )
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Exception on request to resize!\n" );
+ OSL_FAIL( "Exception on request to resize!\n" );
}
}
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index f56cafa..0b32e69 100755
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -638,7 +638,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Looks like stream was closed already" );
+ OSL_FAIL( "Looks like stream was closed already" );
}
return aResult;
@@ -665,7 +665,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "The object was not stored!\n" );
+ OSL_FAIL( "The object was not stored!\n" );
}
}
}
@@ -877,7 +877,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve storage media type!\n" );
+ OSL_FAIL( "Can not retrieve storage media type!\n" );
}
if ( m_pDocHolder->GetComponent().is() )
@@ -1203,7 +1203,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve target storage media type!\n" );
+ OSL_FAIL( "Can not retrieve target storage media type!\n" );
}
try
@@ -1216,7 +1216,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve own storage media type!\n" );
+ OSL_FAIL( "Can not retrieve own storage media type!\n" );
}
sal_Bool bTryOptimization = sal_False;
@@ -1334,7 +1334,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve target storage media type!\n" );
+ OSL_FAIL( "Can not retrieve target storage media type!\n" );
}
try
@@ -1347,7 +1347,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve own storage media type!\n" );
+ OSL_FAIL( "Can not retrieve own storage media type!\n" );
}
PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) );
@@ -1623,7 +1623,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not retrieve storage media type!\n" );
+ OSL_FAIL( "Can not retrieve storage media type!\n" );
}
aGuard.clear();
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6bc2074..bbc9f8d 100755
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -508,7 +508,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
if ( !SetFrameLMVisibility( m_xFrame, sal_False ) )
{
- OSL_ENSURE( sal_False, "Can't deactivate LayoutManager!\n" );
+ OSL_FAIL( "Can't deactivate LayoutManager!\n" );
// TODO/LATER: error handling?
}
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index f2368cf..8fac42d 100755
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -41,14 +41,14 @@ void SAL_CALL OClosePreventer::notifyClosing( const com::sun::star::lang::EventO
throw (::com::sun::star::uno::RuntimeException)
{
// just a disaster
- OSL_ENSURE( sal_False, "The object can not be prevented from closing!\n" );
+ OSL_FAIL( "The object can not be prevented from closing!\n" );
}
void SAL_CALL OClosePreventer::disposing( const com::sun::star::lang::EventObject& )
throw (::com::sun::star::uno::RuntimeException)
{
// just a disaster
- OSL_ENSURE( sal_False, "The object can not be prevented from closing!\n" );
+ OSL_FAIL( "The object can not be prevented from closing!\n" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 0d66dc7..a926336 100755
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1207,7 +1207,7 @@ awt::Size OleComponent::GetExtent( sal_Int64 nAspect )
bGotSize = sal_True;
}
else
- OSL_ENSURE( sal_False, "Unexpected size is provided!" );
+ OSL_FAIL( "Unexpected size is provided!" );
}
}
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 61e6e4d..79c0ae1 100755
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -519,7 +519,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
sal_Int64 nLength = xTempSeek->getLength() - 40;
if ( nLength < 0 || nLength >= 0xFFFFFFFF )
{
- OSL_ENSURE( sal_False, "Length is not acceptable!" );
+ OSL_FAIL( "Length is not acceptable!" );
return;
}
for ( sal_Int32 nInd = 0; nInd < 4; nInd++ )
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index fe49cb1..72616c3 100755
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis
}
catch (registry::InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 2e7c796..7925b09 100755
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -137,7 +137,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "The object should not be resized without activation!\n" );
+ OSL_FAIL( "The object should not be resized without activation!\n" );
}
aGuard.reset();
}
@@ -220,7 +220,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
sal_Bool bSuccess = sal_False;
if ( getCurrentState() == embed::EmbedStates::LOADED )
{
- OSL_ENSURE( sal_False, "Loaded object has no cached size!\n" );
+ OSL_FAIL( "Loaded object has no cached size!\n" );
// try to switch the object to RUNNING state and request the value again
try {
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index f65d5d6..a0a178b 100755
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
@@ -92,7 +92,7 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
}
catch (registry::InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 94c7df9..0a455ce 100755
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
}
catch (registry::InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index 98c94d6..9a87432 100755
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
@@ -86,7 +86,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
}
catch( InvalidRegistryException& )
{
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
+ OSL_FAIL( "InvalidRegistryException caught" );
bRetVal = sal_False;
}
}
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 6f2bcfc..f0782d3 100755
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -459,7 +459,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
}
else
{
- OSL_ENSURE(sal_False, "Could not start event notifier thread!");
+ OSL_FAIL("Could not start event notifier thread!");
throw uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 2c609c4..e4cdbb3 100755
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -145,7 +145,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString&
}
catch( std::out_of_range& )
{
- OSL_ENSURE( sal_False, "Filter not in filter container" );
+ OSL_FAIL( "Filter not in filter container" );
pos = -1;
}
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi
}
catch( std::out_of_range& )
{
- OSL_ENSURE( sal_False, "Filter index out of range" );
+ OSL_FAIL( "Filter index out of range" );
bRet = sal_False;
}
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 6bf2c62..6db88fe 100755
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -226,12 +226,12 @@ CFilePreview* CFilePreview::createInstance(
catch( CPreviewException& )
{
OSL_ASSERT( !s_FilePreviewInst );
- OSL_ENSURE( sal_False, "Creation of the preview window failed" );
+ OSL_FAIL( "Creation of the preview window failed" );
}
catch( CAutoOleInit::COleInitException& )
{
OSL_ASSERT( !s_FilePreviewInst );
- OSL_ENSURE( sal_False, "OleInitalize failed" );
+ OSL_FAIL( "OleInitalize failed" );
}
}
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 31ce79c..2048eb0 100755
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -299,7 +299,7 @@ void SAL_CALL CAsyncEventNotifier::run()
}
catch(uno::RuntimeException&)
{
- OSL_ENSURE(sal_False,"RuntimeException during event dispatching");
+ OSL_FAIL("RuntimeException during event dispatching");
}
}
}
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 1ec72dc..5429a6e 100755
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -395,14 +395,14 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
// method the caller should use XFilterManager
if ( !hwndCtrl || (aControlId == LISTBOX_FILTER) )
{
- OSL_ENSURE( sal_False, "invalid control id" );
+ OSL_FAIL( "invalid control id" );
return;
}
CTRL_CLASS aCtrlClass = GetCtrlClass( hwndCtrl );
if ( UNKNOWN == aCtrlClass )
{
- OSL_ENSURE( sal_False, "unsupported control class" );
+ OSL_FAIL( "unsupported control class" );
return;
}
@@ -411,7 +411,7 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
if ( !lpfnSetValue )
{
- OSL_ENSURE( sal_False, "unsupported control action" );
+ OSL_FAIL( "unsupported control action" );
return;
}
@@ -437,14 +437,14 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
// method the caller should use XFilterManager
if ( !hwndCtrl || (aControlId == LISTBOX_FILTER) )
{
- OSL_ENSURE( sal_False, "invalid control id" );
+ OSL_FAIL( "invalid control id" );
return Any( );
}
CTRL_CLASS aCtrlClass = GetCtrlClass( hwndCtrl );
if ( UNKNOWN == aCtrlClass )
{
- OSL_ENSURE( sal_False, "unsupported control class" );
+ OSL_FAIL( "unsupported control class" );
return Any( );
}
@@ -453,7 +453,7 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
if ( !lpfnGetValue )
{
- OSL_ENSURE( sal_False, "unsupported control action" );
+ OSL_FAIL( "unsupported control action" );
return Any( );
}
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index a3aaa20..e1b660e 100755
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -272,7 +272,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] )
// Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+ OSL_FAIL("Can't create RegistryServiceFactory");
return(-1);
}
@@ -363,7 +363,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_FAIL("Error shuting down");
}
// Dispose and clear factory
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 26d6d88..3c4f517 100755
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -252,7 +252,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
if ( WaitForSingleObject( m_hEvtThrdReady, MAX_WAITTIME ) != WAIT_OBJECT_0 )
{
- OSL_ENSURE( sal_False, "sta thread not ready" );
+ OSL_FAIL( "sta thread not ready" );
return sal_False;
}
@@ -721,7 +721,7 @@ unsigned int CMtaFolderPicker::run( )
// we stop here and return
if ( FAILED( hr ) )
{
- OSL_ENSURE( sal_False, "CoInitialize failed" );
+ OSL_FAIL( "CoInitialize failed" );
return sal::static_int_cast< unsigned int >(-1);
}
@@ -740,7 +740,7 @@ unsigned int CMtaFolderPicker::run( )
}
else
{
- OSL_ENSURE( sal_False, "failed to create sta thread" );
+ OSL_FAIL( "failed to create sta thread" );
nRet = sal::static_int_cast< unsigned int >(-1);
}
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 7f29598..d95e928 100755
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -110,7 +110,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ )
// Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+ OSL_FAIL("Can't create RegistryServiceFactory");
return(-1);
}
@@ -127,7 +127,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ )
if ( xFolderPicker.is() == sal_False )
{
- OSL_ENSURE( sal_False, "Error creating FolderPicker Service" );
+ OSL_FAIL( "Error creating FolderPicker Service" );
return(-1);
}
@@ -161,7 +161,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_FAIL("Error shuting down");
}
// Dispose and clear factory
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 6688320..e97e67a 100755
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -330,7 +330,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
// SAFE ->
aReadLock.lock();
if (!m_lInterceptionRegs.empty() )
- OSL_ENSURE(sal_False, "There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
+ OSL_FAIL("There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
aReadLock.unlock();
// <- SAFE
#endif // ODL_DEBUG_LEVEL>0
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 7b1a64d..2f1dc05 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1254,13 +1254,13 @@ throw (RuntimeException)
void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
throw (uno::RuntimeException)
{
- OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+ OSL_FAIL( "This method is obsolete and should not be used!\n" );
}
void SAL_CALL LayoutManager::resetInplaceMenuBar()
throw (uno::RuntimeException)
{
- OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+ OSL_FAIL( "This method is obsolete and should not be used!\n" );
}
//---------------------------------------------------------------------------------------------------------
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 7715035..73b5987 100755
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -329,7 +329,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
(bLockForAddRemoveVectorItems)
)
{
- OSL_ENSURE(sal_False, "Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
+ OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
throw css::uno::RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")),
m_xOwner);
@@ -356,7 +356,7 @@ void CacheLockGuard::unlock()
if (m_rCacheLock < 0)
{
- OSL_ENSURE(sal_False, "Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
+ OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
throw css::uno::RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
m_xOwner);
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 7246d5f..a610763 100755
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -176,7 +176,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
// save failed, but tell manager to go on if we havent yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
@@ -204,7 +204,7 @@ void SessionListener::QuitSessionQuietly()
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
}
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
return m_bRestored;
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 741b757..7892ee5 100755
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -392,7 +392,7 @@ sal_uInt32 CheckPasswd_Impl
}
else
{
- OSL_ENSURE( sal_False, "A storage must implement XPropertySet interface!" );
+ OSL_FAIL( "A storage must implement XPropertySet interface!" );
nRet = ERRCODE_SFX_CANTGETPASSWD;
}
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e2f1e1d..6c09670 100755
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -892,7 +892,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "It must be possible to set a common password for the storage" );
+ OSL_FAIL( "It must be possible to set a common password for the storage" );
// TODO/LATER: set the error code in case of problem
// SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
}
@@ -1249,7 +1249,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Unexpected problem by locking, high probability, that the content could not be created" );
+ OSL_FAIL( "Unexpected problem by locking, high probability, that the content could not be created" );
}
return bResult;
}
@@ -1443,7 +1443,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "No possibility to get readonly version of storage from medium!\n" );
+ OSL_FAIL( "No possibility to get readonly version of storage from medium!\n" );
}
if ( GetError() ) // do not remove warnings
@@ -1480,7 +1480,7 @@ void SfxMedium::CloseStorage()
xComp->dispose();
} catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Medium's storage is already disposed!\n" );
+ OSL_FAIL( "Medium's storage is already disposed!\n" );
}
}
@@ -1813,7 +1813,7 @@ void SfxMedium::Transfer_Impl()
{
// makes sence only in case logic name is set
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aNameURL ) )
- OSL_ENSURE( sal_False, "The medium name is not convertable!\n" );
+ OSL_FAIL( "The medium name is not convertable!\n" );
}
if ( aNameURL.Len() && ( !eError || (eError & ERRCODE_WARNING_MASK) ) )
@@ -2944,7 +2944,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
}
else
{
- OSL_ENSURE( sal_False, "Can not create a new temporary file for crash recovery!\n" );
+ OSL_FAIL( "Can not create a new temporary file for crash recovery!\n" );
}
}
}
@@ -3597,7 +3597,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Couldn't use signing functionality!\n" );
+ OSL_FAIL( "Couldn't use signing functionality!\n" );
}
CloseAndRelease();
@@ -3613,7 +3613,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Couldn't use signing functionality!\n" );
+ OSL_FAIL( "Couldn't use signing functionality!\n" );
}
}
}
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index c57b048..eda8f50 100755
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -211,7 +211,7 @@ namespace sfx2
nMacroExecutionMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
break;
default:
- OSL_ENSURE( sal_False, "DocumentMacroMode::adjustMacroMode: unexpected macro security level!" );
+ OSL_FAIL( "DocumentMacroMode::adjustMacroMode: unexpected macro security level!" );
nMacroExecutionMode = MacroExecMode::NEVER_EXECUTE;
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 8a8b2ea..45e8683 100755
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1407,13 +1407,13 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
}
catch( lang::IllegalArgumentException& )
{
- OSL_ENSURE( sal_False, "ModelData didn't handle illegal parameters, all the parameters are ignored!\n" );
+ OSL_FAIL( "ModelData didn't handle illegal parameters, all the parameters are ignored!\n" );
aModelData.GetStorable()->store();
}
}
else
{
- OSL_ENSURE( sal_False, "XStorable2 is not supported by the model!\n" );
+ OSL_FAIL( "XStorable2 is not supported by the model!\n" );
aModelData.GetStorable()->store();
}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 65514d6..ab8c6a5 100755
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -227,7 +227,7 @@ sal_Bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XClo
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Could not register close listener!\n" );
+ OSL_FAIL( "Could not register close listener!\n" );
}
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b725676..67bd107 100755
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -173,7 +173,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >&
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "The document seems to be in the collection already!\n" );
+ OSL_FAIL( "The document seems to be in the collection already!\n" );
}
}
}
@@ -418,7 +418,7 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can't check storage's mediatype!\n" );
+ OSL_FAIL( "Can't check storage's mediatype!\n" );
}
}
else
@@ -1412,7 +1412,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
xMedStorage ) )
{
// TODO: error handling
- OSL_ENSURE( sal_False, "Couldn't store thumbnail representation!" );
+ OSL_FAIL( "Couldn't store thumbnail representation!" );
}
}
@@ -1931,7 +1931,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
::rtl::OUString aMediaType;
if ( !(a>>=aMediaType) || !aMediaType.getLength() )
{
- OSL_ENSURE( sal_False, "The mediatype must be set already!\n" );
+ OSL_FAIL( "The mediatype must be set already!\n" );
SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False );
}
@@ -3410,7 +3410,7 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Cant check storage consistency!\n" );
+ OSL_FAIL( "Cant check storage consistency!\n" );
}
return sal_True;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 9b993f2..76e6b12 100755
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -408,7 +408,7 @@ SfxOwnFramesLocker::SfxOwnFramesLocker( SfxObjectShell* pObjectShell )
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Not possible to lock the frame window!\n" );
+ OSL_FAIL( "Not possible to lock the frame window!\n" );
}
}
}
@@ -452,7 +452,7 @@ void SfxOwnFramesLocker::UnlockFrames()
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can't unlock the frame window!\n" );
+ OSL_FAIL( "Can't unlock the frame window!\n" );
}
}
}
@@ -2579,7 +2579,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
}
else
{
- OSL_ENSURE( sal_False, "Unexpected scenario!\n" );
+ OSL_FAIL( "Unexpected scenario!\n" );
}
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 1f8abfe..121d2f8 100755
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -693,7 +693,7 @@ void SfxInPlaceClient::SetObjectState( sal_Int32 nState )
if ( m_pImp->m_nAspect == embed::Aspects::MSOLE_ICON
&& ( nState == embed::EmbedStates::UI_ACTIVE || nState == embed::EmbedStates::INPLACE_ACTIVE ) )
{
- OSL_ENSURE( sal_False, "Iconified object should not be activated inplace!\n" );
+ OSL_FAIL( "Iconified object should not be activated inplace!\n" );
return;
}
@@ -738,7 +738,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not clean the client site!\n" );
+ OSL_FAIL( "Can not clean the client site!\n" );
}
}
}
@@ -762,7 +762,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not set the client site!\n" );
+ OSL_FAIL( "Can not set the client site!\n" );
}
m_pImp->m_aTimer.Start();
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index e65deec..6828db6 100755
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -101,7 +101,7 @@ int SAL_CALL main(int, char*, char* )
// Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+ OSL_FAIL("Can't create RegistryServiceFactory");
return(-1);
}
@@ -118,7 +118,7 @@ int SAL_CALL main(int, char*, char* )
if ( !xProxySettings.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemProxySettings Service" );
+ OSL_FAIL( "Error creating SystemProxySettings Service" );
return(-1);
}
@@ -145,7 +145,7 @@ int SAL_CALL main(int, char*, char* )
if ( !xProxySettings.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemProxySettings Service" );
+ OSL_FAIL( "Error creating SystemProxySettings Service" );
return(-1);
}
@@ -187,7 +187,7 @@ int SAL_CALL main(int, char*, char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_FAIL("Error shuting down");
}
// Dispose and clear factory
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 09f1192..20a0ae7 100755
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -96,7 +96,7 @@ int SAL_CALL main(int , char*, char* )
// Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+ OSL_FAIL("Can't create RegistryServiceFactory");
return(-1);
}
@@ -113,7 +113,7 @@ int SAL_CALL main(int , char*, char* )
if ( !xSmplMailClientSuppl.is() )
{
- OSL_ENSURE( sal_False, "Error creating SimpleSystemMail Service" );
+ OSL_FAIL( "Error creating SimpleSystemMail Service" );
return(-1);
}
@@ -175,7 +175,7 @@ int SAL_CALL main(int , char*, char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_FAIL("Error shuting down");
}
// Dispose and clear factory
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 797947e..946dada 100755
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -106,7 +106,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+ OSL_FAIL("Can't create RegistryServiceFactory");
return(-1);
}
@@ -121,7 +121,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
if ( !xSysShExec.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemShellExecute Service" );
+ OSL_FAIL( "Error creating SystemShellExecute Service" );
return(-1);
}
@@ -135,11 +135,11 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
}
catch( SystemShellExecuteException& )
{
- OSL_ENSURE( sal_False, "Error executing system command" );
+ OSL_FAIL( "Error executing system command" );
}
catch( IllegalArgumentException& )
{
- OSL_ENSURE( sal_False, "Invalid parameter" );
+ OSL_FAIL( "Invalid parameter" );
}
//--------------------------------------------------
@@ -152,7 +152,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_FAIL("Error shuting down");
}
// Dispose and clear factory
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 3c93d42..9eac220 100755
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -302,7 +302,7 @@ void AccessibleControlShape::Init()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
+ OSL_FAIL( "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
}
}
@@ -430,7 +430,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent&
#if OSL_DEBUG_LEVEL > 0
else
{
- OSL_ENSURE( sal_False, "AccessibleControlShape::propertyChange: where did this come from?" );
+ OSL_FAIL( "AccessibleControlShape::propertyChange: where did this come from?" );
}
#endif
}
@@ -531,7 +531,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSour
}
#if OSL_DEBUG_LEVEL > 0
else
- OSL_ENSURE( sal_False, "AccessibleControlShape::modeChanged: where did this come from?" );
+ OSL_FAIL( "AccessibleControlShape::modeChanged: where did this come from?" );
#endif
}
@@ -561,12 +561,12 @@ sal_Bool AccessibleControlShape::ensureListeningState(
m_xControlModel->removePropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
}
else
- OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
+ OSL_FAIL( "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
}
catch( const Exception& e )
{
(void)e; // make compiler happy
- OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
+ OSL_FAIL( "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
}
return _bNeedNewListening;
@@ -682,7 +682,7 @@ void SAL_CALL AccessibleControlShape::disposing (void)
// stop listening at the control container (should never be necessary here, but who knows ....)
if ( m_bWaitingForControl )
{
- OSL_ENSURE( sal_False, "AccessibleControlShape::disposing: this should never happen!" );
+ OSL_FAIL( "AccessibleControlShape::disposing: this should never happen!" );
Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetWindow(), maShapeTreeInfo.GetSdrView() );
if ( xContainer.is() )
{
@@ -732,7 +732,7 @@ sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
catch( const Exception& e )
{
(void)e; // make compiler happy
- OSL_ENSURE( sal_False, "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
+ OSL_FAIL( "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
}
return m_xControlModel.is();
@@ -791,7 +791,7 @@ void AccessibleControlShape::stopStateMultiplexing()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
+ OSL_FAIL( "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
}
return sReturn;
}
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 4f6805f..fe8faaa 100755
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -123,7 +123,7 @@ namespace svx
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !");
+ OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !");
}
// If the data source is an SQL-statement and simple enough (means "select <field list> from <table> where ....")
@@ -151,7 +151,7 @@ namespace svx
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !");
+ OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !");
}
}
@@ -436,7 +436,7 @@ namespace svx
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !");
+ OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !");
return;
}
@@ -450,7 +450,7 @@ namespace svx
}
catch(Exception&)
{
- OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !");
+ OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !");
return;
}
@@ -561,7 +561,7 @@ namespace svx
return ODataAccessDescriptor(aDescriptorProps);
}
- OSL_ENSURE( sal_False, "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" );
+ OSL_FAIL( "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" );
return ODataAccessDescriptor();
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 476e790..0de0841 100755
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1539,7 +1539,7 @@ void FmGridControl::RowHeightChanged()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmGridControl::RowHeightChanged: caught an exception!" );
+ OSL_FAIL( "FmGridControl::RowHeightChanged: caught an exception!" );
}
}
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4a4ea09..9dd9245 100755
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -125,13 +125,13 @@ namespace
case awt::LineEndFormat::LINE_FEED: eFormat = LINEEND_LF; break;
case awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: eFormat = LINEEND_CRLF; break;
default:
- OSL_ENSURE( sal_False, "getModelLineEndSetting: what's this?" );
+ OSL_FAIL( "getModelLineEndSetting: what's this?" );
}
}
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "getModelLineEndSetting: caught an exception!" );
+ OSL_FAIL( "getModelLineEndSetting: caught an exception!" );
}
return eFormat;
}
@@ -1132,7 +1132,7 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "DbTextField::Init: caught an exception while determining the multi-line capabilities!" );
+ OSL_FAIL( "DbTextField::Init: caught an exception while determining the multi-line capabilities!" );
}
m_bIsSimpleEdit = !bIsMultiLine;
@@ -2942,7 +2942,7 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" );
(void)_rxModel;
- OSL_ENSURE( sal_False, "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" );
+ OSL_FAIL( "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" );
// TODO: implement this.
// remember: updateFromModel should be some kind of opposite of commitControl
}
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index dd1fca1..7b599c8 100755
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -156,7 +156,7 @@ namespace svx
xPropInfo = _rxValues->getPropertySetInfo();
if (!xPropInfo.is())
{
- OSL_ENSURE(sal_False, "ODADescriptorImpl::buildFrom: invalid property set!");
+ OSL_FAIL("ODADescriptorImpl::buildFrom: invalid property set!");
return sal_False;
}
@@ -406,7 +406,7 @@ namespace svx
{
if (!has(_eWhich))
{
- OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator[]: invalid acessor!");
+ OSL_FAIL("ODataAccessDescriptor::operator[]: invalid acessor!");
static const Any aDummy;
return aDummy;
}
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 5693b17..44476bb 100755
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -129,7 +129,7 @@ namespace svxform
if (NULL == s_pFactoryCreationFunc)
{ // did not find the symbol
- OSL_ENSURE(sal_False, "ODbtoolsClient::registerClient: could not find the symbol for creating the factory!");
+ OSL_FAIL("ODbtoolsClient::registerClient: could not find the symbol for creating the factory!");
osl_unloadModule(s_hDbtoolsModule);
s_hDbtoolsModule = NULL;
}
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 16b8604..1e5fee3 100755
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -287,7 +287,7 @@ void FmPropBrw::Resize()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::Resize: caught an exception!" );
+ OSL_FAIL( "FmPropBrw::Resize: caught an exception!" );
}
}
}
@@ -336,7 +336,7 @@ FmPropBrw::~FmPropBrw()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" );
+ OSL_FAIL( "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" );
}
return sCurrentPage;
}
@@ -356,7 +356,7 @@ void FmPropBrw::implDetachController()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::implDetachController: caught an exception while resetting the component!" );
+ OSL_FAIL( "FmPropBrw::implDetachController: caught an exception while resetting the component!" );
}
}
@@ -383,7 +383,7 @@ sal_Bool FmPropBrw::Close()
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::Close: caught an exception while asking the controller!" );
+ OSL_FAIL( "FmPropBrw::Close: caught an exception while asking the controller!" );
}
}
@@ -445,7 +445,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::implSetNewSelection: caught an unexpected exception!" );
+ OSL_FAIL( "FmPropBrw::implSetNewSelection: caught an unexpected exception!" );
return;
}
@@ -703,7 +703,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
+ OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
}
}
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index fbbd9eb..ffabe9e 100755
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -180,7 +180,7 @@ namespace svxform
if ( _nStatus & CONTROL_STATUS_MOUSE_HOVER )
return m_nMouseHoveColor;
- OSL_ENSURE( sal_False, "ControlBorderManager::getControlColorByStatus: invalid status!" );
+ OSL_FAIL( "ControlBorderManager::getControlColorByStatus: invalid status!" );
return 0x00000000;
}
@@ -256,7 +256,7 @@ namespace svxform
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusGained: caught an exception!" );
+ OSL_FAIL( "ControlBorderManager::controlStatusGained: caught an exception!" );
}
}
@@ -280,7 +280,7 @@ namespace svxform
}
catch( const Exception& )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list