From 9cb4ca0132e6b5bccadcf461ea3bf99be62e77c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 16 Jun 2008 13:01:54 +0000 Subject: [PATCH] INTEGRATION: CWS sb88 (1.23.10); FILE MERGED 2008/06/03 15:29:52 sb 1.23.10.1: #i89553 applied patch by cmc --- configmgr/source/tree/cmtreemodel.cxx | 10 +--------- configmgr/source/tree/treeactions.cxx | 21 +-------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/configmgr/source/tree/cmtreemodel.cxx b/configmgr/source/tree/cmtreemodel.cxx index 39ab4238cd2f..3942ff4ad0ab 100644 --- a/configmgr/source/tree/cmtreemodel.cxx +++ b/configmgr/source/tree/cmtreemodel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cmtreemodel.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.24 $ * * This file is part of OpenOffice.org. * @@ -68,14 +68,6 @@ bool isLocalizedValueSet(SubtreeChange const& _aSubtree) // ----------------------------------------------------------------------------- -bool isValueSet(ISubtree const& _aSubtree) -{ - if ( !_aSubtree.isSetNode()) return false; - if ( !_aSubtree.getElementTemplateModule().equals(TEMPLATE_MODULE_NATIVE_VALUE) ) return false; - return true; -} -// ----------------------------------------------------------------------------- - bool isValueSet(SubtreeChange const& _aSubtree) { if ( !_aSubtree.isSetNodeChange()) return false; diff --git a/configmgr/source/tree/treeactions.cxx b/configmgr/source/tree/treeactions.cxx index d27105e204db..08cf8e3cabf5 100644 --- a/configmgr/source/tree/treeactions.cxx +++ b/configmgr/source/tree/treeactions.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: treeactions.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.24 $ * * This file is part of OpenOffice.org. * @@ -40,25 +40,6 @@ //.......................................................................... namespace configmgr { -// ------------------------------------------------------------------------- -namespace -{ - struct ForceWritable : NodeModification - { - void handle(ValueNode& _rValue) { implForceWritable(_rValue); } - void handle(ISubtree& _rSubtree) { implForceWritable(_rSubtree); applyToChildren(_rSubtree); } - - void implForceWritable(INode& _rNode) { _rNode.forceReadonlyToFinalized(); } - }; -} - -// ------------------------------------------------------------------------- -void forceWritable(INode& _rNode) -{ - ForceWritable aVisitor; - - aVisitor.applyToNode(_rNode); -} //========================================================================== //= OChangeActionCounter