From 128320b6760fcdacb433adf62203cd41d62d8b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 16 Jun 2008 12:42:28 +0000 Subject: [PATCH] INTEGRATION: CWS sb88 (1.10.10); FILE MERGED 2008/06/03 15:29:48 sb 1.10.10.1: #i89553 applied patch by cmc --- configmgr/source/inc/mergechange.hxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configmgr/source/inc/mergechange.hxx b/configmgr/source/inc/mergechange.hxx index 335af7376220..2282a484907f 100644 --- a/configmgr/source/inc/mergechange.hxx +++ b/configmgr/source/inc/mergechange.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mergechange.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -38,11 +38,7 @@ namespace configmgr { // method that applies changes on a existing subtree - void applyUpdateWithAdjustment(TreeChangeList & _anUpdate, data::NodeAddress const & _aBaseAddress); - bool adjustUpdate(TreeChangeList & _anUpdate, data::NodeAddress const & _aBaseAddress); - void mergeLayer (TreeChangeList & _aLayer, ISubtree& _aTree); void combineUpdates (SubtreeChange const& _anUpdate, SubtreeChange& _aCombinedUpdate); - void applyLayerUpdate (TreeChangeList const& _anUpdate, TreeChangeList& _aLayer); // ----------------------------------------------------------------------------- class OStripDefaults : private ChangeTreeModification