diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:07:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:07:05 +0000 |
| commit | ee2719f784a5b4408f3dc75589c9b31c14a6f65e (patch) | |
| tree | 8ff69eac835b10eecf9e4c5e2ef41d938fd1c711 /configmgr | |
| parent | 64c220eb2031fe02e8e1b0d8a9929495dd0b09b1 (diff) | |
INTEGRATION: CWS sb88 (1.20.10); FILE MERGED
2008/06/03 15:29:54 sb 1.20.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/treemgr/roottree.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/configmgr/source/treemgr/roottree.cxx b/configmgr/source/treemgr/roottree.cxx index fea28a8eabaa..6c7c8edb3851 100644 --- a/configmgr/source/treemgr/roottree.cxx +++ b/configmgr/source/treemgr/roottree.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: roottree.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -116,12 +116,6 @@ CommitHelper::~CommitHelper() } //----------------------------------------------------------------------------- -void CommitHelper::reset() -{ - m_pData.reset(); -} - -//----------------------------------------------------------------------------- bool CommitHelper::prepareCommit(TreeChangeList& rChangeList) { OSL_ENSURE(m_pTree,"ERROR: CommitHelper: Cannot commit without a tree"); @@ -162,20 +156,6 @@ void CommitHelper::finishCommit(TreeChangeList& rChangeList) } //----------------------------------------------------------------------------- -void CommitHelper::revertCommit(TreeChangeList& rChangeList) -{ - OSL_ENSURE(m_pTree,"INTERNAL ERROR: Nothing to finish without a tree"); - - AbsolutePath aPath = m_pTree->getRootPath(); - - OSL_ENSURE( rChangeList.getRootNodePath().toString() == aPath.toString(), "ERROR: FinishCommit cannot handle rebased changes trees"); - if ( !matches(rChangeList.getRootNodePath(), aPath) ) - throw configuration::Exception("INTERNAL ERROR: FinishCommit cannot handle rebased changes trees"); - - view::ViewTreeAccess(*m_pTree).revertCommit(rChangeList.root); -} -//----------------------------------------------------------------------------- - void CommitHelper::failedCommit(TreeChangeList& rChangeList) { OSL_ENSURE(m_pTree,"INTERNAL ERROR: Nothing to finish without a tree"); |