From ee2719f784a5b4408f3dc75589c9b31c14a6f65e Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 16 Jun 2008 13:07:05 +0000 Subject: INTEGRATION: CWS sb88 (1.20.10); FILE MERGED 2008/06/03 15:29:54 sb 1.20.10.1: #i89553 applied patch by cmc --- configmgr/source/treemgr/roottree.cxx | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'configmgr') 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. * @@ -115,12 +115,6 @@ CommitHelper::~CommitHelper() { } -//----------------------------------------------------------------------------- -void CommitHelper::reset() -{ - m_pData.reset(); -} - //----------------------------------------------------------------------------- bool CommitHelper::prepareCommit(TreeChangeList& rChangeList) { @@ -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"); -- cgit