Kaydet (Commit) 51a1d303 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS cfg01 (1.5.4.2.8); FILE MERGED

2003/02/28 16:28:50 ssmith 1.5.4.2.8.3: #107403# #107403# adding support for mandatory flag and changing dynamic properties semantics
2003/02/25 11:46:11 jb 1.5.4.2.8.2: RESYNC: (1.5.4.2-1.5.4.3); FILE MERGED
2003/02/17 15:56:07 ssmith 1.5.4.2.8.1: #107404# refactoring code to support encapsulation
üst 99551308
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: componentdatahelper.cxx,v $ * $RCSfile: componentdatahelper.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: hr $ $Date: 2003-03-19 16:18:46 $ * last change: $Author: vg $ $Date: 2003-04-01 13:30:09 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -233,7 +233,8 @@ bool DataBuilderContext::isWritable(INode const * pNode) const ...@@ -233,7 +233,8 @@ bool DataBuilderContext::isWritable(INode const * pNode) const
CFG_NOTHROW( ) CFG_NOTHROW( )
{ {
OSL_PRECOND(pNode,"Unexpected NULL node pointer"); OSL_PRECOND(pNode,"Unexpected NULL node pointer");
return pNode->getAttributes().bWritable; return pNode->getAttributes().isWritable();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -241,7 +242,7 @@ bool DataBuilderContext::isRemovable(ISubtree const * pItem) const ...@@ -241,7 +242,7 @@ bool DataBuilderContext::isRemovable(ISubtree const * pItem) const
CFG_NOTHROW( ) CFG_NOTHROW( )
{ {
OSL_PRECOND(pItem,"Unexpected NULL item pointer"); OSL_PRECOND(pItem,"Unexpected NULL item pointer");
return pItem->getAttributes().bNullable || pItem->getAttributes().isReplacedForUser(); return pItem->getAttributes().isRemovable();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -525,7 +526,7 @@ std::auto_ptr<ISubtree> ComponentDataFactory::createLocalizedContainer( OUString ...@@ -525,7 +526,7 @@ std::auto_ptr<ISubtree> ComponentDataFactory::createLocalizedContainer( OUString
node::Attributes const & _aAttributes) const node::Attributes const & _aAttributes) const
{ {
node::Attributes aLocalizedAttributes(_aAttributes); node::Attributes aLocalizedAttributes(_aAttributes);
aLocalizedAttributes.bLocalized = true; aLocalizedAttributes.setLocalized (true);
return getNodeFactory().createSetNode( _aName, return getNodeFactory().createSetNode( _aName,
toTemplateName(_aValueType), toTemplateName(_aValueType),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment