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 | 94976d7ae88eef48f0811829d59b92ccb813ea4f (patch) | |
| tree | a7351a4cb0b69601c9dc1f14c6cc54188fc00439 /configmgr | |
| parent | ab70c1bbad56b0967807315a36f25ffcddbf3865 (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 4c64679eb149..c464cc0440ec 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 913ba959ed07..6a8fc427ca6e 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); |