mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb88 (1.10.10); FILE MERGED

Browse Source 
2008/06/03 15:29:48 sb 1.10.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 12:42:28 +00:00
parent a88f06f490
commit 128320b676
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configmgr/source/inc/mergechange.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: mergechange.hxx,v $ * $RCSfile: mergechange.hxx,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -38,11 +38,7 @@
namespace configmgr namespace configmgr
{ {
// method that applies changes on a existing subtree // 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 combineUpdates (SubtreeChange const& _anUpdate, SubtreeChange& _aCombinedUpdate);
void applyLayerUpdate (TreeChangeList const& _anUpdate, TreeChangeList& _aLayer);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class OStripDefaults : private ChangeTreeModification class OStripDefaults : private ChangeTreeModification