diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:01:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:01:28 +0000 |
| commit | ce5cebe015ed1ccf5e65c0fbbe9af313392f83cd (patch) | |
| tree | 321145411543a8ac32064702a42a9443c47619df /configmgr | |
| parent | 9904fd947560aa8b13c82c7cb550a8bf518bc8a9 (diff) | |
INTEGRATION: CWS sb88 (1.6.10); FILE MERGED
2008/06/03 15:29:52 sb 1.6.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/tree/nodeaccess.cxx | 5 | ||||
| -rw-r--r-- | configmgr/source/tree/nodeconverter.cxx | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/configmgr/source/tree/nodeaccess.cxx b/configmgr/source/tree/nodeaccess.cxx index cf63659e14..e4f1887f30 100644 --- a/configmgr/source/tree/nodeaccess.cxx +++ b/configmgr/source/tree/nodeaccess.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: nodeaccess.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -78,6 +78,7 @@ namespace configmgr SetNodeAccess aNodeAccess(_aNodeAddr); return aNodeAccess; } +#if OSL_DEBUG_LEVEL > 0 // ------------------------------------------------------------------------- GroupNodeAddress toGroupNodeAddress(NodeAddress const & _aNodeAddr) @@ -85,7 +86,7 @@ namespace configmgr GroupNodeAccess aNodeAccess( _aNodeAddr ); return aNodeAccess; } - +#endif // ------------------------------------------------------------------------- // GroupNodeAccess ... // ------------------------------------------------------------------------- diff --git a/configmgr/source/tree/nodeconverter.cxx b/configmgr/source/tree/nodeconverter.cxx index 101fbe4b30..969a3047b0 100644 --- a/configmgr/source/tree/nodeconverter.cxx +++ b/configmgr/source/tree/nodeconverter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: nodeconverter.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -134,14 +134,6 @@ public: //-------------------------------------------------------------------------- -std::auto_ptr<INode> OTreeNodeConverter::createCorrespondingNode(Change& _rChange) -{ - ONodeConverter aAction(*this); - aAction.applyToChange(_rChange); - return aAction.result(); -} - -//-------------------------------------------------------------------------- std::auto_ptr<ISubtree> OTreeNodeConverter::createCorrespondingTree(SubtreeChange& _rChange) { std::auto_ptr<ISubtree> pBaseTree = this->createCorrespondingNode(_rChange); |