summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-10-31 07:57:01 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-10-31 07:57:01 +0000
commitc61c530f794e5568af86ff7041d640d7ba8c757a (patch)
tree99d79dcbefcacc4cf59b14850e36b89bf99ff386
parente31044342952eb185c5385ddff8b8f300d12de14 (diff)
#i10000# Avoid mismatch bool <-> sal_Bool
-rw-r--r--configmgr/source/treemgr/nodeimplobj.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/configmgr/source/treemgr/nodeimplobj.cxx b/configmgr/source/treemgr/nodeimplobj.cxx
index 33e1515d4a..128bb97baa 100644
--- a/configmgr/source/treemgr/nodeimplobj.cxx
+++ b/configmgr/source/treemgr/nodeimplobj.cxx
@@ -660,7 +660,7 @@ void DeferredSetNodeImpl::finishCommit(SubtreeChange& rChanges)
aRemovedTree = addNode->getReplacedTree();
OSL_ASSERT( addNode->isReplacing() == (0!=pOriginal) );
- OSL_ASSERT( addNode->isReplacing() == aRemovedTree.is() );
+ OSL_ASSERT( addNode->isReplacing() == (bool) aRemovedTree.is() );
if (aOriginal.isValid())
SetNodeImpl::replaceElement(aElementName,*pNewElement);
@@ -827,7 +827,7 @@ void DeferredSetNodeImpl::failedCommit(SubtreeChange& rChanges)
aRemovedTree = addNode->getReplacedTree();
OSL_ASSERT( addNode->isReplacing() == (0!=pOriginal) );
- OSL_ASSERT( addNode->isReplacing() == aRemovedTree.is() );
+ OSL_ASSERT( addNode->isReplacing() == (bool) aRemovedTree.is() );
if (addNode->wasInserted())
{ // it has been integrated into the master tree