OSL_ENSHURE replaced by OSL_ENSURE

6 files changed, 37 insertions, 37 deletions

diff --git a/configmgr/source/tree/changes.cxx b/configmgr/source/tree/changes.cxx
index dd90cca63298..680fe359140c 100644
--- a/configmgr/source/tree/changes.cxx
+++ b/configmgr/source/tree/changes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: changes.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: lla $ $Date: 2001-01-17 15:02:33 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:26:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,7 +148,7 @@ void ValueChange::applyTo(ValueNode& aValue)
         break;
 
     default:
-        OSL_ENSHURE(0, "Unknown mode found for ValueChange");
+        OSL_ENSURE(0, "Unknown mode found for ValueChange");
         break;
     }
 }
@@ -172,7 +172,7 @@ void ValueChange::applyTo(ValueNode& aValue)
         aRet = ::rtl::OUString::createFromAscii("changeDefault");
         break;
     default:
-        OSL_ENSHURE(0,"getModeAsString: Wrong mode!");
+        OSL_ENSURE(0,"getModeAsString: Wrong mode!");
     }
 
     return aRet;
@@ -186,7 +186,7 @@ void ValueChange::setModeAsString(const ::rtl::OUString& _rMode)
     else if(_rMode == ::rtl::OUString::createFromAscii("changeDefault"))m_eMode = changeDefault;
     else
     {
-        OSL_ENSHURE(0,"setModeAsString: Wrong mode!");
+        OSL_ENSURE(0,"setModeAsString: Wrong mode!");
     }
 }
 
diff --git a/configmgr/source/tree/cmtree.cxx b/configmgr/source/tree/cmtree.cxx
index c4409a4aa096..a28b317bab59 100644
--- a/configmgr/source/tree/cmtree.cxx
+++ b/configmgr/source/tree/cmtree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmtree.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:01:03 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:26:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -243,12 +243,12 @@ namespace configmgr
         {
             OUString aNodeName = _nNode.getName();
             ISubtree* pTree = m_pCacheNode->asISubtree();
-            OSL_ENSHURE(pTree, "OBuildChangeTree::handle : node must be a inner node!");
+            OSL_ENSURE(pTree, "OBuildChangeTree::handle : node must be a inner node!");
             if (pTree)
             {
                 INode* pChild = pTree->getChild(aNodeName);
                 ValueNode* pValueNode = pChild ? pChild->asValueNode() : NULL;
-                OSL_ENSHURE(pValueNode, "OBuildChangeTree::handle : node must be a value node!");
+                OSL_ENSURE(pValueNode, "OBuildChangeTree::handle : node must be a value node!");
 
                 // if the values differ add a new change
                 if (pValueNode && _nNode.getValue() != pValueNode->getValue())
@@ -263,7 +263,7 @@ namespace configmgr
         {
             OUString aNodeName = _rSubtree.getName();
             ISubtree* pTree = m_pCacheNode->asISubtree();
-            OSL_ENSHURE(pTree, "OBuildChangeTree::handle : node must be a inner node!");
+            OSL_ENSURE(pTree, "OBuildChangeTree::handle : node must be a inner node!");
             if (pTree)
             {
                 INode* pChild = pTree->getChild(aNodeName);
@@ -272,7 +272,7 @@ namespace configmgr
                 if (pChild)
                 {
                     ISubtree* pSubTree = pChild->asISubtree();
-                    OSL_ENSHURE(pSubTree, "OBuildChangeTree::handle : node must be a inner node!");
+                    OSL_ENSURE(pSubTree, "OBuildChangeTree::handle : node must be a inner node!");
                     // generate a new change
 
                     SubtreeChange* pChange = new SubtreeChange(_rSubtree);
diff --git a/configmgr/source/tree/cmtreemodel.cxx b/configmgr/source/tree/cmtreemodel.cxx
index 2e6f8bb27313..3a79865d8ddf 100644
--- a/configmgr/source/tree/cmtreemodel.cxx
+++ b/configmgr/source/tree/cmtreemodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmtreemodel.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jb $ $Date: 2001-03-20 17:05:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:26:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,7 +147,7 @@ void SubtreeChange::addChange(std::auto_ptr<Change> aChange)
 {
     OUString aNodeName(aChange->getNodeName());
     m_aChanges.find(aNodeName);
-    OSL_ENSHURE(m_aChanges.end() == m_aChanges.find(aNodeName),
+    OSL_ENSURE(m_aChanges.end() == m_aChanges.find(aNodeName),
         "SubtreeChange::addChange : overwriting an existent change !");
     delete m_aChanges[aNodeName];
     m_aChanges[aNodeName] = aChange.release();
@@ -279,7 +279,7 @@ SubtreeChange::ChildIterator::ChildIterator(const SubtreeChange* _pTree, struct
 //--------------------------------------------------------------------------
 Change const & SubtreeChange::ChildIterator::operator*() const
 {
-    OSL_ENSHURE(isValid(), "SubtreeChange::ChildIterator::operator* : invalid iterator !");
+    OSL_ENSURE(isValid(), "SubtreeChange::ChildIterator::operator* : invalid iterator !");
 
     if (!isValid())
         throw configuration::Exception("INTERNAL ERROR: Invalid SubtreeChange::ChildIterator dereferenced");
@@ -292,14 +292,14 @@ Change const * SubtreeChange::ChildIterator::operator->() const
 {
     if (isValid())
         return m_pTree->getChange(m_aNames[m_nPos]);
-    OSL_ENSHURE(sal_False, "SubtreeChange::ChildIterator::operator-> : invalid iterator !");
+    OSL_ENSURE(sal_False, "SubtreeChange::ChildIterator::operator-> : invalid iterator !");
     return NULL;
 }
 
 //--------------------------------------------------------------------------
 SubtreeChange::ChildIterator& SubtreeChange::ChildIterator::operator++()
 {
-    OSL_ENSHURE(m_nPos < m_aNames.getLength(), "SubtreeChange::ChildIterator : can't increment the end iterator !");
+    OSL_ENSURE(m_nPos < m_aNames.getLength(), "SubtreeChange::ChildIterator : can't increment the end iterator !");
     if (m_nPos < m_aNames.getLength())
         ++m_nPos;
     return *this;
@@ -308,7 +308,7 @@ SubtreeChange::ChildIterator& SubtreeChange::ChildIterator::operator++()
 //--------------------------------------------------------------------------
 SubtreeChange::ChildIterator& SubtreeChange::ChildIterator::operator--()
 {
-    OSL_ENSHURE(m_nPos > 0, "SubtreeChange::ChildIterator : can't decrement the begin iterator !");
+    OSL_ENSURE(m_nPos > 0, "SubtreeChange::ChildIterator : can't decrement the begin iterator !");
     if (m_nPos > 0)
         --m_nPos;
     return *this;
@@ -331,7 +331,7 @@ SubtreeChangeReferrer::SubtreeChangeReferrer(const SubtreeChange& _rSource)
     while (aSourceChildren != _rSource.end())
     {
         const Change* pChange = &*aSourceChildren;
-        OSL_ENSHURE(pChange, "SubtreeChangeReferrer::SubtreeChangeReferrer : invalid change !");
+        OSL_ENSURE(pChange, "SubtreeChangeReferrer::SubtreeChangeReferrer : invalid change !");
         if  (   pChange->isA(ValueChange::getStaticType())
             ||  pChange->isA(RemoveNode::getStaticType())
             ||  pChange->isA(AddNode::getStaticType())
@@ -344,7 +344,7 @@ SubtreeChangeReferrer::SubtreeChangeReferrer(const SubtreeChange& _rSource)
             SubtreeChange::addChange(::std::auto_ptr<Change>(new SubtreeChangeReferrer(*static_cast<const SubtreeChange*>(pChange))));
         }
         else
-            OSL_ENSHURE(sal_False, "SubtreeChangeReferrer::SubtreeChangeReferrer : unknown changes type !");
+            OSL_ENSURE(sal_False, "SubtreeChangeReferrer::SubtreeChangeReferrer : unknown changes type !");
 
         ++aSourceChildren;
     }
@@ -376,7 +376,7 @@ SubtreeChangeReferrer::~SubtreeChangeReferrer()
             // nothing to do
         }
         else
-            OSL_ENSHURE(sal_False, "SubtreeChangeReferrer::~SubtreeChangeReferrer : unknown changes type !");
+            OSL_ENSURE(sal_False, "SubtreeChangeReferrer::~SubtreeChangeReferrer : unknown changes type !");
     }
 
     // the base class will remove the remaining SubtreeChanges, which are SubtreeChangeReferrer's in real
diff --git a/configmgr/source/tree/treeactions.cxx b/configmgr/source/tree/treeactions.cxx
index c18fc2125b9f..09c508f77912 100644
--- a/configmgr/source/tree/treeactions.cxx
+++ b/configmgr/source/tree/treeactions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: treeactions.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jb $ $Date: 2001-03-12 15:04:10 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:26:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -175,7 +175,7 @@ void OMergeTreeAction::handle(ValueChange& _rChange)
     if (pChild)
     {
         const ValueNode* pValueNode = pChild ? pChild->asValueNode() : NULL;
-        OSL_ENSHURE(pValueNode, "OBuildChangeTree::handle : node must be a value node!");
+        OSL_ENSURE(pValueNode, "OBuildChangeTree::handle : node must be a value node!");
 
         if (pValueNode && _rChange.getNewValue() != pValueNode->getValue())
         {
@@ -205,7 +205,7 @@ void OMergeTreeAction::handle(SubtreeChange& _rChange)
     if (pChild)
     {
         const ISubtree* pSubTree = pChild->asISubtree();
-        OSL_ENSHURE(pSubTree, "OMergeTreeAction::handle : node must be a inner node!");
+        OSL_ENSURE(pSubTree, "OMergeTreeAction::handle : node must be a inner node!");
 
         if (pSubTree)
         {
@@ -278,7 +278,7 @@ void OMergeTreeAction::handle(AddNode& _rChange)
         const ValueNode* pValueNode = pChild->asValueNode();
 
         std::auto_ptr<INode> aNewNode = _rChange.releaseAddedNode();
-        OSL_ENSHURE(pValueNode && aNewNode.get() && aNewNode.get()->asValueNode(), "OMergeTreeAction::handle : node must be a value node!");
+        OSL_ENSURE(pValueNode && aNewNode.get() && aNewNode.get()->asValueNode(), "OMergeTreeAction::handle : node must be a value node!");
         if (!pValueNode || !aNewNode.get() || !aNewNode.get()->asValueNode())
             return;
 
@@ -399,7 +399,7 @@ void OCreateSubtreeAction::handle(AddNode& _rChange)
         {
             ::rtl::OString aStr("TreeUpdate: 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
@@ -415,7 +415,7 @@ void OCreateSubtreeAction::handle(AddNode& _rChange)
                 std::auto_ptr<INode> aOldNode = m_pCurrentSubtree->removeChild(aAddNode.getNodeName());
 
 #ifdef DBUG
-                OSL_ENSHURE(aOldNode.get(), "TreeUpdate:AddNode: can't recover node being replaced");
+                OSL_ENSURE(aOldNode.get(), "TreeUpdate:AddNode: can't recover node being replaced");
                 if (aOldNode.get() == NULL)
                     aLog.push_back(OString("TreeUpdate: can't recover node being replaced (for AddNode)"));
 #endif
@@ -457,7 +457,7 @@ void OCreateSubtreeAction::handle(AddNode& _rChange)
             {
                 ::rtl::OString aStr("TreeUpdate: 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
@@ -469,13 +469,13 @@ void OCreateSubtreeAction::handle(AddNode& _rChange)
     {
         // handle traversion
         ISubtree *pOldSubtree = m_pCurrentSubtree;
-        OSL_ENSHURE(m_pCurrentSubtree->getChild(aSubtree.getNodeName()), "TreeUpdate::handle : invalid subtree change ... this will crash !");
+        OSL_ENSURE(m_pCurrentSubtree->getChild(aSubtree.getNodeName()), "TreeUpdate::handle : invalid subtree change ... this will crash !");
         m_pCurrentSubtree = m_pCurrentSubtree->getChild(aSubtree.getNodeName())->asISubtree();
 
 #if DBUG
         ::rtl::OString aStr("TreeUpdate: 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/treemgr/configgroup.cxx b/configmgr/source/treemgr/configgroup.cxx
index f309f52294ea..66249568c6c3 100644
--- a/configmgr/source/treemgr/configgroup.cxx
+++ b/configmgr/source/treemgr/configgroup.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: configgroup.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: lla $ $Date: 2001-03-07 14:58:38 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:29:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,7 +146,7 @@ bool convertCompatibleValue(UnoTypeConverter const& xTypeConverter, uno::Any& rC
     }
     catch(uno::Exception&)
     {
-        OSL_ENSHURE(sal_False, "ValueUpdater::convertValue : generic exception ... thought we caught all allowed exceptions !");
+        OSL_ENSURE(sal_False, "ValueUpdater::convertValue : generic exception ... thought we caught all allowed exceptions !");
         // try to do more conversion here ?!
         return false;
     }
diff --git a/configmgr/source/treemgr/roottree.cxx b/configmgr/source/treemgr/roottree.cxx
index d200ac61a4ce..d6f2eed9046c 100644
--- a/configmgr/source/treemgr/roottree.cxx
+++ b/configmgr/source/treemgr/roottree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: roottree.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jb $ $Date: 2001-03-20 17:05:05 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:29:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,7 @@ bool adjustToChanges(   NodeChangesInformation& rLocalChanges,
 CommitHelper::CommitHelper(Tree const& aTree)
 {
     m_pTree = TreeImplHelper::impl(aTree);
-    OSL_ENSHURE(m_pTree, "INTERNAL ERROR: Unexpected NULL tree in commit helper");
+    OSL_ENSURE(m_pTree, "INTERNAL ERROR: Unexpected NULL tree in commit helper");
 }
 //-----------------------------------------------------------------------------