diff options
author | Joachim Lingner <jl@openoffice.org> | 2001-03-21 11:17:35 +0000 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2001-03-21 11:17:35 +0000 |
commit | aad9057e5c59975ff0d58613773964336980a8e8 (patch) | |
tree | 33fcca66ab2863840416b89e63d4abd03f4c29b0 /configmgr/source/api2 | |
parent | 9a9ff76a12d3cd5c9cbc10e0a8f6b69388220dfc (diff) |
OSL_ENSHURE replaced by OSL_ENSURE
Diffstat (limited to 'configmgr/source/api2')
-rw-r--r-- | configmgr/source/api2/confprovider2.cxx | 6 | ||||
-rw-r--r-- | configmgr/source/api2/elementimpl.cxx | 6 | ||||
-rw-r--r-- | configmgr/source/api2/listenercontainer.hxx | 18 | ||||
-rw-r--r-- | configmgr/source/api2/propsetaccessimpl.cxx | 6 | ||||
-rw-r--r-- | configmgr/source/api2/providerimpl.cxx | 14 | ||||
-rw-r--r-- | configmgr/source/api2/updateimpl.cxx | 12 |
6 files changed, 31 insertions, 31 deletions
diff --git a/configmgr/source/api2/confprovider2.cxx b/configmgr/source/api2/confprovider2.cxx index 03e1d5e955dc..df4059d6e209 100644 --- a/configmgr/source/api2/confprovider2.cxx +++ b/configmgr/source/api2/confprovider2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: confprovider2.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: armin $ $Date: 2001-03-07 17:17:50 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,7 +132,7 @@ namespace configmgr { &configapi::aCreateReadAccessSI, &OConfigurationProviderImpl::createReadAccess }, { &configapi::aCreateUpdateAccessSI, &OConfigurationProviderImpl::createUpdateAccess }, }; - OSL_ENSHURE(sizeof(createServiceData)/sizeof(createServiceData[0]) == getCreateServiceDataCount(), + OSL_ENSURE(sizeof(createServiceData)/sizeof(createServiceData[0]) == getCreateServiceDataCount(), "getCreateServiceData : inconsistent data !"); return createServiceData; } diff --git a/configmgr/source/api2/elementimpl.cxx b/configmgr/source/api2/elementimpl.cxx index 55bec8cb3181..87d3925a78fe 100644 --- a/configmgr/source/api2/elementimpl.cxx +++ b/configmgr/source/api2/elementimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: elementimpl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jb $ $Date: 2001-02-13 17:14:10 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -542,7 +542,7 @@ sal_Bool implHasPendingChanges( TreeElement& rElement ) throw(uno::RuntimeExcept e.unhandled(); } - OSL_ENSHURE(false,"Unreachable Code"); + OSL_ENSURE(false,"Unreachable Code"); return false; } //----------------------------------------------------------------------------- diff --git a/configmgr/source/api2/listenercontainer.hxx b/configmgr/source/api2/listenercontainer.hxx index e4bc8074dd49..9345940ba2a4 100644 --- a/configmgr/source/api2/listenercontainer.hxx +++ b/configmgr/source/api2/listenercontainer.hxx @@ -2,9 +2,9 @@ * * $RCSfile: listenercontainer.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jb $ $Date: 2000-12-03 11:56:29 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -223,7 +223,7 @@ namespace configmgr void setObjectAt(Index nIndex, UnoInterface* pInterface) { osl::MutexGuard aGuard(mutex()); - OSL_ENSHURE( !isDisposed(), "object is disposed" ); + OSL_ENSURE( !isDisposed(), "object is disposed" ); if (isAlive()) { @@ -531,8 +531,8 @@ namespace configmgr sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::addListener( Index nIndex, const UnoType& aType, const uno::Reference< lang::XEventListener > & xListener ) throw(uno::RuntimeException) { osl::MutexGuard aGuard( mutex() ); - OSL_ENSHURE( !isDisposing(), "do not add listeners in the dispose call" ); - OSL_ENSHURE( !isDisposed(), "object is disposed" ); + OSL_ENSURE( !isDisposing(), "do not add listeners in the dispose call" ); + OSL_ENSURE( !isDisposed(), "object is disposed" ); if ( isAlive() ) { @@ -552,8 +552,8 @@ namespace configmgr sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::addSpecialListener( const Key_& aKey, const uno::Reference< lang::XEventListener > & xListener ) throw(uno::RuntimeException) { osl::MutexGuard aGuard( mutex() ); - OSL_ENSHURE( !isDisposing(), "do not add listeners in the dispose call" ); - OSL_ENSHURE( !isDisposed(), "object is disposed" ); + OSL_ENSURE( !isDisposing(), "do not add listeners in the dispose call" ); + OSL_ENSURE( !isDisposed(), "object is disposed" ); if ( isAlive() ) { @@ -572,7 +572,7 @@ namespace configmgr sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::removeListener( Index nIndex, const UnoType& aType, const uno::Reference< lang::XEventListener > & xListener ) throw(uno::RuntimeException) { osl::MutexGuard aGuard( mutex() ); - OSL_ENSHURE( !isDisposed(), "object is disposed" ); + OSL_ENSURE( !isDisposed(), "object is disposed" ); if ( isAlive() ) { @@ -589,7 +589,7 @@ namespace configmgr sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::removeSpecialListener( const Key_& aKey, const uno::Reference< lang::XEventListener > & xListener ) throw(uno::RuntimeException) { osl::MutexGuard aGuard( mutex() ); - OSL_ENSHURE( !isDisposed(), "object is disposed" ); + OSL_ENSURE( !isDisposed(), "object is disposed" ); if ( isAlive() ) return m_aSpecialHelper.aLC.removeInterface(aKey, xListener ); diff --git a/configmgr/source/api2/propsetaccessimpl.cxx b/configmgr/source/api2/propsetaccessimpl.cxx index e9c3ccff01ab..7bda6a977d07 100644 --- a/configmgr/source/api2/propsetaccessimpl.cxx +++ b/configmgr/source/api2/propsetaccessimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propsetaccessimpl.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: jb $ $Date: 2001-02-07 16:28:40 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -897,7 +897,7 @@ Sequence< Any > implGetHierarchicalPropertyValues( NodeGroupInfoAccess& rNode, c void implFirePropertiesChangeEvent( NodeGroupInfoAccess& rNode, const Sequence< OUString >& aPropertyNames, const Reference< beans::XPropertiesChangeListener >& xListener ) throw(RuntimeException) { - OSL_ENSHURE(xListener.is(), "ERROR: requesting to fire Events to a NULL listener."); + OSL_ENSURE(xListener.is(), "ERROR: requesting to fire Events to a NULL listener."); if (!xListener.is()) { return; // should this be an exception ?? diff --git a/configmgr/source/api2/providerimpl.cxx b/configmgr/source/api2/providerimpl.cxx index 4cd32f800a45..ca39daed12cc 100644 --- a/configmgr/source/api2/providerimpl.cxx +++ b/configmgr/source/api2/providerimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: providerimpl.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: jb $ $Date: 2001-03-12 18:03:13 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ namespace configmgr { uno::Reference< script::XTypeConverter > xConverter( _xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.Converter" ))), uno::UNO_QUERY); - OSL_ENSHURE(xConverter.is(), "Module::Module : could not create an instance of the type converter !"); + OSL_ENSURE(xConverter.is(), "Module::Module : could not create an instance of the type converter !"); m_xDefaultOptions = new OOptions(xConverter); @@ -501,16 +501,16 @@ namespace configmgr rtl::OString aStr = "The argument '"; aStr += rtl::OUStringToOString(aCurrent.Name,RTL_TEXTENCODING_ASCII_US).getStr(); aStr += "' could not be extracted."; - OSL_ENSHURE(false, aStr.getStr()); + OSL_ENSURE(false, aStr.getStr()); } } else if (i > 0 || pCurrent->getValueTypeClass() != uno::TypeClass_STRING) { - OSL_ENSHURE(false, "operator >>= failed."); + OSL_ENSURE(false, "operator >>= failed."); } else { - OSL_ENSHURE(_rArgs.getLength() <= 2, "Too many arguments for legacy parameters."); + OSL_ENSURE(_rArgs.getLength() <= 2, "Too many arguments for legacy parameters."); break; } } @@ -565,7 +565,7 @@ namespace configmgr ::rtl::OString sMessage(RTL_CONSTASCII_STRINGPARAM("OProviderImpl::extractArgs : unknown argument name: ")); sMessage += ::rtl::OString(aCurrent.Name.getStr(), aCurrent.Name.getLength(), RTL_TEXTENCODING_ASCII_US); sMessage += ::rtl::OString(RTL_CONSTASCII_STRINGPARAM("!")); - OSL_ENSHURE(sal_False, sMessage.getStr()); + OSL_ENSURE(sal_False, sMessage.getStr()); } #endif */ diff --git a/configmgr/source/api2/updateimpl.cxx b/configmgr/source/api2/updateimpl.cxx index 1a9bb0b58909..059dda67bee6 100644 --- a/configmgr/source/api2/updateimpl.cxx +++ b/configmgr/source/api2/updateimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: updateimpl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jb $ $Date: 2001-02-23 08:49:14 $ + * last change: $Author: jl $ $Date: 2001-03-21 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -385,7 +385,7 @@ void implInsertByName(NodeTreeSetAccess& rNode, const OUString& sName, const Any NodeChange aChange = rNode.getNodeUpdater().validateInsertElement(aChildName, aElementTree); aChange.test(); // make sure old values are set up correctly - OSL_ENSHURE(aChange.isChange(), "ERROR: Adding a node validated as empty change"); + OSL_ENSURE(aChange.isChange(), "ERROR: Adding a node validated as empty change"); Broadcaster aSender(impl->getNotifier().makeBroadcaster(aChange,true)); @@ -453,7 +453,7 @@ void implInsertByName(NodeValueSetAccess& rNode, const OUString& sName, const An NodeChange aChange = rNode.getNodeUpdater().validateInsertElement(aChildName, rElement); aChange.test(); // make sure old values are set up correctly - OSL_ENSHURE(aChange.isChange(), "ERROR: Adding a node validated as empty change"); + OSL_ENSURE(aChange.isChange(), "ERROR: Adding a node validated as empty change"); Broadcaster aSender(impl->getNotifier().makeBroadcaster(aChange,true)); @@ -522,7 +522,7 @@ void implRemoveByName(NodeTreeSetAccess& rNode, const OUString& sName ) NodeChange aChange = rNode.getNodeUpdater().validateRemoveElement(aChildTree, aChild); aChange.test(); // make sure old values are set up correctly - OSL_ENSHURE(aChange.isChange(), "ERROR: Removing a node validated as empty change"); + OSL_ENSURE(aChange.isChange(), "ERROR: Removing a node validated as empty change"); Broadcaster aSender(impl->getNotifier().makeBroadcaster(aChange,true)); @@ -586,7 +586,7 @@ void implRemoveByName(NodeValueSetAccess& rNode, const OUString& sName ) NodeChange aChange = rNode.getNodeUpdater().validateRemoveElement(aChildTree, aChild); aChange.test(); // make sure old values are set up correctly - OSL_ENSHURE(aChange.isChange(), "ERROR: Removing a node validated as empty change"); + OSL_ENSURE(aChange.isChange(), "ERROR: Removing a node validated as empty change"); Broadcaster aSender(impl->getNotifier().makeBroadcaster(aChange,true)); |