diff options
136 files changed, 603 insertions, 785 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c61015d48422..4d5ab544e614 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 eacf1de91a9a..9238aed3d79f 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 acf6324a10f4..9f3476bd1c3e 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 37d1fa51a440..b11657fcc89e 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 09ebd2096b9c..870727b23b3b 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 b652f2662cf9..cc12fb78e4c9 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 2a95477918c7..b53be005a019 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 ba8ba3819e47..7730b8d4833f 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 97f3eeee6a0c..40824f1444e3 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 a5bb2c190186..200884e4de98 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 3d6168116212..531d2a913aa2 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 feb6074eff61..e8c7a41cd0bc 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 efb6735c318d..2ea1cb58b718 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 7d005bbf5fbe..425276ae3dda 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 2181de964ac4..6f7e05cb6b04 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 b276b1f06ff0..b60225907277 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 70df1622e8b1..a8cd887bc26b 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 4a98491450ba..f1ad57ceb0c4 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 58d6baad649e..5ad8ed3356e7 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 6756fd5a8447..622ba2c5a7d8 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 1ef4cf3ebe74..482f1f8bdd20 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 9a891affdd08..5721232a8abb 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 216dec207bb3..00bc6de6048e 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 177363509305..3fe542dfb95f 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 e541cc2f5dec..c3122159ccc3 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 3134b03d87ba..8442aa4d87cf 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 973a88357f46..bae9c5a12c73 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 897550350727..8c1e6744ac5a 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 d70703103967..36db7bc429bc 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 bc7a1219cdaa..0c55c6db4aff 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 8505a64064bf..aa4704031741 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 2fd53751a71f..6e2f26c771ec 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 2d4530cf1a9a..ab8e95055724 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 116f47104f63..fa114022897a 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 29b76d346a71..73604f5af707 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 2ca46ed1227e..5f5b997a9016 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 708142c679d5..a67ac4692797 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 d72ab4529ae2..638eb1eeeaf6 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 c5d744c541a1..b3584ace24cd 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 2b45ba7aefd4..341cafce10a9 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 72266e50b729..541c9e9585d0 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 39a35230a13b..05fe53d5d6f6 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 cafafec515ba..d6b019e662d1 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 bdcb1940151e..0da309845a6f 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 ee9336e2b6f6..f17fee6d437d 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 98c94d600937..9a874329281c 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 0f7dda31a26c..360061978bae 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 d2de0ac6d74b..f61ad675548a 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 16a8afd69c6a..93704c00d94c 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 eeba8c595940..fac8480da907 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 dedc63b3458a..ce8d26ac655d 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 379f5b771d50..5171ec064c85 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 899d8af2488c..8204b51cd930 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 7c5a90ca67db..c253de2f3227 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 8dc54239ad0e..c9db19b8ac5e 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 da7c776132b5..a8dd447f0266 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 ebc332ad8190..0514725f353c 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 72a7e5bc2046..47c6a8494065 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 20b6746476d8..a90196ad9180 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 31630d8d825a..e5c575298a87 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 c57b048816ed..eda8f50a122f 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 e41712c19038..b2f6dc7c4a7d 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 24d6309c4d95..589dacc54970 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 106455376b6f..f7bc738cd986 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 c0641eeb369d..ccfa7409252a 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 903e4d35ece8..0fa6c1d54e18 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 5cad1a2bd28d..6046d57e942c 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 d12a9708abca..9e00ef389ebf 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 b37059f5fdf5..d6b934f89708 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 e4721e9a5435..093ec77e369d 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 0612fbce0dcd..6d6f100714ae 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 1c6e978c1415..2dc7a3671f8c 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 35a15c082d49..e17b5afd9072 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 0bfd01b0ad10..f10546cf45c3 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 3aaac6b12ebf..cf36a7db03a6 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 76618c5ab42d..1dca627aac7d 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 e5120ab60266..bf9d0a45ac73 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& ) { - OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusLost: caught an exception!" ); + OSL_FAIL( "ControlBorderManager::controlStatusLost: caught an exception!" ); } } @@ -312,7 +312,7 @@ namespace svxform m_nInvalidColor = _nColor; break; default: - OSL_ENSURE( sal_False, "ControlBorderManager::setStatusColor: invalid status!" ); + OSL_FAIL( "ControlBorderManager::setStatusColor: invalid status!" ); } } @@ -432,7 +432,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlBorderManager::validityChanged: caught an exception!" ); + OSL_FAIL( "ControlBorderManager::validityChanged: caught an exception!" ); } } diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index c49db3344f8a..358b4d3fb578 100755 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -288,7 +288,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlLayouter::initializeControlLayout: caught an exception!" ); + OSL_FAIL( "ControlLayouter::initializeControlLayout: caught an exception!" ); } } diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index f22d204f0cea..4bcb76f6f710 100755 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -175,7 +175,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "DocumentClassification::classifyHostDocument: caught an exception!" ); + OSL_FAIL( "DocumentClassification::classifyHostDocument: caught an exception!" ); } return eType; diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index f6c618151d88..86fece89935a 100755 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -127,7 +127,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel) } catch( ::com::sun::star::uno::Exception const& ) { - OSL_ENSURE( sal_False, "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); + OSL_FAIL( "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); } } } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index a9e740d73baa..1134b3e5f2be 100755 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -628,7 +628,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( catch(const Exception& e) { (void)e; - OSL_ENSURE(sal_False, "FmFormPageImpl::findFormForDataSource: caught an exception!"); + OSL_FAIL("FmFormPageImpl::findFormForDataSource: caught an exception!"); } if (sLookupName == sFormDataSourceName) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index cd5dcf70d983..43c9d6f89da4 100755 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -754,7 +754,7 @@ bool FmXFormShell::impl_checkDisposed() const m_eDocumentType = DocumentClassification::classifyDocument( xModel ); else { - OSL_ENSURE( sal_False, "FmXFormShell::getDocumentType: can't determine the document type!" ); + OSL_FAIL( "FmXFormShell::getDocumentType: can't determine the document type!" ); m_eDocumentType = eTextDocument; // fallback, just to have a defined state } @@ -1011,7 +1011,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) if ( m_nLockSlotInvalidation ) { - OSL_ENSURE( sal_False, "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" ); + OSL_FAIL( "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" ); InvalidateSlot( _nId, sal_False ); } else @@ -1519,7 +1519,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" ); + OSL_FAIL( "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" ); } } diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index c773881cb3da..d73e80f17f08 100755 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -66,7 +66,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::FmTextControlFeature: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::FmTextControlFeature: caught an exception!" ); } osl_decrementInterlockedCount( &m_refCount ); } @@ -92,7 +92,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::dispatch: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::dispatch: caught an exception!" ); } } @@ -122,7 +122,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::dispose: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::dispose: caught an exception!" ); } } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 1b45aca85ae9..e0ee408c3305 100755 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -828,7 +828,7 @@ namespace svx } break; default: - OSL_ENSURE( sal_False, "FmTextControlShell::executeClipboardSlot: invalid slot!" ); + OSL_FAIL( "FmTextControlShell::executeClipboardSlot: invalid slot!" ); } return true; } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index c92a94c83f7f..ba335ba09209 100755 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -166,7 +166,7 @@ void displayException(const Any& _rExcept, Window* _pParent) } catch(Exception&) { - OSL_ENSURE(sal_False, "displayException: could not display the error message!"); + OSL_FAIL("displayException: could not display the error message!"); } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 491de86cc1e3..116e9c91e3d5 100755 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -613,7 +613,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) } catch(const Exception&) { - OSL_ENSURE(sal_False, "FmXUndoEnvironment::propertyChange: could not adjust the value property!"); + OSL_FAIL("FmXUndoEnvironment::propertyChange: could not adjust the value property!"); } } } @@ -942,7 +942,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" ); + OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" ); } } @@ -977,7 +977,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" ); + OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" ); } } @@ -1056,7 +1056,7 @@ void FmUndoPropertyAction::Undo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoPropertyAction::Undo: caught an exception!" ); + OSL_FAIL( "FmUndoPropertyAction::Undo: caught an exception!" ); } rEnv.UnLock(); } @@ -1077,7 +1077,7 @@ void FmUndoPropertyAction::Redo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoPropertyAction::Redo: caught an exception!" ); + OSL_FAIL( "FmUndoPropertyAction::Redo: caught an exception!" ); } rEnv.UnLock(); } @@ -1239,7 +1239,7 @@ void FmUndoContainerAction::Undo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoContainerAction::Undo: caught an exception!" ); + OSL_FAIL( "FmUndoContainerAction::Undo: caught an exception!" ); } rEnv.UnLock(); } @@ -1268,7 +1268,7 @@ void FmUndoContainerAction::Redo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoContainerAction::Redo: caught an exception!" ); + OSL_FAIL( "FmUndoContainerAction::Redo: caught an exception!" ); } rEnv.UnLock(); } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 47c7b56da557..8e41b884c8ff 100755 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -232,7 +232,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "lcl_getDataSourceIndirectProperties: caught an exception!" ); + OSL_FAIL( "lcl_getDataSourceIndirectProperties: caught an exception!" ); } return aInfo; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index e7fd90ec4a89..952b76bf9b46 100755 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3659,7 +3659,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo return *pControls; } } - OSL_ENSURE( sal_False, "FormController::locateControl: did not find a control for this model!" ); + OSL_FAIL( "FormController::locateControl: did not find a control for this model!" ); } catch( const Exception& ) { @@ -4220,7 +4220,7 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene } } else - OSL_ENSURE(sal_False, "FormController::addStatusListener: invalid (unsupported) URL!"); + OSL_FAIL("FormController::addStatusListener: invalid (unsupported) URL!"); } //------------------------------------------------------------------------------ diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index b7277ce6dd6c..c401f41c0588 100755 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -125,7 +125,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught an exception!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught an exception!" ); } } else @@ -141,12 +141,12 @@ namespace svx } catch( const DisposedException& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" ); aIter.remove( ); } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" ); } } } diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 472251807b68..ef187ef0eea5 100755 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -82,7 +82,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormToolboxes::toggleToolbox: caught an exception!" ); + OSL_FAIL( "FormToolboxes::toggleToolbox: caught an exception!" ); } } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 7be4672902d4..62dcb8486c4f 100755 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -257,13 +257,13 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } catch( embed::NoVisualAreaSizeException& ) { - OSL_ENSURE( sal_False, "No visual area size!\n" ); + OSL_FAIL( "No visual area size!\n" ); aSz.Width = 5000; aSz.Height = 5000; } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Unexpected exception!\n" ); + OSL_FAIL( "Unexpected exception!\n" ); aSz.Width = 5000; aSz.Height = 5000; } @@ -290,7 +290,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Unexpected exception!\n" ); + OSL_FAIL( "Unexpected exception!\n" ); } } } diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 7110c98a8f0e..13b3a138d993 100755 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -211,7 +211,7 @@ SdrUnoObj::~SdrUnoObj() } catch( const uno::Exception& ) { - OSL_ENSURE( sal_False, "SdrUnoObj::~SdrUnoObj: caught an exception!" ); + OSL_FAIL( "SdrUnoObj::~SdrUnoObj: caught an exception!" ); } delete m_pImpl; } diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 59e9240b7ff4..c4aa2c1c07ce 100755 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -103,7 +103,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ToolboxAccess::toggleToolbox: caught an exception!" ); + OSL_FAIL( "ToolboxAccess::toggleToolbox: caught an exception!" ); } } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index a39dc2b802e9..649cc8d772b5 100755 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -153,7 +153,7 @@ void SAL_CALL RecoveryUI::dispatch(const css::util::URL& void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException) { // TODO - OSL_ENSURE(sal_False, "RecoveryUI::addStatusListener()\nNot implemented yet!"); + OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!"); } //=============================================== @@ -161,7 +161,7 @@ void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::f throw(css::uno::RuntimeException) { // TODO - OSL_ENSURE(sal_False, "RecoveryUI::removeStatusListener()\nNot implemented yet!"); + OSL_FAIL("RecoveryUI::removeStatusListener()\nNot implemented yet!"); } //=============================================== diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 9a7c2e6fd44a..4c35829b509b 100755 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -167,7 +167,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Couldn't set the visual area for the object!\n" ); + OSL_FAIL( "Couldn't set the visual area for the object!\n" ); } } diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index c4e2f8bb113e..f927c658d426 100755 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -74,7 +74,7 @@ if( !m_aCache.hasRow( nRow ) ) \ { \ if( !m_xFetchProvider.is() ) \ { \ - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); \ + OSL_FAIL( "broadcaster was disposed already" ); \ throw SQLException(); \ } \ aGuard.clear(); \ @@ -469,7 +469,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo( } else { - OSL_ENSURE( sal_False, "The received XPropertySetInfo doesn't contain required properties" ); + OSL_FAIL( "The received XPropertySetInfo doesn't contain required properties" ); m_pProperties = new Sequence<Property>; } @@ -630,7 +630,7 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo if( !m_pProperties ) { - OSL_ENSURE( sal_False, "Properties not initialized yet" ); + OSL_FAIL( "Properties not initialized yet" ); return nHandle; } sal_Bool bFound = sal_True; @@ -727,7 +727,7 @@ sal_Bool SAL_CALL CachedContentResultSet OSL_ENSURE( nRow >= 0, "only positive values supported" ); if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } // OSL_ENSURE( nRow <= m_nKnownCount, "don't step into regions you don't know with this method" ); @@ -995,7 +995,7 @@ void SAL_CALL CachedContentResultSet if( !getPropertySetInfo().is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } @@ -1086,7 +1086,7 @@ void SAL_CALL CachedContentResultSet osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return; } } @@ -1106,7 +1106,7 @@ Any SAL_CALL CachedContentResultSet if( !getPropertySetInfo().is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } @@ -1145,7 +1145,7 @@ Any SAL_CALL CachedContentResultSet osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } } @@ -1204,7 +1204,7 @@ void SAL_CALL CachedContentResultSet sal_Int32 nNew = 0; if( !( aEvt.NewValue >>= nNew ) ) { - OSL_ENSURE( sal_False, "PropertyChangeEvent contains wrong data" ); + OSL_FAIL( "PropertyChangeEvent contains wrong data" ); return; } @@ -1218,7 +1218,7 @@ void SAL_CALL CachedContentResultSet sal_Bool bNew = sal_False; if( !( aEvt.NewValue >>= bNew ) ) { - OSL_ENSURE( sal_False, "PropertyChangeEvent contains wrong data" ); + OSL_FAIL( "PropertyChangeEvent contains wrong data" ); return; } impl_changeIsRowCountFinal( m_bFinalCount, bNew ); @@ -1270,7 +1270,7 @@ if( !m_aCache##XXX.hasRow( nRow ) ) \ { \ if( !m_xFetchProviderForContentAccess.is() ) \ { \ - OSL_ENSURE( sal_False, "broadcaster was disposed already" );\ + OSL_FAIL( "broadcaster was disposed already" );\ throw RuntimeException(); \ } \ aGuard.clear(); \ @@ -1423,7 +1423,7 @@ sal_Bool SAL_CALL CachedContentResultSet if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } if( row < 0 ) @@ -1635,7 +1635,7 @@ sal_Bool SAL_CALL CachedContentResultSet //unknown position if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } aGuard.clear(); @@ -1713,7 +1713,7 @@ sal_Bool SAL_CALL CachedContentResultSet if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } aGuard.clear(); @@ -1748,7 +1748,7 @@ sal_Bool SAL_CALL CachedContentResultSet if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } aGuard.clear(); @@ -1922,7 +1922,7 @@ sal_Bool SAL_CALL CachedContentResultSet return m_bLastCachedReadWasNull; if( !m_xRowOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return sal_False; } } @@ -2078,7 +2078,7 @@ Any SAL_CALL CachedContentResultSet { if( !m_xFetchProvider.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return Any(); } aGuard.clear(); diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index a381911d53da..dd43d8680261 100755 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -187,7 +187,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub, impl_EnsureNotDisposed(); \ if( !m_xResultSetOrigin.is() ) \ { \ - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); \ + OSL_FAIL( "broadcaster was disposed already" ); \ throw RuntimeException(); \ } \ impl_propagateFetchSizeAndDirection( nRowCount, bDirection ); \ @@ -325,7 +325,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub } catch( SQLException& ) { - OSL_ENSURE( sal_False, "couldn't determine the column count" ); + OSL_FAIL( "couldn't determine the column count" ); nCount = 0; } } diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 60a824c8351c..a66c288276e2 100755 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -327,7 +327,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper impl_init_xPropertySetOrigin(); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); m_nForwardOnly = 0; return m_nForwardOnly; } @@ -388,7 +388,7 @@ void SAL_CALL ContentResultSetWrapper } catch( Exception& ) { - OSL_ENSURE( sal_False, "could not remove PropertyChangeListener" ); + OSL_FAIL( "could not remove PropertyChangeListener" ); } try { @@ -397,7 +397,7 @@ void SAL_CALL ContentResultSetWrapper } catch( Exception& ) { - OSL_ENSURE( sal_False, "could not remove VetoableChangeListener" ); + OSL_FAIL( "could not remove VetoableChangeListener" ); } Reference< XComponent > xComponentOrigin( m_xResultSetOrigin, UNO_QUERY ); @@ -545,7 +545,7 @@ void SAL_CALL ContentResultSetWrapper impl_init_xPropertySetOrigin(); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } m_xPropertySetOrigin->setPropertyValue( rPropertyName, rValue ); @@ -563,7 +563,7 @@ Any SAL_CALL ContentResultSetWrapper impl_init_xPropertySetOrigin(); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } return m_xPropertySetOrigin->getPropertyValue( rPropertyName ); @@ -583,7 +583,7 @@ void SAL_CALL ContentResultSetWrapper if( !getPropertySetInfo().is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } @@ -604,7 +604,7 @@ void SAL_CALL ContentResultSetWrapper osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return; } } @@ -635,7 +635,7 @@ void SAL_CALL ContentResultSetWrapper if( !getPropertySetInfo().is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw UnknownPropertyException(); } if( rPropertyName.getLength() ) @@ -655,7 +655,7 @@ void SAL_CALL ContentResultSetWrapper osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return; } } @@ -715,7 +715,7 @@ void SAL_CALL ContentResultSetWrapper osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return; } } @@ -726,7 +726,7 @@ void SAL_CALL ContentResultSetWrapper } catch( Exception& ) { - OSL_ENSURE( sal_False, "could not remove PropertyChangeListener" ); + OSL_FAIL( "could not remove PropertyChangeListener" ); } } } @@ -774,7 +774,7 @@ void SAL_CALL ContentResultSetWrapper osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( !m_xPropertySetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); return; } } @@ -785,7 +785,7 @@ void SAL_CALL ContentResultSetWrapper } catch( Exception& ) { - OSL_ENSURE( sal_False, "could not remove VetoableChangeListener" ); + OSL_FAIL( "could not remove VetoableChangeListener" ); } } } @@ -860,7 +860,7 @@ OUString SAL_CALL ContentResultSetWrapper impl_init_xContentAccessOrigin(); if( !m_xContentAccessOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xContentAccessOrigin->queryContentIdentifierString(); @@ -876,7 +876,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper impl_init_xContentAccessOrigin(); if( !m_xContentAccessOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xContentAccessOrigin->queryContentIdentifier(); @@ -892,7 +892,7 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper impl_init_xContentAccessOrigin(); if( !m_xContentAccessOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xContentAccessOrigin->queryContent(); @@ -912,7 +912,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->next(); @@ -928,7 +928,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->previous(); @@ -944,7 +944,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->absolute( row ); @@ -960,7 +960,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->relative( rows ); @@ -977,7 +977,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->first(); @@ -993,7 +993,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->last(); @@ -1009,7 +1009,7 @@ void SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } m_xResultSetOrigin->beforeFirst(); @@ -1025,7 +1025,7 @@ void SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } m_xResultSetOrigin->afterLast(); @@ -1041,7 +1041,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->isAfterLast(); @@ -1057,7 +1057,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->isBeforeFirst(); @@ -1073,7 +1073,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->isFirst(); @@ -1089,7 +1089,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->isLast(); @@ -1106,7 +1106,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->getRow(); @@ -1122,7 +1122,7 @@ void SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } m_xResultSetOrigin->refreshRow(); @@ -1138,7 +1138,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->rowUpdated(); @@ -1153,7 +1153,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->rowInserted(); @@ -1169,7 +1169,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper if( !m_xResultSetOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xResultSetOrigin->rowDeleted(); @@ -1195,7 +1195,7 @@ impl_EnsureNotDisposed(); \ impl_init_xRowOrigin(); \ if( !m_xRowOrigin.is() ) \ { \ - OSL_ENSURE( sal_False, "broadcaster was disposed already" );\ + OSL_FAIL( "broadcaster was disposed already" );\ throw RuntimeException(); \ } \ return m_xRowOrigin->getXXX( columnIndex ); @@ -1210,7 +1210,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper impl_init_xRowOrigin(); if( !m_xRowOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xRowOrigin->wasNull(); @@ -1359,7 +1359,7 @@ Any SAL_CALL ContentResultSetWrapper impl_init_xRowOrigin(); if( !m_xRowOrigin.is() ) { - OSL_ENSURE( sal_False, "broadcaster was disposed already" ); + OSL_FAIL( "broadcaster was disposed already" ); throw RuntimeException(); } return m_xRowOrigin->getObject( columnIndex, typeMap ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 3574c6813da7..75d655be2f84 100755 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -276,7 +276,7 @@ void SAL_CALL DynamicResultSetWrapper } else { - OSL_ENSURE( sal_False, "ListActionType was WELCOME but ActionInfo didn't contain a WelcomeDynamicResultSetStruct" ); + OSL_FAIL( "ListActionType was WELCOME but ActionInfo didn't contain a WelcomeDynamicResultSetStruct" ); //throw RuntimeException(); } break; @@ -444,7 +444,7 @@ void SAL_CALL DynamicResultSetWrapper return; } } - OSL_ENSURE( sal_False, "could not connect to cache" ); + OSL_FAIL( "could not connect to cache" ); throw ServiceNotFoundException(); } diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 8233a3300d9d..6e2c562f4903 100755 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -257,8 +257,7 @@ sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds( if ( xProvider.is() ) return xProvider->compareContentIds( Id1, Id2 ); - // OSL_ENSURE( sal_False, - // "UcbContentProviderProxy::compareContentIds - No provider!" ); + // OSL_FAIL( // "UcbContentProviderProxy::compareContentIds - No provider!" ); // @@@ What else? return 0; @@ -320,8 +319,7 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template, } catch ( IllegalIdentifierException const & ) { - OSL_ENSURE( sal_False, - "UcbContentProviderProxy::deregisterInstance - " + OSL_FAIL( "UcbContentProviderProxy::deregisterInstance - " "Caught IllegalIdentifierException!" ); } } @@ -383,8 +381,7 @@ UcbContentProviderProxy::getContentProvider() } catch ( IllegalIdentifierException const & ) { - OSL_ENSURE( sal_False, - "UcbContentProviderProxy::getContentProvider - " + OSL_FAIL( "UcbContentProviderProxy::getContentProvider - " "Caught IllegalIdentifierException!" ); } diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 488fcbfcd731..ce618d03b92b 100755 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -466,8 +466,7 @@ NameClashContinuation interactiveNameClashResolve( } else { - OSL_ENSURE( sal_False, - "Unknown interaction continuation!" ); + OSL_FAIL( "Unknown interaction continuation!" ); return UNKNOWN; } } @@ -510,7 +509,7 @@ bool setTitle( if ( aErrors[ 0 ].hasValue() ) { // error occurred. - OSL_ENSURE( sal_False, "error setting Title property!" ); + OSL_FAIL( "error setting Title property!" ); return false; } } @@ -1008,7 +1007,7 @@ uno::Reference< io::XInputStream > getInputStream( } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, "unable to get input stream from document!" ); + OSL_FAIL( "unable to get input stream from document!" ); } } @@ -1055,7 +1054,7 @@ uno::Reference< sdbc::XResultSet > getResultSet( } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, "unable to get result set from folder!" ); + OSL_FAIL( "unable to get result set from folder!" ); } return xResultSet; @@ -1412,7 +1411,7 @@ void globalTransfer_( default: aArg.ReplaceExisting = sal_False; - OSL_ENSURE( sal_False, "Unknown nameclash directive!" ); + OSL_FAIL( "Unknown nameclash directive!" ); break; } @@ -2083,7 +2082,7 @@ void UniversalContentBroker::globalTransfer( } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, "Cannot delete source object!" ); + OSL_FAIL( "Cannot delete source object!" ); throw; } } diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index a35de4af8e2a..b873d51e60f0 100755 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -400,8 +400,7 @@ Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() { if ( nSize <= nPos ) { - OSL_ENSURE( sal_False, - "UcbPropertiesManager::getProperties - " + OSL_FAIL( "UcbPropertiesManager::getProperties - " "Initial size of property sequence too small!" ); m_pProps->realloc( 128 ); diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 1e8aeda7df0b..90ddde25e9cb 100755 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -481,38 +481,33 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) { // insertByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - " + OSL_FAIL( "PropertySetRegistry::openPropertySet - " "caught IllegalArgumentException!" ); } catch ( ElementExistException& ) { // insertByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - " + OSL_FAIL( "PropertySetRegistry::openPropertySet - " "caught ElementExistException!" ); } catch ( WrappedTargetException& ) { // insertByName, commitChanges - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - " + OSL_FAIL( "PropertySetRegistry::openPropertySet - " "caught WrappedTargetException!" ); } catch ( RuntimeException& ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - " + OSL_FAIL( "PropertySetRegistry::openPropertySet - " "caught RuntimeException!" ); } catch ( Exception& ) { // createInstance - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - " + OSL_FAIL( "PropertySetRegistry::openPropertySet - " "caught Exception!" ); } } @@ -524,8 +519,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) } } - OSL_ENSURE( sal_False, - "PropertySetRegistry::openPropertySet - Error!" ); + OSL_FAIL( "PropertySetRegistry::openPropertySet - Error!" ); } } @@ -577,8 +571,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) { // removeByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::removePropertySet - " + OSL_FAIL( "PropertySetRegistry::removePropertySet - " "caught NoSuchElementException!" ); return; } @@ -586,8 +579,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) { // commitChanges - OSL_ENSURE( sal_False, - "PropertySetRegistry::removePropertySet - " + OSL_FAIL( "PropertySetRegistry::removePropertySet - " "caught WrappedTargetException!" ); return; } @@ -596,7 +588,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) return; } - OSL_ENSURE( sal_False, "PropertySetRegistry::removePropertySet - Error!" ); + OSL_FAIL( "PropertySetRegistry::removePropertySet - Error!" ); } //========================================================================= @@ -743,8 +735,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, // New key not present? if ( xRootNameAccess->hasByName( rNewKey ) ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "New key exists!" ); return; } @@ -789,8 +780,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught IllegalArgumentException!" ); return; } @@ -798,8 +788,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught ElementExistException!" ); return; } @@ -807,15 +796,13 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName, commitChanges - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught WrappedTargetException!" ); return; } catch ( RuntimeException& ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught RuntimeException!" ); return; } @@ -823,8 +810,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // createInstance - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught Exception!" ); return; } @@ -837,8 +823,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, xRootNameAccess, UNO_QUERY ); if ( !xRootHierNameAccess.is() ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "No hierarchical name access!" ); return; } @@ -855,8 +840,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, >>= xOldNameAccess; if ( !xOldNameAccess.is() ) { - OSL_ENSURE( sal_False, - "PersistentPropertySet::renamePropertySet - " + OSL_FAIL( "PersistentPropertySet::renamePropertySet - " "No old name access!" ); return; } @@ -877,8 +861,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, >>= xNewFac; if ( !xNewFac.is() ) { - OSL_ENSURE( sal_False, - "PersistentPropertySet::renamePropertySet - " + OSL_FAIL( "PersistentPropertySet::renamePropertySet - " "No new factory!" ); return; } @@ -887,8 +870,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, xNewFac, UNO_QUERY ); if ( !xNewContainer.is() ) { - OSL_ENSURE( sal_False, - "PersistentPropertySet::renamePropertySet - " + OSL_FAIL( "PersistentPropertySet::renamePropertySet - " "No new container!" ); return; } @@ -910,8 +892,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, if ( !xNewPropNameReplace.is() ) { - OSL_ENSURE( sal_False, - "PersistentPropertySet::renamePropertySet - " + OSL_FAIL( "PersistentPropertySet::renamePropertySet - " "No new prop name replace!" ); return; } @@ -975,8 +956,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName, replaceByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught IllegalArgumentException!" ); return; } @@ -984,8 +964,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught ElementExistException!" ); return; } @@ -993,8 +972,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // insertByName, replaceByName, commitChanges - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught WrappedTargetException!" ); return; } @@ -1002,15 +980,13 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // getByHierarchicalName, replaceByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught NoSuchElementException!" ); return; } catch ( RuntimeException& ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught RuntimeException!" ); return; } @@ -1018,8 +994,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // createInstance - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught Exception!" ); return; } @@ -1042,8 +1017,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // removeByName - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught NoSuchElementException!" ); return; } @@ -1051,8 +1025,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, { // commitChanges - OSL_ENSURE( sal_False, - "PropertySetRegistry::renamePropertySet - " + OSL_FAIL( "PropertySetRegistry::renamePropertySet - " "caught WrappedTargetException!" ); return; } @@ -1060,7 +1033,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, } } - OSL_ENSURE( sal_False, "PropertySetRegistry::renamePropertySet - Error!" ); + OSL_FAIL( "PropertySetRegistry::renamePropertySet - Error!" ); } //========================================================================= @@ -1101,8 +1074,7 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider() } catch ( Exception& ) { - OSL_ENSURE( sal_False, - "PropertySetRegistry::getConfigProvider - " + OSL_FAIL( "PropertySetRegistry::getConfigProvider - " "caught exception!" ); } } @@ -1123,8 +1095,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess() { if ( m_pImpl->m_bTriedToGetRootReadAccess ) // #82494# { - OSL_ENSURE( sal_False, - "PropertySetRegistry::getRootConfigReadAccess - " + OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - " "Unable to read any config data! -> #82494#" ); return Reference< XInterface >(); } @@ -1166,13 +1137,11 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess() { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, - "PropertySetRegistry::getRootConfigReadAccess - caught Exception!" ); + OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - caught Exception!" ); return Reference< XInterface >(); } - OSL_ENSURE( sal_False, - "PropertySetRegistry::getRootConfigReadAccess - Error!" ); + OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - Error!" ); return Reference< XInterface >(); } @@ -1188,8 +1157,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( { if ( m_pImpl->m_bTriedToGetRootWriteAccess ) // #82494# { - OSL_ENSURE( sal_False, - "PropertySetRegistry::getConfigWriteAccess - " + OSL_FAIL( "PropertySetRegistry::getConfigWriteAccess - " "Unable to write any config data! -> #82494#" ); return Reference< XInterface >(); } @@ -1256,8 +1224,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PropertySetRegistry::getConfigWriteAccess - " + OSL_FAIL( "PropertySetRegistry::getConfigWriteAccess - " "caught NoSuchElementException!" ); return Reference< XInterface >(); } @@ -1265,14 +1232,12 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, - "PropertySetRegistry::getConfigWriteAccess - " + OSL_FAIL( "PropertySetRegistry::getConfigWriteAccess - " "caught Exception!" ); return Reference< XInterface >(); } - OSL_ENSURE( sal_False, - "PropertySetRegistry::getConfigWriteAccess - Error!" ); + OSL_FAIL( "PropertySetRegistry::getConfigWriteAccess - Error!" ); return Reference< XInterface >(); } @@ -1674,8 +1639,7 @@ void SAL_CALL PersistentPropertySet::addVetoableChangeListener( RuntimeException ) { // load(); -// OSL_ENSURE( sal_False, -// "PersistentPropertySet::addVetoableChangeListener - N.Y.I." ); +// OSL_FAIL( // "PersistentPropertySet::addVetoableChangeListener - N.Y.I." ); } //========================================================================= @@ -1688,8 +1652,7 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( RuntimeException ) { // load(); -// OSL_ENSURE( sal_False, -// "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." ); +// OSL_FAIL( // "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." ); } //========================================================================= @@ -1868,8 +1831,7 @@ void SAL_CALL PersistentPropertySet::addProperty( { // insertByName - OSL_ENSURE( sal_False, - "PersistentPropertySet::addProperty - " + OSL_FAIL( "PersistentPropertySet::addProperty - " "caught IllegalArgumentException!" ); return; } @@ -1877,8 +1839,7 @@ void SAL_CALL PersistentPropertySet::addProperty( { // insertByName - OSL_ENSURE( sal_False, - "PersistentPropertySet::addProperty - " + OSL_FAIL( "PersistentPropertySet::addProperty - " "caught ElementExistException!" ); return; } @@ -1886,8 +1847,7 @@ void SAL_CALL PersistentPropertySet::addProperty( { // replaceByName, insertByName, commitChanges - OSL_ENSURE( sal_False, - "PersistentPropertySet::addProperty - " + OSL_FAIL( "PersistentPropertySet::addProperty - " "caught WrappedTargetException!" ); return; } @@ -1899,15 +1859,13 @@ void SAL_CALL PersistentPropertySet::addProperty( { // createInstance - OSL_ENSURE( sal_False, - "PersistentPropertySet::addProperty - " + OSL_FAIL( "PersistentPropertySet::addProperty - " "caught Exception!" ); return; } } - OSL_ENSURE( sal_False, - "PersistentPropertySet::addProperty - Error!" ); + OSL_FAIL( "PersistentPropertySet::addProperty - Error!" ); } //========================================================================= @@ -1953,8 +1911,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) } else { - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - " + OSL_FAIL( "PersistentPropertySet::removeProperty - " "No attributes!" ); return; } @@ -1963,8 +1920,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - " + OSL_FAIL( "PersistentPropertySet::removeProperty - " "caught NoSuchElementException!" ); } @@ -2010,8 +1966,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - " + OSL_FAIL( "PersistentPropertySet::removeProperty - " "caught NoSuchElementException!" ); nHandle = -1; } @@ -2043,8 +1998,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) { // removeByName - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - " + OSL_FAIL( "PersistentPropertySet::removeProperty - " "caught NoSuchElementException!" ); return; } @@ -2052,16 +2006,14 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) { // commitChanges - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - " + OSL_FAIL( "PersistentPropertySet::removeProperty - " "caught WrappedTargetException!" ); return; } } } - OSL_ENSURE( sal_False, - "PersistentPropertySet::removeProperty - Error!" ); + OSL_FAIL( "PersistentPropertySet::removeProperty - Error!" ); } //========================================================================= @@ -2158,16 +2110,14 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() aHierName ); if ( !( aKeyValue >>= rValue.Handle ) ) - OSL_ENSURE( sal_False, - "PersistentPropertySet::getPropertyValues - " + OSL_FAIL( "PersistentPropertySet::getPropertyValues - " "Error getting property handle!" ); } catch ( NoSuchElementException& ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PersistentPropertySet::getPropertyValues - " + OSL_FAIL( "PersistentPropertySet::getPropertyValues - " "NoSuchElementException!" ); } @@ -2188,8 +2138,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PersistentPropertySet::getPropertyValues - " + OSL_FAIL( "PersistentPropertySet::getPropertyValues - " "NoSuchElementException!" ); } @@ -2204,8 +2153,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() sal_Int32 nState = 0; if ( !( aKeyValue >>= nState ) ) - OSL_ENSURE( sal_False, - "PersistentPropertySet::getPropertyValues - " + OSL_FAIL( "PersistentPropertySet::getPropertyValues - " "Error getting property state!" ); else rValue.State = PropertyState( nState ); @@ -2214,8 +2162,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PersistentPropertySet::getPropertyValues - " + OSL_FAIL( "PersistentPropertySet::getPropertyValues - " "NoSuchElementException!" ); } } @@ -2359,8 +2306,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( return; } - OSL_ENSURE( sal_False, - "PersistentPropertySet::setPropertyValues - Nothing set!" ); + OSL_FAIL( "PersistentPropertySet::setPropertyValues - Nothing set!" ); } //========================================================================= @@ -2567,16 +2513,14 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() aHierName ); if ( !( aKeyValue >>= rProp.Handle ) ) - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getProperties - " + OSL_FAIL( "PropertySetInfo_Impl::getProperties - " "Error getting property handle!" ); } catch ( NoSuchElementException& ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getProperties - " + OSL_FAIL( "PropertySetInfo_Impl::getProperties - " "NoSuchElementException!" ); } @@ -2599,8 +2543,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getProperties - " + OSL_FAIL( "PropertySetInfo_Impl::getProperties - " "NoSuchElementException!" ); } @@ -2618,16 +2561,14 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() rProp.Attributes = sal_Int16( nAttribs ); else - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getProperties - " + OSL_FAIL( "PropertySetInfo_Impl::getProperties - " "Error getting property attributes!" ); } catch ( NoSuchElementException& ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getProperties - " + OSL_FAIL( "PropertySetInfo_Impl::getProperties - " "NoSuchElementException!" ); } } @@ -2645,7 +2586,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() } } - OSL_ENSURE( sal_False, "PropertySetInfo_Impl::getProperties - Error!" ); + OSL_FAIL( "PropertySetInfo_Impl::getProperties - Error!" ); m_pProps = new Sequence< Property >( 0 ); } @@ -2682,8 +2623,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( if ( !( xRootHierNameAccess->getByHierarchicalName( aKey ) >>= aProp.Handle ) ) { - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getPropertyByName - " + OSL_FAIL( "PropertySetInfo_Impl::getPropertyByName - " "No handle!" ); return Property(); } @@ -2695,8 +2635,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( Any aValue = xRootHierNameAccess->getByHierarchicalName( aKey ); if ( !aValue.hasValue() ) { - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getPropertyByName - " + OSL_FAIL( "PropertySetInfo_Impl::getPropertyByName - " "No Value!" ); return Property(); } @@ -2713,8 +2652,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( aProp.Attributes = sal_Int16( nAttribs ); else { - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getPropertyByName - " + OSL_FAIL( "PropertySetInfo_Impl::getPropertyByName - " "No attributes!" ); return Property(); } @@ -2729,14 +2667,13 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( { // getByHierarchicalName - OSL_ENSURE( sal_False, - "PropertySetInfo_Impl::getPropertyByName - " + OSL_FAIL( "PropertySetInfo_Impl::getPropertyByName - " "caught NoSuchElementException!" ); } } - OSL_ENSURE( sal_False, "PropertySetInfo_Impl::getPropertyByName - Error!" ); + OSL_FAIL( "PropertySetInfo_Impl::getPropertyByName - Error!" ); return Property(); } diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index f0a6bb3fb516..f68ac8037e20 100755 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -1236,7 +1236,7 @@ long SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne, } default: { - OSL_ENSURE( sal_False, "DataType not supported for compare!" ); + OSL_FAIL( "DataType not supported for compare!" ); } } @@ -1461,7 +1461,7 @@ void SortedResultSet::Initialize( nIndex++; } } - catch ( SQLException ) { OSL_ENSURE( sal_False, "SortedResultSet::Initialize() : Got unexpected SQLException" ); } + catch ( SQLException ) { OSL_FAIL( "SortedResultSet::Initialize() : Got unexpected SQLException" ); } // when we have fetched all the elements, we can create the // original to sorted mapping list from the s2o list @@ -1693,7 +1693,7 @@ void SortedResultSet::BuildSortInfo( if ( ! xMeta.is() ) { - OSL_ENSURE( sal_False, "No MetaData, No Sorting!" ); + OSL_FAIL( "No MetaData, No Sorting!" ); return; } @@ -1816,7 +1816,7 @@ void SortedResultSet::ResortModified( EventList* pList ) } } } - catch ( SQLException ) { OSL_ENSURE( sal_False, "SortedResultSet::ResortModified() : Got unexpected SQLException" ); } + catch ( SQLException ) { OSL_FAIL( "SortedResultSet::ResortModified() : Got unexpected SQLException" ); } maModList.Clear(); } @@ -1849,7 +1849,7 @@ void SortedResultSet::ResortNew( EventList* pList ) pList->AddEvent( ListActionType::INSERTED, nNewPos, 1 ); } } - catch ( SQLException ) { OSL_ENSURE( sal_False, "SortedResultSet::ResortNew() : Got unexpected SQLException" ); } + catch ( SQLException ) { OSL_FAIL( "SortedResultSet::ResortNew() : Got unexpected SQLException" ); } } //------------------------------------------------------------------------- @@ -1930,12 +1930,12 @@ long SortedEntryList::operator [] ( long nPos ) const return pData->mnCurPos; else { - OSL_ENSURE( sal_False, "SortedEntryList: Can't get value for modified entry!"); + OSL_FAIL( "SortedEntryList: Can't get value for modified entry!"); return 0; } else { - OSL_ENSURE( sal_False, "SortedEntryList: invalid pos!"); + OSL_FAIL( "SortedEntryList: invalid pos!"); return 0; } } diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 583c558a007e..a58034dddd46 100755 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -550,7 +550,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucb::TransferInfo aInfo; if ( !( aCommand.Argument >>= aInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -575,7 +575,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucb::ContentInfo aInfo; if ( !( aCommand.Argument >>= aInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -669,8 +669,7 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) } else { - OSL_ENSURE( sal_False, - "createNewContent called on non-folder object!" ); + OSL_FAIL( "createNewContent called on non-folder object!" ); return uno::Reference< ucb::XContent >(); } } @@ -896,15 +895,14 @@ sal_Bool HierarchyContent::exchangeIdentity( // Already persistent? if ( m_eState != PERSISTENT ) { - OSL_ENSURE( sal_False, - "HierarchyContent::exchangeIdentity - Not persistent!" ); + OSL_FAIL( "HierarchyContent::exchangeIdentity - Not persistent!" ); return sal_False; } // Am I the root folder? if ( m_eKind == ROOT ) { - OSL_ENSURE( sal_False, "HierarchyContent::exchangeIdentity - " + OSL_FAIL( "HierarchyContent::exchangeIdentity - " "Not supported by root folder!" ); return sal_False; } @@ -957,8 +955,7 @@ sal_Bool HierarchyContent::exchangeIdentity( } } - OSL_ENSURE( sal_False, - "HierarchyContent::exchangeIdentity - " + OSL_FAIL( "HierarchyContent::exchangeIdentity - " "Panic! Cannot exchange identity!" ); return sal_False; } diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 4b8983e9e918..a3f9ed980aee 100755 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -147,7 +147,7 @@ HierarchyEntry::HierarchyEntry( if ( nPos > HIERARCHY_URL_SCHEME_LENGTH ) m_aName = rURL.copy( nPos + 1 ); else - OSL_ENSURE( sal_False, "HierarchyEntry - Invalid URL!" ); + OSL_FAIL( "HierarchyEntry - Invalid URL!" ); } //========================================================================= @@ -196,8 +196,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( !( xRootReadAccess->getByHierarchicalName( aTitlePath ) >>= aValue ) ) { - OSL_ENSURE( sal_False, - "HierarchyEntry::getData - " + OSL_FAIL( "HierarchyEntry::getData - " "Got no Title value!" ); return sal_False; } @@ -210,8 +209,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath ) >>= aValue ) ) { - OSL_ENSURE( sal_False, - "HierarchyEntry::getData - " + OSL_FAIL( "HierarchyEntry::getData - " "Got no TargetURL value!" ); return sal_False; } @@ -248,8 +246,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) } else { - OSL_ENSURE( sal_False, - "HierarchyEntry::getData - " + OSL_FAIL( "HierarchyEntry::getData - " "Unknown Type value!" ); return sal_False; } @@ -268,8 +265,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "HierarchyEntry::getData - caught NoSuchElementException!" ); + OSL_FAIL( "HierarchyEntry::getData - caught NoSuchElementException!" ); } return sal_False; } @@ -474,40 +470,35 @@ sal_Bool HierarchyEntry::setData( { // replaceByName, insertByName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::setData - caught IllegalArgumentException!" ); } catch ( container::NoSuchElementException const & ) { // replaceByName, getByName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::setData - caught NoSuchElementException!" ); } catch ( container::ElementExistException const & ) { // insertByName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::setData - caught ElementExistException!" ); } catch ( lang::WrappedTargetException const & ) { // replaceByName, insertByName, getByName, commitChanges - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::setData - caught WrappedTargetException!" ); } catch ( uno::Exception const & ) { // createInstance, createInstanceWithArguments - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::setData - caught Exception!" ); } @@ -534,7 +525,7 @@ sal_Bool HierarchyEntry::move( aNewKey = rNewURL.copy( nURLPos + 1 ); else { - OSL_ENSURE( sal_False, "HierarchyEntry::move - Invalid URL!" ); + OSL_FAIL( "HierarchyEntry::move - Invalid URL!" ); return sal_False; } @@ -635,7 +626,7 @@ sal_Bool HierarchyEntry::move( { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, "HierarchyEntry::move - caught Exception!" ); + OSL_FAIL( "HierarchyEntry::move - caught Exception!" ); return sal_False; } @@ -677,16 +668,14 @@ sal_Bool HierarchyEntry::move( { // getByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught NoSuchElementException!" ); + OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { // getByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught WrappedTargetException!" ); + OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" ); return sal_False; } @@ -703,8 +692,7 @@ sal_Bool HierarchyEntry::move( { // getByName, removeByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught NoSuchElementException!" ); + OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" ); return sal_False; } @@ -786,16 +774,14 @@ sal_Bool HierarchyEntry::move( { // replaceByName, insertByName, getByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught NoSuchElementException!" ); + OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" ); return sal_False; } catch ( lang::IllegalArgumentException const & ) { // replaceByName, insertByName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::move - caught IllegalArgumentException!" ); return sal_False; } @@ -803,16 +789,14 @@ sal_Bool HierarchyEntry::move( { // insertByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught ElementExistException!" ); + OSL_FAIL( "HierarchyEntry::move - caught ElementExistException!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { // replaceByName, insertByName, getByName - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught WrappedTargetException!" ); + OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" ); return sal_False; } @@ -916,24 +900,21 @@ sal_Bool HierarchyEntry::remove() { // getByName, removeByName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::remove - caught NoSuchElementException!" ); } catch ( lang::WrappedTargetException const & ) { // getByName, commitChanges - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::remove - caught WrappedTargetException!" ); } catch ( uno::Exception const & ) { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, - "HierarchyEntry::remove - caught Exception!" ); + OSL_FAIL( "HierarchyEntry::remove - caught Exception!" ); } return sal_False; @@ -995,14 +976,12 @@ sal_Bool HierarchyEntry::first( iterator& it ) { // getByHierarchicalName - OSL_ENSURE( - sal_False, + OSL_FAIL( "HierarchyEntry::first - caught NoSuchElementException!" ); } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, - "HierarchyEntry::first - caught Exception!" ); + OSL_FAIL( "HierarchyEntry::first - caught Exception!" ); } } @@ -1081,8 +1060,7 @@ HierarchyEntry::getRootReadAccess() { if ( m_bTriedToGetRootReadAccess ) // #82494# { - OSL_ENSURE( sal_False, - "HierarchyEntry::getRootReadAccess - " + OSL_FAIL( "HierarchyEntry::getRootReadAccess - " "Unable to read any config data! -> #82494#" ); return uno::Reference< container::XHierarchicalNameAccess >(); } @@ -1126,8 +1104,7 @@ HierarchyEntry::getRootReadAccess() { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, - "HierarchyEntry::getRootReadAccess - " + OSL_FAIL( "HierarchyEntry::getRootReadAccess - " "caught Exception!" ); } } @@ -1211,8 +1188,7 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const } else { - OSL_ENSURE( sal_False, - "HierarchyEntry::getData - " + OSL_FAIL( "HierarchyEntry::getData - " "Unknown Type value!" ); } } diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 9bcaafadc7e2..8573f1750930 100755 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -200,13 +200,11 @@ HierarchyContentProvider::getConfigProvider( } catch ( uno::Exception const & ) { -// OSL_ENSURE( sal_False, -// "HierarchyContentProvider::getConfigProvider - " +// OSL_FAIL( // "HierarchyContentProvider::getConfigProvider - " // "caught exception!" ); } - OSL_ENSURE( sal_False, - "HierarchyContentProvider::getConfigProvider - " + OSL_FAIL( "HierarchyContentProvider::getConfigProvider - " "No config provider!" ); return uno::Reference< lang::XMultiServiceFactory >(); @@ -229,8 +227,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { if ( (*it).second.bTriedToGetRootReadAccess ) // #82494# { - OSL_ENSURE( sal_False, - "HierarchyContentProvider::getRootConfigReadNameAccess - " + OSL_FAIL( "HierarchyContentProvider::getRootConfigReadNameAccess - " "Unable to read any config data! -> #82494#" ); return uno::Reference< container::XHierarchicalNameAccess >(); } @@ -271,8 +268,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, - "HierarchyContentProvider::getRootConfigReadNameAccess - " + OSL_FAIL( "HierarchyContentProvider::getRootConfigReadNameAccess - " "caught Exception!" ); } } diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index e32bbdbbfef8..05b36107e73b 100755 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -235,7 +235,7 @@ uno::Any SAL_CALL Content::execute( uno::Sequence< beans::Property > Properties; if ( !( aCommand.Argument >>= Properties ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -257,7 +257,7 @@ uno::Any SAL_CALL Content::execute( uno::Sequence< beans::PropertyValue > aProperties; if ( !( aCommand.Argument >>= aProperties ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -269,7 +269,7 @@ uno::Any SAL_CALL Content::execute( if ( !aProperties.getLength() ) { - OSL_ENSURE( sal_False, "No properties!" ); + OSL_FAIL( "No properties!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -307,7 +307,7 @@ uno::Any SAL_CALL Content::execute( ucb::OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -454,7 +454,7 @@ uno::Any SAL_CALL Content::execute( ucb::InsertCommandArgument arg; if ( !( aCommand.Argument >>= arg ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -477,7 +477,7 @@ uno::Any SAL_CALL Content::execute( ucb::TransferInfo aTransferInfo; if( ! ( aCommand.Argument >>= aTransferInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(), @@ -538,7 +538,7 @@ uno::Any SAL_CALL Content::execute( // Unsupported command ////////////////////////////////////////////////////////////////// - OSL_ENSURE( sal_False, "Content::execute - unsupported command!" ); + OSL_FAIL( "Content::execute - unsupported command!" ); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( @@ -952,7 +952,7 @@ void Content::insert( // Check, if all required properties were set. if ( !m_aProps->m_sTitle.getLength()) { - OSL_ENSURE( sal_False, "Content::insert - property value missing!" ); + OSL_FAIL( "Content::insert - property value missing!" ); uno::Sequence< rtl::OUString > aProps( 1 ); aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zzzz")); @@ -967,7 +967,7 @@ void Content::insert( if ( !xInputStream.is() ) { - OSL_ENSURE( sal_False, "Content::insert - No data stream!" ); + OSL_FAIL( "Content::insert - No data stream!" ); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index e501dd09fde1..00d21eced5a6 100755 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -672,7 +672,7 @@ uno::Any SAL_CALL Content::execute( ucb::ContentInfo aInfo; if ( !( aCommand.Argument >>= aInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -789,8 +789,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } else { - OSL_ENSURE( sal_False, - "createNewContent called on non-folder object!" ); + OSL_FAIL( "createNewContent called on non-folder object!" ); return uno::Reference< ucb::XContent >(); } } @@ -2102,8 +2101,7 @@ void Content::transfer( if ( !xNamed.is() ) { - OSL_ENSURE( sal_False, - "Content::transfer - Got no XNamed!" ); + OSL_FAIL( "Content::transfer - Got no XNamed!" ); break; } @@ -2111,8 +2109,7 @@ void Content::transfer( if ( !aName.getLength() ) { - OSL_ENSURE( sal_False, - "Content::transfer - Empty name!" ); + OSL_FAIL( "Content::transfer - Empty name!" ); break; } @@ -2192,8 +2189,7 @@ sal_Bool Content::exchangeIdentity( // Already persistent? if ( m_eState != PERSISTENT ) { - OSL_ENSURE( sal_False, - "Content::exchangeIdentity - Not persistent!" ); + OSL_FAIL( "Content::exchangeIdentity - Not persistent!" ); return sal_False; } @@ -2247,8 +2243,7 @@ sal_Bool Content::exchangeIdentity( } } - OSL_ENSURE( sal_False, - "Content::exchangeIdentity - Panic! Cannot exchange identity!" ); + OSL_FAIL( "Content::exchangeIdentity - Panic! Cannot exchange identity!" ); return sal_False; } @@ -2385,23 +2380,20 @@ sal_Bool Content::loadData( "HasEncryptedEntries" )) ); if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) ) { - OSL_ENSURE( sal_False, - "Content::loadData - " + OSL_FAIL( "Content::loadData - " "Got no HasEncryptedEntries value!" ); return sal_False; } } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - " + OSL_FAIL( "Content::loadData - " "Got no HasEncryptedEntries value!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - " + OSL_FAIL( "Content::loadData - " "Got no HasEncryptedEntries value!" ); return sal_False; } @@ -2421,8 +2413,7 @@ sal_Bool Content::loadData( if ( !xPropSet.is() ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no XPropertySet interface!" ); + OSL_FAIL( "Content::loadData - Got no XPropertySet interface!" ); return sal_False; } @@ -2437,21 +2428,18 @@ sal_Bool Content::loadData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); if ( !( aMediaType >>= rProps.aMediaType ) ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no MediaType value!" ); + OSL_FAIL( "Content::loadData - Got no MediaType value!" ); return sal_False; } } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no MediaType value!" ); + OSL_FAIL( "Content::loadData - Got no MediaType value!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no MediaType value!" ); + OSL_FAIL( "Content::loadData - Got no MediaType value!" ); return sal_False; } @@ -2484,21 +2472,18 @@ sal_Bool Content::loadData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ); if ( !( aSize >>= rProps.nSize ) ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Size value!" ); + OSL_FAIL( "Content::loadData - Got no Size value!" ); return sal_False; } } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Size value!" ); + OSL_FAIL( "Content::loadData - Got no Size value!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Size value!" ); + OSL_FAIL( "Content::loadData - Got no Size value!" ); return sal_False; } @@ -2510,21 +2495,18 @@ sal_Bool Content::loadData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")) ); if ( !( aCompressed >>= rProps.bCompressed ) ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Compressed value!" ); + OSL_FAIL( "Content::loadData - Got no Compressed value!" ); return sal_False; } } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Compressed value!" ); + OSL_FAIL( "Content::loadData - Got no Compressed value!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Compressed value!" ); + OSL_FAIL( "Content::loadData - Got no Compressed value!" ); return sal_False; } @@ -2536,21 +2518,18 @@ sal_Bool Content::loadData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")) ); if ( !( aEncrypted >>= rProps.bEncrypted ) ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Encrypted value!" ); + OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); return sal_False; } } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Encrypted value!" ); + OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { - OSL_ENSURE( sal_False, - "Content::loadData - Got no Encrypted value!" ); + OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); return sal_False; } } @@ -2589,8 +2568,7 @@ sal_Bool Content::renameData( if ( !xNamed.is() ) { - OSL_ENSURE( sal_False, - "Content::renameData - Got no XNamed interface!" ); + OSL_FAIL( "Content::renameData - Got no XNamed interface!" ); return sal_False; } @@ -2670,8 +2648,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) xNA, uno::UNO_QUERY ); if ( !xFac.is() ) { - OSL_ENSURE( sal_False, - "Content::storeData - " + OSL_FAIL( "Content::storeData - " "Got no XSingleServiceFactory interface!" ); return sal_False; } @@ -2684,8 +2661,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( !xNew.is() ) { - OSL_ENSURE( sal_False, - "Content::storeData - createInstance failed!" ); + OSL_FAIL( "Content::storeData - createInstance failed!" ); return sal_False; } @@ -2697,8 +2673,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( !xParentContainer.is() ) { - OSL_ENSURE( sal_False, - "Content::storeData - " + OSL_FAIL( "Content::storeData - " "Got no XNameContainer interface!" ); return sal_False; } @@ -2713,35 +2688,31 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) catch ( lang::IllegalArgumentException const & ) { // insertByName - OSL_ENSURE( sal_False, - "Content::storeData - insertByName failed!" ); + OSL_FAIL( "Content::storeData - insertByName failed!" ); return sal_False; } catch ( container::ElementExistException const & ) { // insertByName - OSL_ENSURE( sal_False, - "Content::storeData - insertByName failed!" ); + OSL_FAIL( "Content::storeData - insertByName failed!" ); return sal_False; } catch ( lang::WrappedTargetException const & ) { // insertByName - OSL_ENSURE( sal_False, - "Content::storeData - insertByName failed!" ); + OSL_FAIL( "Content::storeData - insertByName failed!" ); return sal_False; } catch ( container::NoSuchElementException const & ) { // getByHierarchicalName - OSL_ENSURE( sal_False, - "Content::storeData - getByHierarchicalName failed!" ); + OSL_FAIL( "Content::storeData - getByHierarchicalName failed!" ); return sal_False; } catch ( uno::Exception const & ) { // createInstanceWithArguments - OSL_ENSURE( sal_False, "Content::storeData - Error!" ); + OSL_FAIL( "Content::storeData - Error!" ); return sal_False; } } @@ -2756,8 +2727,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( !xPropSet.is() ) { - OSL_ENSURE( sal_False, - "Content::storeData - Got no XPropertySet interface!" ); + OSL_FAIL( "Content::storeData - Got no XPropertySet interface!" ); return sal_False; } @@ -2814,8 +2784,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( !xSink.is() ) { - OSL_ENSURE( sal_False, - "Content::storeData - " + OSL_FAIL( "Content::storeData - " "Got no XActiveDataSink interface!" ); return sal_False; } @@ -2846,7 +2815,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) // setPropertyValue } - OSL_ENSURE( sal_False, "Content::storeData - Error!" ); + OSL_FAIL( "Content::storeData - Error!" ); return sal_False; } @@ -2871,8 +2840,7 @@ sal_Bool Content::removeData() if ( !xContainer.is() ) { - OSL_ENSURE( sal_False, - "Content::removeData - " + OSL_FAIL( "Content::removeData - " "Got no XNameContainer interface!" ); return sal_False; } @@ -2889,7 +2857,7 @@ sal_Bool Content::removeData() // removeByName } - OSL_ENSURE( sal_False, "Content::removeData - Error!" ); + OSL_FAIL( "Content::removeData - Error!" ); return sal_False; } @@ -2908,8 +2876,7 @@ sal_Bool Content::flushData() uno::Reference< util::XChangesBatch > xBatch( xNA, uno::UNO_QUERY ); if ( !xBatch.is() ) { - OSL_ENSURE( sal_False, - "Content::flushData - Got no XChangesBatch interface!" ); + OSL_FAIL( "Content::flushData - Got no XChangesBatch interface!" ); return sal_False; } @@ -2922,7 +2889,7 @@ sal_Bool Content::flushData() { } - OSL_ENSURE( sal_False, "Content::flushData - Error!" ); + OSL_FAIL( "Content::flushData - Error!" ); return sal_False; } @@ -2947,8 +2914,7 @@ uno::Reference< io::XInputStream > Content::getInputStream() if ( !xSink.is() ) { - OSL_ENSURE( sal_False, - "Content::getInputStream - " + OSL_FAIL( "Content::getInputStream - " "Got no XActiveDataSink interface!" ); return xStream; } @@ -2987,8 +2953,7 @@ uno::Reference< container::XEnumeration > Content::getIterator() if ( !xIterFac.is() ) { - OSL_ENSURE( sal_False, - "Content::getIterator - " + OSL_FAIL( "Content::getIterator - " "Got no XEnumerationAccess interface!" ); return xIter; } diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index d403626ba061..589fd28b1610 100755 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -265,8 +265,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( !xNamed.is() ) { - OSL_ENSURE( sal_False, - "DataSupplier::getResult - Got no XNamed!" ); + OSL_FAIL( "DataSupplier::getResult - Got no XNamed!" ); break; } @@ -274,8 +273,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( !aName.getLength() ) { - OSL_ENSURE( sal_False, - "DataSupplier::getResult - Empty name!" ); + OSL_FAIL( "DataSupplier::getResult - Empty name!" ); break; } @@ -345,8 +343,7 @@ sal_uInt32 DataSupplier::totalCount() if ( !xNamed.is() ) { - OSL_ENSURE( sal_False, - "DataSupplier::getResult - Got no XNamed!" ); + OSL_FAIL( "DataSupplier::getResult - Got no XNamed!" ); break; } @@ -354,8 +351,7 @@ sal_uInt32 DataSupplier::totalCount() if ( !aName.getLength() ) { - OSL_ENSURE( sal_False, - "DataSupplier::getResult - Empty name!" ); + OSL_FAIL( "DataSupplier::getResult - Empty name!" ); break; } diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 27d411233225..0ac70af0e273 100755 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -251,8 +251,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString if ( !rName.getLength() ) { - OSL_ENSURE( sal_False, - "ContentProvider::createPackage - Invalid URL!" ); + OSL_FAIL( "ContentProvider::createPackage - Invalid URL!" ); return uno::Reference< container::XHierarchicalNameAccess >(); } diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index cc859e623dae..db7686637c54 100755 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -97,8 +97,7 @@ static ContentType lcl_getContentType( const rtl::OUString & rType ) return STREAM; else { - OSL_ENSURE( sal_False, - "Content::Content - unsupported content type string" ); + OSL_FAIL( "Content::Content - unsupported content type string" ); return STREAM; } } @@ -143,7 +142,7 @@ Content* Content::create( !Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) ) { - OSL_ENSURE( sal_False, "Content::create - unsupported content type!" ); + OSL_FAIL( "Content::create - unsupported content type!" ); return 0; } @@ -638,7 +637,7 @@ uno::Any SAL_CALL Content::execute( ucb::TransferInfo aInfo; if ( !( aCommand.Argument >>= aInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -681,7 +680,7 @@ uno::Any SAL_CALL Content::execute( ucb::ContentInfo aInfo; if ( !( aCommand.Argument >>= aInfo ) ) { - OSL_ENSURE( sal_False, "Wrong argument type!" ); + OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -753,8 +752,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) // streams cannot be created as direct children of document root if ( !bCreateFolder && ( m_aProps.getType() == DOCUMENT ) ) { - OSL_ENSURE( sal_False, - "Content::createNewContent - streams cannot be " + OSL_FAIL( "Content::createNewContent - streams cannot be " "created as direct children of document root!" ); return uno::Reference< ucb::XContent >(); } @@ -763,8 +761,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) !Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) ) { - OSL_ENSURE( sal_False, - "Content::createNewContent - unsupported type!" ); + OSL_FAIL( "Content::createNewContent - unsupported type!" ); return uno::Reference< ucb::XContent >(); } @@ -788,8 +785,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } else { - OSL_ENSURE( sal_False, - "createNewContent called on non-contentcreator object!" ); + OSL_FAIL( "createNewContent called on non-contentcreator object!" ); return uno::Reference< ucb::XContent >(); } } @@ -890,8 +886,7 @@ sal_Bool Content::exchangeIdentity( // Already persistent? if ( m_eState != PERSISTENT ) { - OSL_ENSURE( sal_False, - "Content::exchangeIdentity - Not persistent!" ); + OSL_FAIL( "Content::exchangeIdentity - Not persistent!" ); return sal_False; } @@ -899,7 +894,7 @@ sal_Bool Content::exchangeIdentity( ContentType eType = m_aProps.getType(); if ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) { - OSL_ENSURE( sal_False, "Content::exchangeIdentity - " + OSL_FAIL( "Content::exchangeIdentity - " "Not supported by root or document!" ); return sal_False; } @@ -952,8 +947,7 @@ sal_Bool Content::exchangeIdentity( } } - OSL_ENSURE( sal_False, - "Content::exchangeIdentity - " + OSL_FAIL( "Content::exchangeIdentity - " "Panic! Cannot exchange identity!" ); return sal_False; } @@ -3114,8 +3108,7 @@ ContentProperties::getCreatableContentsInfo() const } else { - OSL_ENSURE( sal_False, - "getCreatableContentsInfo called on non-contentcreator " + OSL_FAIL( "getCreatableContentsInfo called on non-contentcreator " "object!" ); return uno::Sequence< ucb::ContentInfo >( 0 ); diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index a3472dfd92e0..dcfedfbb47a7 100755 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -266,8 +266,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) if ( !rName.getLength() ) { - OSL_ENSURE( sal_False, - "ResultDataSupplier::getResult - Empty name!" ); + OSL_FAIL( "ResultDataSupplier::getResult - Empty name!" ); break; } @@ -327,8 +326,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() if ( !rName.getLength() ) { - OSL_ENSURE( sal_False, - "ResultDataSupplier::getResult - Empty name!" ); + OSL_FAIL( "ResultDataSupplier::getResult - Empty name!" ); break; } diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx index 896117152a1e..3376d1a3023b 100755 --- a/ucb/source/ucp/webdav/LockSequence.cxx +++ b/ucb/source/ucp/webdav/LockSequence.cxx @@ -174,8 +174,7 @@ extern "C" int LockSequence_chardata_callback( pCtx->hasDepth = true; } else - OSL_ENSURE( sal_False, - "LockSequence_chardata_callback - Unknown depth!" ); + OSL_FAIL( "LockSequence_chardata_callback - Unknown depth!" ); break; case STATE_OWNER: @@ -222,8 +221,7 @@ extern "C" int LockSequence_chardata_callback( { pCtx->pLock->Timeout = sal_Int64( -1 ); pCtx->hasTimeout = true; - OSL_ENSURE( sal_False, - "LockSequence_chardata_callback - Unknown timeout!" ); + OSL_FAIL( "LockSequence_chardata_callback - Unknown timeout!" ); } break; diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 7df353ea850c..3326dd1c3231 100755 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -128,15 +128,15 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText ) if ( rStatusText.getLength() < 3 ) { - OSL_ENSURE( - sal_False, "makeStatusCode - status text string to short!" ); + OSL_FAIL( + "makeStatusCode - status text string to short!" ); return 0; } sal_Int32 nPos = rStatusText.indexOf( ' ' ); if ( nPos == -1 ) { - OSL_ENSURE( sal_False, "makeStatusCode - wrong status text format!" ); + OSL_FAIL( "makeStatusCode - wrong status text format!" ); return 0; } @@ -320,8 +320,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) ) { - OSL_ENSURE( - sal_False, "NeonSession_NeonAuth - username to long!" ); + OSL_FAIL( + "NeonSession_NeonAuth - username to long!" ); return -1; } @@ -329,8 +329,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) ) { - OSL_ENSURE( - sal_False, "NeonSession_NeonAuth - password to long!" ); + OSL_FAIL( + "NeonSession_NeonAuth - password to long!" ); return -1; } @@ -1002,8 +1002,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, } else { - OSL_ENSURE( sal_False, - "NeonSession::PROPPATCH - unsupported type!" ); + OSL_FAIL( "NeonSession::PROPPATCH - unsupported type!" ); // Error! pItems[ n ].value = 0; theRetVal = NE_ERROR; diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index ef76f5784c6f..56a4ca3c8513 100755 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -215,8 +215,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos == nEnd ) { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } @@ -228,8 +227,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 4 ) { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } @@ -244,8 +242,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } } @@ -255,8 +252,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } @@ -269,8 +265,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } } @@ -280,8 +275,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } @@ -294,15 +288,13 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::decodeValue - syntax error!" ); + OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); return rtl::OUString(); } } @@ -414,8 +406,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::createFromXML - " + OSL_FAIL( "UCBDeadPropertyValue::createFromXML - " "Unsupported property type!" ); success = false; } @@ -513,8 +504,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, } else { - OSL_ENSURE( sal_False, - "UCBDeadPropertyValue::toXML - " + OSL_FAIL( "UCBDeadPropertyValue::toXML - " "Unsupported property type!" ); return false; } diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 2f5adff8e2d7..d933541c585e 100755 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -731,8 +731,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, // Check property type. if ( !UCBDeadPropertyValue::supportsType( DefaultValue.getValueType() ) ) { - OSL_ENSURE( sal_False, - "Content::addProperty - Unsupported property type!" ); + OSL_FAIL( "Content::addProperty - Unsupported property type!" ); throw beans::IllegalTypeException(); } @@ -817,23 +816,20 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, break; default: - OSL_ENSURE( sal_False, - "Content::addProperty - " + OSL_FAIL( "Content::addProperty - " "Unsupported resource type!" ); break; } } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, - "Content::addProperty - " + OSL_FAIL( "Content::addProperty - " "Unable to determine resource type!" ); } } else { - OSL_ENSURE( sal_False, - "Content::addProperty - " + OSL_FAIL( "Content::addProperty - " "Unable to determine resource type!" ); } } @@ -911,23 +907,20 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) break; default: - OSL_ENSURE( sal_False, - "Content::removeProperty - " + OSL_FAIL( "Content::removeProperty - " "Unsupported resource type!" ); break; } } catch ( uno::Exception const & ) { - OSL_ENSURE( sal_False, - "Content::removeProperty - " + OSL_FAIL( "Content::removeProperty - " "Unable to determine resource type!" ); } } else { - OSL_ENSURE( sal_False, - "Content::removeProperty - " + OSL_FAIL( "Content::removeProperty - " "Unable to determine resource type!" ); // throw beans::UnknownPropertyException(); } @@ -1781,8 +1774,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } catch ( DAVException const & e ) { -// OSL_ENSURE( sal_False, -// "Content::setPropertyValues - PROPPATCH failed!" ); +// OSL_FAIL( // "Content::setPropertyValues - PROPPATCH failed!" ); #if 1 cancelCommandExecution( e, xEnv ); @@ -2234,7 +2226,7 @@ void Content::insert( if ( aEscapedTitle.getLength() == 0 ) { - OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); + OSL_FAIL( "Content::insert - Title missing!" ); uno::Sequence< rtl::OUString > aProps( 1 ); aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); @@ -2312,8 +2304,7 @@ void Content::insert( // break; default: - OSL_ENSURE( sal_False, - "Content::insert - " + OSL_FAIL( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -2837,7 +2828,7 @@ sal_Bool Content::exchangeIdentity( // Already persistent? if ( m_bTransient ) { - OSL_ENSURE( sal_False, "Content::exchangeIdentity - Not persistent!" ); + OSL_FAIL( "Content::exchangeIdentity - Not persistent!" ); return sal_False; } @@ -2886,8 +2877,7 @@ sal_Bool Content::exchangeIdentity( } } - OSL_ENSURE( sal_False, - "Content::exchangeIdentity - " + OSL_FAIL( "Content::exchangeIdentity - " "Panic! Cannot exchange identity!" ); return sal_False; } diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 638c0c948bca..730ef432ab77 100755 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -394,7 +394,7 @@ sal_Bool DataSupplier::getData() } catch ( DAVException & ) { -// OSL_ENSURE( sal_False, "PROPFIND : DAVException" ); +// OSL_FAIL( "PROPFIND : DAVException" ); m_pImpl->m_bThrowException = sal_True; } diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 7fe1a17382a9..776e74d9aed3 100755 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -62,7 +62,7 @@ namespace xmloff if (aLookupSublist == m_aLists.end()) { - OSL_ENSURE(sal_False, "OAttribListMerger::seekToIndex: invalid index!"); + OSL_FAIL("OAttribListMerger::seekToIndex: invalid index!"); return sal_False; } _rSubList = *aLookupSublist; @@ -85,7 +85,7 @@ namespace xmloff return sal_True; } - OSL_ENSURE(sal_False, "OAttribListMerger::seekToName: did not find the name!"); + OSL_FAIL("OAttribListMerger::seekToName: did not find the name!"); return sal_False; } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 546fa21d4c82..ca97ad0d6d47 100755 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -181,7 +181,7 @@ namespace xmloff Reference< XPersistObject > xPersistence(m_xProps, UNO_QUERY); if (!xPersistence.is()) { - OSL_ENSURE(sal_False, "OElementExport::exportServiceNameAttribute: no XPersistObject!"); + OSL_FAIL("OElementExport::exportServiceNameAttribute: no XPersistObject!"); return; } @@ -1089,7 +1089,7 @@ namespace xmloff else if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_SPIN_INCREMENT ) ) sPropertyName = PROPERTY_SPIN_INCREMENT; else - OSL_ENSURE( sal_False, "OControlExport::exportSpecialAttributes: not property which can be mapped to step-size attribute!" ); + OSL_FAIL( "OControlExport::exportSpecialAttributes: not property which can be mapped to step-size attribute!" ); if ( sPropertyName.getLength() ) exportInt32PropertyAttribute( @@ -1757,7 +1757,7 @@ namespace xmloff break; default: - OSL_ENSURE(sal_False, "OControlExport::examineControl: unknown control type (class id)!"); + OSL_FAIL("OControlExport::examineControl: unknown control type (class id)!"); // NO break! case FormComponentType::NAVIGATIONBAR: @@ -1858,7 +1858,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlExport::exportCellBindingAttributes: caught an exception!" ); + OSL_FAIL( "OControlExport::exportCellBindingAttributes: caught an exception!" ); } } @@ -1903,7 +1903,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlExport::exportCellListSourceRange: caught an exception!" ); + OSL_FAIL( "OControlExport::exportCellListSourceRange: caught an exception!" ); } } @@ -1977,7 +1977,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OColumnExport::controlHasActiveDataBinding: caught an exception!" ); + OSL_FAIL( "OColumnExport::controlHasActiveDataBinding: caught an exception!" ); } return false; @@ -2008,10 +2008,10 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlExport::controlHasUserSuppliedListEntries: caught an exception!" ); + OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: caught an exception!" ); } - OSL_ENSURE( sal_False, "OControlExport::controlHasUserSuppliedListEntries: unreachable code!" ); + OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: unreachable code!" ); // this method should be called for list and combo boxes only return true; } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index cddba2e0e02e..4c433c2bae50 100755 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -248,7 +248,7 @@ namespace xmloff // insert the element into the parent container if (!m_sName.getLength()) { - OSL_ENSURE(sal_False, "OElementImport::EndElement: did not find a name attribute!"); + OSL_FAIL("OElementImport::EndElement: did not find a name attribute!"); m_sName = implGetDefaultName(); } @@ -317,7 +317,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OElementImport::implApplySpecificProperties: could not set the properties (using the XMultiPropertySet)!"); + OSL_FAIL("OElementImport::implApplySpecificProperties: could not set the properties (using the XMultiPropertySet)!"); } } @@ -337,8 +337,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, - ::rtl::OString("OElementImport::implApplySpecificProperties: could not set the property \"") + OSL_FAIL(::rtl::OString("OElementImport::implApplySpecificProperties: could not set the property \"") += ::rtl::OString(aPropValues->Name.getStr(), aPropValues->Name.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("\"!")); } @@ -480,8 +479,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, - ::rtl::OString("OElementImport::EndElement: could not set the property \"") + OSL_FAIL(::rtl::OString("OElementImport::EndElement: could not set the property \"") += ::rtl::OString(aPropValues->Name.getStr(), aPropValues->Name.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("\"!")); } @@ -517,7 +515,7 @@ namespace xmloff continue; return sReturn; } - OSL_ENSURE(sal_False, "OElementImport::implGetDefaultName: did not find a free name!"); + OSL_FAIL("OElementImport::implGetDefaultName: did not find a free name!"); return sUnnamedName; } @@ -649,7 +647,7 @@ namespace xmloff xReturn = Reference< XPropertySet >(xPure, UNO_QUERY); } else - OSL_ENSURE(sal_False, "OElementImport::createElement: no service name to create an element!"); + OSL_FAIL("OElementImport::createElement: no service name to create an element!"); return xReturn; } @@ -858,7 +856,7 @@ namespace xmloff // get the property set info if (!m_xInfo.is()) { - OSL_ENSURE(sal_False, "OControlImport::StartElement: no PropertySetInfo!"); + OSL_FAIL("OControlImport::StartElement: no PropertySetInfo!"); return; } @@ -1011,7 +1009,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while retrieving the class id!" ); + OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the class id!" ); } const sal_Char* pValueProperty = NULL; @@ -1048,7 +1046,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while retrieving the current value property!" ); + OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the current value property!" ); } } } @@ -1065,7 +1063,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlImport::EndElement: caught an exception while restoring the value property!" ); + OSL_FAIL( "OControlImport::EndElement: caught an exception while restoring the value property!" ); } } @@ -2136,7 +2134,7 @@ namespace xmloff } else { - OSL_ENSURE(sal_False, "OFormImport::implTranslateStringListProperty: invalid value (empty)!"); + OSL_FAIL("OFormImport::implTranslateStringListProperty: invalid value (empty)!"); } aProp.Value <<= aList; diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index ba3ef4a9594f..1e34727903f8 100755 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -51,7 +51,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( return implCreateControlWrapper(_nPrefix, _rLocalName); else { - OSL_ENSURE(sal_False, "OContainerImport::CreateChildContext: don't have an element!"); + OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!"); return NULL; } } @@ -73,7 +73,7 @@ inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMeAsContainer = ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >(xReturn, ::com::sun::star::uno::UNO_QUERY); if (!m_xMeAsContainer.is()) { - OSL_ENSURE(sal_False, "OContainerImport::createElement: invalid element (no XNameContainer) created!"); + OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!"); xReturn.clear(); } diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index 2ecaa926c4ab..9edc1242ea0f 100755 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -137,7 +137,7 @@ namespace xmloff Reference< XEventAttacherManager > xEventManager(_rxContainer, UNO_QUERY); if (!xEventManager.is()) { - OSL_ENSURE(sal_False, "ODefaultEventAttacherManager::setEvents: invalid argument!"); + OSL_FAIL("ODefaultEventAttacherManager::setEvents: invalid argument!"); return; } diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 076b85433814..e65f3c0bf488 100755 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -77,7 +77,7 @@ namespace xmloff case CCA_ORIENTATION: return "orientation"; case CCA_VISUAL_EFFECT: return "visual-effect"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getCommonControlAttributeName: invalid id (maybe you or-ed two flags?)!"); + OSL_FAIL("OAttributeMetaData::getCommonControlAttributeName: invalid id (maybe you or-ed two flags?)!"); } return ""; } @@ -122,7 +122,7 @@ namespace xmloff case faOrder: return "order"; case faTabbingCycle: return "tab-cycle"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getFormAttributeName: invalid id!"); + OSL_FAIL("OAttributeMetaData::getFormAttributeName: invalid id!"); } return ""; } @@ -151,7 +151,7 @@ namespace xmloff case DA_LIST_SOURCE_TYPE: return "list-source-type"; case DA_INPUT_REQUIRED: return "input-required"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getDatabaseAttributeName: invalid id (maybe you or-ed two flags?)!"); + OSL_FAIL("OAttributeMetaData::getDatabaseAttributeName: invalid id (maybe you or-ed two flags?)!"); } return ""; } @@ -172,7 +172,7 @@ namespace xmloff case BA_LIST_LINKING_TYPE: return "list-linkage-type"; case BA_LIST_CELL_RANGE: return "source-cell-range"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getBindingAttributeName: invalid id (maybe you or-ed two flags?)!"); + OSL_FAIL("OAttributeMetaData::getBindingAttributeName: invalid id (maybe you or-ed two flags?)!"); } return ""; } @@ -208,7 +208,7 @@ namespace xmloff case SCA_TOGGLE: return "toggle"; case SCA_FOCUS_ON_CLICK: return "focus-on-click"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getSpecialAttributeName: invalid id (maybe you or-ed two flags?)!"); + OSL_FAIL("OAttributeMetaData::getSpecialAttributeName: invalid id (maybe you or-ed two flags?)!"); } return ""; } @@ -231,7 +231,7 @@ namespace xmloff case ofaAutomaticFocus: return "automatic-focus"; case ofaApplyDesignMode: return "apply-design-mode"; default: - OSL_ENSURE(sal_False, "OAttributeMetaData::getOfficeFormsAttributeName: invalid id!"); + OSL_FAIL("OAttributeMetaData::getOfficeFormsAttributeName: invalid id!"); } return ""; } diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 37bacc03999b..3e980611abcd 100755 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -228,7 +228,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormCellBindingHelper::getStringAddressFromCellBinding: caught an exception!" ); + OSL_FAIL( "FormCellBindingHelper::getStringAddressFromCellBinding: caught an exception!" ); } return sAddress; @@ -257,7 +257,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormCellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); + OSL_FAIL( "FormCellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); } return sAddress; @@ -293,7 +293,7 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: caught an exception!" ); + OSL_FAIL( "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: caught an exception!" ); } return bYesItIs; @@ -448,7 +448,7 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( } catch ( const Exception& ) { - OSL_ENSURE( sal_False, "FormCellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); + OSL_FAIL( "FormCellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); } } return xReturn; @@ -479,7 +479,7 @@ bool FormCellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUStri } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormCellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); + OSL_FAIL( "FormCellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); } } diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 8011a5a994f3..ea5ebc93a1b6 100755 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -108,7 +108,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OFormLayerXMLExport::examine: could not examine the draw page!"); + OSL_FAIL("OFormLayerXMLExport::examine: could not examine the draw page!"); } } diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 9e30b76c3d9a..32dbbf01c727 100755 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -111,7 +111,7 @@ namespace xmloff } ++pTranslation; } - OSL_ENSURE( sal_False, "valueAlignToParaAdjust: unreachable!" ); + OSL_FAIL( "valueAlignToParaAdjust: unreachable!" ); } //---------------------------------------------------------------- @@ -129,7 +129,7 @@ namespace xmloff } ++pTranslation; } - OSL_ENSURE( sal_False, "valueParaAdjustToAlign: unreachable!" ); + OSL_FAIL( "valueParaAdjustToAlign: unreachable!" ); } //==================================================================== @@ -260,25 +260,25 @@ namespace xmloff //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- @@ -325,19 +325,19 @@ namespace xmloff //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::removePropertiesChangeListener: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::removePropertiesChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { - OSL_ENSURE( sal_False, "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); + OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); } //........................................................................ diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index e10920dd4187..05d0a207721a 100755 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -140,7 +140,7 @@ namespace xmloff if (!xSI->supportsService(SERVICE_FORMSCOLLECTION)) { - OSL_ENSURE(sal_False, "OFormLayerXMLExport_Impl::impl_isFormPageContainingForms: invalid collection (is no com.sun.star.form.Forms)!"); + OSL_FAIL("OFormLayerXMLExport_Impl::impl_isFormPageContainingForms: invalid collection (is no com.sun.star.form.Forms)!"); // nothing to do return sal_False; } @@ -245,7 +245,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OFormLayerXMLExport_Impl::exportCollectionElements: caught an exception ... skipping the current element!"); + OSL_FAIL("OFormLayerXMLExport_Impl::exportCollectionElements: caught an exception ... skipping the current element!"); continue; } } diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index d8eddeabd570..c277969c51ab 100755 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -306,11 +306,11 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert } catch(const Exception&) { - OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::applyControlNumberStyle: couldn't set the format!"); + OSL_FAIL("OFormLayerXMLImport_Impl::applyControlNumberStyle: couldn't set the format!"); } } else - OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::applyControlNumberStyle: did not find the style with the given name!"); + OSL_FAIL("OFormLayerXMLImport_Impl::applyControlNumberStyle: did not find the style with the given name!"); } } @@ -474,7 +474,7 @@ void OFormLayerXMLImport_Impl::endPage() } catch(Exception&) { - OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::endPage: unable to knit the control references (caught an exception)!"); + OSL_FAIL("OFormLayerXMLImport_Impl::endPage: unable to knit the control references (caught an exception)!"); } // now that we have all children of the forms collection, attach the events @@ -502,7 +502,7 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl: if (m_aCurrentPageIds->second.end() != aPos) xReturn = aPos->second; else - OSL_ENSURE(sal_False, "OFormLayerXMLImport_Impl::lookupControlId: invalid control id (did not find it)!"); + OSL_FAIL("OFormLayerXMLImport_Impl::lookupControlId: invalid control id (did not find it)!"); } return xReturn; } @@ -593,7 +593,7 @@ void OFormLayerXMLImport_Impl::documentDone( ) } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell!" ); + OSL_FAIL( "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell!" ); } } m_aCellValueBindings.clear(); @@ -620,7 +620,7 @@ void OFormLayerXMLImport_Impl::documentDone( ) } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell range!" ); + OSL_FAIL( "OFormLayerXMLImport_Impl::documentDone: caught an exception while binding to a cell range!" ); } } m_aCellRangeListSources.clear(); diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index daa505caf37a..614ca54796bd 100755 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -114,7 +114,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OFormsRootImport::StartElement: caught an exception while setting the document properties!"); + OSL_FAIL("OFormsRootImport::StartElement: caught an exception while setting the document properties!"); } } @@ -183,7 +183,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OFormsRootExport::addModelAttributes: caught an exception while retrieving the document properties!"); + OSL_FAIL("OFormsRootExport::addModelAttributes: caught an exception while retrieving the document properties!"); } } diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 1b29f6b82802..28e53e133562 100755 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -214,7 +214,7 @@ namespace xmloff pSequenceIterator = new OSequenceIterator< sal_Int64 >(aValue); break; default: - OSL_ENSURE(sal_False, "OPropertyExport::exportRemainingProperties: unsupported sequence tyoe !"); + OSL_FAIL("OPropertyExport::exportRemainingProperties: unsupported sequence tyoe !"); break; } if (pSequenceIterator) @@ -573,7 +573,7 @@ namespace xmloff break; case TypeClass_HYPER: // TODO - OSL_ENSURE(sal_False, "OPropertyExport::implConvertAny: missing implementation for sal_Int64!"); + OSL_FAIL("OPropertyExport::implConvertAny: missing implementation for sal_Int64!"); break; case TypeClass_ENUM: { @@ -615,7 +615,7 @@ namespace xmloff // if any other types are added here, please remember to adjust implGetPropertyXMLType accordingly // no more options ... - OSL_ENSURE(sal_False, "OPropertyExport::implConvertAny: unsupported value type!"); + OSL_FAIL("OPropertyExport::implConvertAny: unsupported value type!"); break; } // let the unit converter format is as string @@ -705,8 +705,7 @@ namespace xmloff // the property must exist if (!m_xPropertyInfo->hasPropertyByName(_rPropertyName)) { - OSL_ENSURE(sal_False, - ::rtl::OString("OPropertyExport::dbg_implCheckProperty: no property with the name ") += + OSL_FAIL(::rtl::OString("OPropertyExport::dbg_implCheckProperty: no property with the name ") += ::rtl::OString(_rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("!")); return; @@ -721,7 +720,7 @@ namespace xmloff } catch(Exception&) { - OSL_ENSURE(sal_False, "OPropertyExport::dbg_implCheckProperty: caught an exception, could not check the property!"); + OSL_FAIL("OPropertyExport::dbg_implCheckProperty: caught an exception, could not check the property!"); } } #endif // DBG_UTIL - dbg_implCheckProperty diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 47d2ab6d7c01..daea3d95fcfd 100755 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -162,7 +162,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun break; case TypeClass_HYPER: { - OSL_ENSURE(sal_False, "PropertyConversion::convertString: 64-bit integers not implemented yet!"); + OSL_FAIL("PropertyConversion::convertString: 64-bit integers not implemented yet!"); } break; case TypeClass_DOUBLE: @@ -241,11 +241,11 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun } } else - OSL_ENSURE(sal_False, "PropertyConversion::convertString: unsupported property type!"); + OSL_FAIL("PropertyConversion::convertString: unsupported property type!"); } break; default: - OSL_ENSURE(sal_False, "PropertyConversion::convertString: invalid type class!"); + OSL_FAIL("PropertyConversion::convertString: invalid type class!"); } return aReturn; @@ -296,8 +296,7 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con } else { - OSL_ENSURE(sal_False, - ::rtl::OString("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is ") + OSL_FAIL(::rtl::OString("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is ") += ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString(")!")); return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); @@ -372,7 +371,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl sMessage += ::rtl::OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); sMessage += ::rtl::OString( "\n value: " ); sMessage += ::rtl::OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( sal_False, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif return false; } @@ -404,8 +403,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } else { - OSL_ENSURE(sal_False, - ::rtl::OString("OPropertyElementsContext::CreateChildContext: unknown child element (\"") + OSL_FAIL(::rtl::OString("OPropertyElementsContext::CreateChildContext: unknown child element (\"") += ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("\")!")); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); @@ -444,8 +442,7 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< sax::XAttributeList >&) { - OSL_ENSURE(sal_False, - ::rtl::OString("OSinglePropertyContext::CreateChildContext: unknown child element (\"") + OSL_FAIL(::rtl::OString("OSinglePropertyContext::CreateChildContext: unknown child element (\"") += ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("\")!")); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); @@ -589,8 +586,7 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi } else { - OSL_ENSURE( sal_False, - ::rtl::OString("OListPropertyContext::CreateChildContext: unknown child element (\"") + OSL_FAIL( ::rtl::OString("OListPropertyContext::CreateChildContext: unknown child element (\"") += ::rtl::OString(_rLocalName.getStr(), _rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString("\")!")); return new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName ); diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 12ba48f9982d..37af37bb498e 100755 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -128,7 +128,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) } catch( com::sun::star::uno::Exception& ) { - OSL_ENSURE( sal_False, "Cannot instantiate com.sun.star.comp.Oasis2OOoTransformer!\n"); + OSL_FAIL( "Cannot instantiate com.sun.star.comp.Oasis2OOoTransformer!\n"); } } } diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index de60e89e381d..48f383a9a376 100755 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -702,7 +702,7 @@ vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter( } else { - OSL_ENSURE(sal_False, "here is no TypeProvider or the ImplId is wrong"); + OSL_FAIL("here is no TypeProvider or the ImplId is wrong"); bDelInfo = sal_True; } } diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index c6813d3283b4..4db6da9a91b5 100755 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "xof::component_getFactory: Exception!" ); + OSL_FAIL( "xof::component_getFactory: Exception!" ); } } diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index e858f7d857f6..7ff7b289d2c1 100755 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -1565,7 +1565,7 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) } else { - OSL_ENSURE( sal_False, "unknown control type!" ); + OSL_FAIL( "unknown control type!" ); continue; } } |