summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configmgr/source/api2/confprovider2.cxx6
-rw-r--r--configmgr/source/api2/elementimpl.cxx6
-rw-r--r--configmgr/source/api2/listenercontainer.hxx18
-rw-r--r--configmgr/source/api2/propsetaccessimpl.cxx6
-rw-r--r--configmgr/source/api2/providerimpl.cxx14
-rw-r--r--configmgr/source/api2/updateimpl.cxx12
-rw-r--r--configmgr/source/inc/treeprovider.hxx6
-rw-r--r--configmgr/source/misc/configunoreg.cxx18
-rw-r--r--configmgr/source/misc/filehelper.cxx8
-rw-r--r--configmgr/source/misc/mergechange.cxx34
-rw-r--r--configmgr/source/misc/providerfactory.cxx9
-rw-r--r--configmgr/source/registry/configregistry.cxx8
12 files changed, 74 insertions, 71 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));
diff --git a/configmgr/source/inc/treeprovider.hxx b/configmgr/source/inc/treeprovider.hxx
index c9573bac979a..69bf2484afce 100644
--- a/configmgr/source/inc/treeprovider.hxx
+++ b/configmgr/source/inc/treeprovider.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: treeprovider.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: jb $ $Date: 2001-03-20 17:05:04 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:16:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -179,7 +179,7 @@ namespace configmgr
, pathToRoot(_rPathToRoot, ConfigurationName::Absolute())
, root(_rTree)
{
- OSL_ENSHURE(false, "Test only, because deep copy of subtreechange is very expensive.");
+ OSL_ENSURE(false, "Test only, because deep copy of subtreechange is very expensive.");
}
/** ctor
diff --git a/configmgr/source/misc/configunoreg.cxx b/configmgr/source/misc/configunoreg.cxx
index 6f53bdda05aa..33c77c3a15ee 100644
--- a/configmgr/source/misc/configunoreg.cxx
+++ b/configmgr/source/misc/configunoreg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: configunoreg.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: dg $ $Date: 2001-02-15 17:20:38 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:15:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -112,7 +112,7 @@ void REGISTER_PROVIDER(
aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSHURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
+ OSL_ENSURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
for (sal_Int32 i=0; i<Services.getLength(); ++i)
xNewKey->createKey(Services[i]);
@@ -132,7 +132,7 @@ void RegisterService(
aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSHURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
+ OSL_ENSURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
AsciiServiceName const* p = pInfo->serviceNames;
if (p != 0)
@@ -169,12 +169,12 @@ struct ProviderRequest
if (!xRet.is() && (Implname == sImplementationName))
try
{
- OSL_ENSHURE(!xRet.is(), "CREATE_PROVIDER : invalid : already have a return value !");
+ OSL_ENSURE(!xRet.is(), "CREATE_PROVIDER : invalid : already have a return value !");
if (xRet.is())
xRet->release();
xRet = creator( m_xServiceManager, sImplementationName,Factory, Services);
- OSL_ENSHURE(xRet.is(), "CREATE_PROVIDER : invalid return value !");
+ OSL_ENSURE(xRet.is(), "CREATE_PROVIDER : invalid return value !");
if (xRet.is())
xRet->acquire();
@@ -193,7 +193,7 @@ struct ProviderRequest
createFactoryFunc creator
)
{
- OSL_ENSHURE(!xRet.is(), "CreateProvider : invalid : we already have a return value !");
+ OSL_ENSURE(!xRet.is(), "CreateProvider : invalid : we already have a return value !");
if (xRet.is())
return true; //xRet->release();
@@ -203,7 +203,7 @@ struct ProviderRequest
const Sequence< OUString > Services= configmgr::ServiceComponentImpl::getServiceNames(pInfo);
xRet = creator( m_xServiceManager, OUString::createFromAscii(pInfo->implementationName),Factory, Services);
- OSL_ENSHURE(xRet.is(), "CreateProvider : WHERE IS THE return value !");
+ OSL_ENSURE(xRet.is(), "CreateProvider : WHERE IS THE return value !");
if (xRet.is())
xRet->acquire();
@@ -252,7 +252,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
}
catch (::com::sun::star::registry::InvalidRegistryException& )
{
- OSL_ENSHURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
+ OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
}
return sal_False;
diff --git a/configmgr/source/misc/filehelper.cxx b/configmgr/source/misc/filehelper.cxx
index f7bb7ec7138e..bec2bee791c3 100644
--- a/configmgr/source/misc/filehelper.cxx
+++ b/configmgr/source/misc/filehelper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: filehelper.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:13:41 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:15:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -103,7 +103,7 @@ using namespace ::osl;
sError += ASCII("\n with URL: ");
sError += _aURL;
rtl::OString aStr = rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US);
- OSL_ENSHURE(0, aStr.getStr());
+ OSL_ENSURE(0, aStr.getStr());
return 1;
}
return 0;
@@ -123,7 +123,7 @@ using namespace ::osl;
{
rtl::OUString sError = ASCII("createBackupAndRemove: ") + FileHelper::createOSLErrorString(eError) + ASCII("\n with URL: ") + _aFromURL;
rtl::OString aStr = rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US);
- OSL_ENSHURE(0, aStr.getStr());
+ OSL_ENSURE(0, aStr.getStr());
return 2;
}
return 0;
diff --git a/configmgr/source/misc/mergechange.cxx b/configmgr/source/misc/mergechange.cxx
index 4e4eca42075b..34fcd919cbb6 100644
--- a/configmgr/source/misc/mergechange.cxx
+++ b/configmgr/source/misc/mergechange.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mergechange.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jb $ $Date: 2001-03-20 17:06:48 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:15:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -214,7 +214,7 @@ namespace configmgr
}
virtual void handle(RemoveNode& _rRemoveNode)
{
- OSL_ENSHURE(false, "OMergeValueChange::handle(ValueChange): have a ValueChange for a removed node!");
+ OSL_ENSURE(false, "OMergeValueChange::handle(ValueChange): have a ValueChange for a removed node!");
// should never happen. How did the user change a value for a node which is obviously flagged as removed?
}
virtual void handle(AddNode& _rAddNode)
@@ -229,7 +229,7 @@ namespace configmgr
}
virtual void handle(SubtreeChange& _rSubtree)
{
- OSL_ENSHURE(false, "OMergeValueChange:handle(SubtreeChange): have a ValueChange for a sub tree!");
+ OSL_ENSURE(false, "OMergeValueChange:handle(SubtreeChange): have a ValueChange for a sub tree!");
}
};
@@ -265,12 +265,12 @@ namespace configmgr
private:
virtual void handle(ValueChange& aValueChange)
{
- OSL_ENSHURE(false, "OMergeRemoveNode::handle(ValueChange): remove a value node?");
+ OSL_ENSURE(false, "OMergeRemoveNode::handle(ValueChange): remove a value node?");
}
virtual void handle(RemoveNode& _rRemoveNode)
{
- OSL_ENSHURE(false, "OMergeRemoveNode::handle(RemoveNode): should never happen!");
+ OSL_ENSURE(false, "OMergeRemoveNode::handle(RemoveNode): should never happen!");
// how can a RemoveNode change exist if in the file we're merging it into
// there already is such a RemoveNode change (_rRemoveNode)?
}
@@ -310,12 +310,12 @@ namespace configmgr
private:
virtual void handle(ValueChange& aValueChange)
{
- OSL_ENSHURE(false, "OMergeSubtreeChange::handle(ValueChange): remove a value node?");
+ OSL_ENSURE(false, "OMergeSubtreeChange::handle(ValueChange): remove a value node?");
}
virtual void handle(RemoveNode& _rRemoveNode)
{
- OSL_ENSHURE(false, "OMergeSubtreeChange::handle(RemoveNode): should never happen!");
+ OSL_ENSURE(false, "OMergeSubtreeChange::handle(RemoveNode): should never happen!");
}
virtual void handle(AddNode& _rAddNode)
@@ -338,7 +338,7 @@ namespace configmgr
void OMergeTreeChangeList::pushTree(SubtreeChange* _pTree)
{
m_pCurrentParent = _pTree;
- OSL_ENSHURE(m_pCurrentParent, "OMergeTreeChangeList::pushTree: must not be NULL!");
+ OSL_ENSURE(m_pCurrentParent, "OMergeTreeChangeList::pushTree: must not be NULL!");
m_aTreePathStack.push_back(_pTree);
}
void OMergeTreeChangeList::popTree()
@@ -542,7 +542,7 @@ namespace configmgr
OSL_ENSURE(pSubtree, "BLA");
if (pSubtree)
{
- OSL_ENSHURE(false, "DANGER, THIS CODE IS WRONG!");
+ OSL_ENSURE(false, "DANGER, THIS CODE IS WRONG!");
// because, the important Node is the _rSubtree, which will not insert anywhere
// Merge _rSubtree into pSubtree using a TreeUpdate object
@@ -580,7 +580,7 @@ namespace configmgr
void OMergeChanges::pushTree(SubtreeChange* _pTree)
{
m_pCurrentParent = _pTree;
- OSL_ENSHURE(m_pCurrentParent, "OMergeChanges::pushTree: must not be NULL!");
+ OSL_ENSURE(m_pCurrentParent, "OMergeChanges::pushTree: must not be NULL!");
m_aTreePathStack.push_back(_pTree);
}
void OMergeChanges::popTree()
@@ -788,7 +788,7 @@ namespace configmgr
}
else if (pChange->ISA(AddNode))
{
- // OSL_ENSHURE(false, "sorry, no addnode in subtreechange! can't supported yet.");
+ // OSL_ENSURE(false, "sorry, no addnode in subtreechange! can't supported yet.");
AddNode* pAddNode = SAL_STATIC_CAST(AddNode*, pChange);
INode* pNode = pAddNode->getAddedNode();
@@ -860,7 +860,7 @@ namespace configmgr
{
::rtl::OString aStr("TreeUpdater: Can't find value with name:=");
aStr += rtl::OUStringToOString(aValueNode.getNodeName(),RTL_TEXTENCODING_ASCII_US);
- OSL_ENSHURE(pValue, aStr.getStr());
+ OSL_ENSURE(pValue, aStr.getStr());
aLog.push_back(aStr);
}
#endif
@@ -876,7 +876,7 @@ namespace configmgr
std::auto_ptr<INode> aOldNode = m_pCurrentSubtree->removeChild(aAddNode.getNodeName());
#ifdef DEBUG
- OSL_ENSHURE(aOldNode.get(), "TreeUpdater:AddNode: can't recover node being replaced");
+ OSL_ENSURE(aOldNode.get(), "TreeUpdater:AddNode: can't recover node being replaced");
if (aOldNode.get() == NULL)
aLog.push_back(rtl::OString("TreeUpdater: can't recover node being replaced (for AddNode)"));
#endif
@@ -918,7 +918,7 @@ namespace configmgr
{
::rtl::OString aStr("TreeUpdater: Can't remove child with name:=");
aStr += rtl::OUStringToOString(aRemoveNode.getNodeName(),RTL_TEXTENCODING_ASCII_US);
- OSL_ENSHURE(bOk, aStr.getStr());
+ OSL_ENSURE(bOk, aStr.getStr());
aLog.push_back(aStr);
}
#endif
@@ -930,13 +930,13 @@ namespace configmgr
// handle traversion
ISubtree *pOldSubtree = m_pCurrentSubtree;
rtl::OUString aNodeName = _aSubtree.getNodeName();
- OSL_ENSHURE(m_pCurrentSubtree->getChild(aNodeName), "TreeUpdater::handle : invalid subtree change ... this will crash !");
+ OSL_ENSURE(m_pCurrentSubtree->getChild(aNodeName), "TreeUpdater::handle : invalid subtree change ... this will crash !");
m_pCurrentSubtree = m_pCurrentSubtree->getChild(aNodeName)->asISubtree();
#if DEBUG
::rtl::OString aStr("TreeUpdater: there is no Subtree for name:=");
aStr += rtl::OUStringToOString(_aSubtree.getNodeName(),RTL_TEXTENCODING_ASCII_US);
- OSL_ENSHURE(m_pCurrentSubtree, aStr.getStr());
+ OSL_ENSURE(m_pCurrentSubtree, aStr.getStr());
if (!m_pCurrentSubtree)
aLog.push_back(aStr);
#endif
diff --git a/configmgr/source/misc/providerfactory.cxx b/configmgr/source/misc/providerfactory.cxx
index bf83771fc5f2..2a59c2560f73 100644
--- a/configmgr/source/misc/providerfactory.cxx
+++ b/configmgr/source/misc/providerfactory.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: providerfactory.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: lla $ $Date: 2001-01-26 07:54:21 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:15:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -333,7 +333,7 @@ namespace configmgr
m_xDefaultProvider = NULL;
}
else
- OSL_ENSHURE(sal_False, "unknown object disposed.");
+ OSL_ENSURE(sal_False, "unknown object disposed.");
}
//........................................................................
@@ -343,6 +343,9 @@ namespace configmgr
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.6 2001/01/26 07:54:21 lla
+ * #82734# disposing with lasy writing necessary
+ *
* Revision 1.5 2000/12/07 16:46:12 dg
* #81469# incomplete adjustments to portal environment fixed
*
diff --git a/configmgr/source/registry/configregistry.cxx b/configmgr/source/registry/configregistry.cxx
index 7fafd6091acd..14dbfd147af1 100644
--- a/configmgr/source/registry/configregistry.cxx
+++ b/configmgr/source/registry/configregistry.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: configregistry.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jb $ $Date: 2001-02-23 10:39:30 $
+ * last change: $Author: jl $ $Date: 2001-03-21 12:17:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -147,7 +147,7 @@ OConfigurationRegistry::OConfigurationRegistry(const Reference< XMultiServiceFac
,m_xORB(_rORB)
{
// create the configuration provider used for accessing the configuration
- OSL_ENSHURE(m_xORB.is(), "OConfigurationRegistry::OConfigurationRegistry : invalid service factory !");
+ OSL_ENSURE(m_xORB.is(), "OConfigurationRegistry::OConfigurationRegistry : invalid service factory !");
if (m_xORB.is())
{
m_xConfigurationProvider =
@@ -378,7 +378,7 @@ void SAL_CALL OConfigurationRegistry::flush( ) throw(RuntimeException)
sMessage += e.Message;
// TODO : the specification of XFlushable has to be changed !!!!!
- OSL_ENSHURE(sal_False, "OConfigurationRegistry::flush : caught an exception, could not flush the data !");
+ OSL_ENSURE(sal_False, "OConfigurationRegistry::flush : caught an exception, could not flush the data !");
return;
// throw RuntimeException(sMessage, THISREF());
generated by cgit (git 2.34.1) at 2025-02-23 00:57:47 +0000