summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:34:11 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:34:11 +0000
commitcc8754c44a0a37ff8b7ea54956aa78fa330b57fe (patch)
treefc95b032b70c15372b164a1a8b5ed72854c69721 /configmgr
parent384a8d3a3a1cc4a4b6580dcb756ea5b3edc7154c (diff)
INTEGRATION: CWS warnings01 (1.22.4); FILE MERGED
2005/11/01 12:47:41 cd 1.22.4.1: #i53898# Warning free code for sun solaris compiler
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/treemgr/setnodeimpl.cxx15
1 files changed, 11 insertions, 4 deletions
diff --git a/configmgr/source/treemgr/setnodeimpl.cxx b/configmgr/source/treemgr/setnodeimpl.cxx
index 7ed9514b7a..765a6ba477 100644
--- a/configmgr/source/treemgr/setnodeimpl.cxx
+++ b/configmgr/source/treemgr/setnodeimpl.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: setnodeimpl.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 04:33:43 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:34:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -150,7 +150,10 @@ namespace
typedef std::vector<Element> Collection;
Collection collection;
- private:
+ protected:
+ using NodeVisitor::handle;
+
+ private:
Result handle(TreeAccessor const& _aElement);
Result handle(NodeAccessRef const& _aNonValue);
@@ -218,6 +221,7 @@ namespace
//-------------------------------------------------------------------------
CollectElementTrees::Result CollectElementTrees::handle(NodeAccessRef const& _aNonValue)
{
+ { (void)_aNonValue; }
OSL_ENSURE(!ValueNodeAccess::isInstance(_aNonValue),"Unexpected: Value-node dispatched to wrong handler");
if (m_aTemplate.is())
{
@@ -504,6 +508,7 @@ SetElementChangeImpl* SetNodeImpl::doAdjustToAddedElement(data::Accessor const&
SetElementChangeImpl* SetNodeImpl::implAdjustToAddedElement(data::Accessor const& _aAccessor, Name const& aName, Element const & aNewElement, bool _bReplacing)
{
+ { (void)_bReplacing; }
OSL_ENSURE( validatedName(aNewElement) == aName, "Unexpected Name on new element" );
if (hasStoredElement(aName))
@@ -524,7 +529,7 @@ SetElementChangeImpl* SetNodeImpl::implAdjustToAddedElement(data::Accessor const
}
//-------------------------------------------------------------------------
-SetElementChangeImpl* SetNodeImpl::doAdjustToRemovedElement(data::Accessor const& _aAccessor, Name const& aName, RemoveNode const& aRemoveNodeChange)
+SetElementChangeImpl* SetNodeImpl::doAdjustToRemovedElement(data::Accessor const& _aAccessor, Name const& aName, RemoveNode const& /*aRemoveNodeChange*/)
{
return implAdjustToRemovedElement(_aAccessor,aName);
}
@@ -966,6 +971,8 @@ namespace
translate(m_rDefaultTree);
visitElements(_aActualTree);
}
+ protected:
+ using NodeVisitor::handle;
private:
void translate(ISubtree& _rDefaultTree);