diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:45:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:45:39 +0000 |
| commit | 056044e1c97724412ecb35f7587cd33b8bb10028 (patch) | |
| tree | ebcebf6d4401d27b39a06b6eaf56efb523ead9ce /configmgr | |
| parent | cdc3ace161ffac5a9098e0922128e1056c06f300 (diff) | |
INTEGRATION: CWS configrefactor01 (1.5.24); FILE MERGED
2007/01/16 12:18:26 mmeeks 1.5.24.1: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/treemgr/directview.cxx | 8 | ||||
| -rw-r--r-- | configmgr/source/treemgr/readonlyview.cxx | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/configmgr/source/treemgr/directview.cxx b/configmgr/source/treemgr/directview.cxx index a001e5dc6d73..810c99d31c35 100644 --- a/configmgr/source/treemgr/directview.cxx +++ b/configmgr/source/treemgr/directview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: directview.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:29:01 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:41:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,7 +61,9 @@ void DirectViewStrategy::implMarkNondefault(SetNode const& _aSetNode) OSL_ASSERT(aSetAccess.isValid()); - sharable::SetNode* pNode = this->getDataForUpdate(aSetAccess); + sharable::SetNode* pNode = NULL; + if (m_aTreeSegment.is()) + pNode = aSetAccess; OSL_ASSERT(pNode); diff --git a/configmgr/source/treemgr/readonlyview.cxx b/configmgr/source/treemgr/readonlyview.cxx index 1bef29612ddf..8a0c148d7b85 100644 --- a/configmgr/source/treemgr/readonlyview.cxx +++ b/configmgr/source/treemgr/readonlyview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: readonlyview.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:31:04 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:45:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,9 +107,9 @@ NodeFactory& ReadOnlyViewStrategy::doGetNodeFactory() //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -ViewStrategyRef createReadOnlyStrategy(memory::Segment const * _pSegment) +ViewStrategyRef createReadOnlyStrategy() { - return new ReadOnlyViewStrategy(_pSegment); + return new ReadOnlyViewStrategy(); } //----------------------------------------------------------------------------- |