INTEGRATION: CWS sb88 (1.13.10); FILE MERGED

2008/06/03 15:29:45 sb 1.13.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 12:29:12 +00:00
parent 943697f948
commit e69d2de284

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: apifactory.cxx,v $ * $RCSfile: apifactory.cxx,v $
* $Revision: 1.13 $ * $Revision: 1.14 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -214,13 +214,6 @@ void Factory::revokeElement(NodeID const& aNodeID)
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void Factory::revokeElement(NodeID const& aNodeID, NodeElement& rElement)
{
if (implFind(aNodeID) == &rElement)
doRevokeElement(aNodeID, &rElement);
}
//-----------------------------------------------------------------------------
TreeElement* Factory::makeAccessRoot(Tree const& aTree, RequestOptions const& _aOptions) TreeElement* Factory::makeAccessRoot(Tree const& aTree, RequestOptions const& _aOptions)
{ {
OSL_PRECOND( !aTree.isEmpty() , "ERROR: Configuration: Making element from tree requires valid tree"); OSL_PRECOND( !aTree.isEmpty() , "ERROR: Configuration: Making element from tree requires valid tree");