diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:02:15 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:02:15 +0000 |
commit | 66534ab13643e63617ee15ec27f26fcb1be2981e (patch) | |
tree | c5f9b6f3cffbabfb781fb8ca244ee74a2c339434 /configmgr | |
parent | 9cb4ca0132e6b5bccadcf461ea3bf99be62e77c9 (diff) |
INTEGRATION: CWS sb88 (1.7.10); FILE MERGED
2008/06/03 15:29:52 sb 1.7.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/tree/treechangefactory.cxx | 62 |
1 files changed, 1 insertions, 61 deletions
diff --git a/configmgr/source/tree/treechangefactory.cxx b/configmgr/source/tree/treechangefactory.cxx index adff5dd60e47..2065dfe8b174 100644 --- a/configmgr/source/tree/treechangefactory.cxx +++ b/configmgr/source/tree/treechangefactory.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: treechangefactory.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -75,57 +75,6 @@ OTreeChangeFactory& getDefaultTreeChangeFactory() return aDefaultFactory; } -//= ValueNodes ============================================================ -std::auto_ptr<ValueChange> OTreeChangeFactory::createValueChange( - Name const& _aName, - node::Attributes _aAttrs, - ValueChange::Mode _eMode, - uno::Any const& _aNewValue, - uno::Any const& _aOldValue - ) -{ - return std::auto_ptr<ValueChange>(new ValueChange(_aName,_aAttrs,_eMode,_aNewValue,_aOldValue)); -} - -//----------------------------------------------- -std::auto_ptr<ValueChange> OTreeChangeFactory::createValueChange(ValueNode const& _aNewValue, bool _bWasDefault) -{ - Name aName = _aNewValue.getName(); - uno::Any aValue = _aNewValue.getValue(); - node::Attributes aAttrs = _aNewValue.getAttributes(); - - ValueChange::Mode eMode = aAttrs.isDefault() ? - _bWasDefault ? ValueChange::changeDefault : ValueChange:: setToDefault: - _bWasDefault ? ValueChange::wasDefault : ValueChange::changeValue; - - if (aValue.hasValue()) - { - return std::auto_ptr<ValueChange>(new ValueChange(aName,aAttrs,eMode,aValue)); - } - else - { - return std::auto_ptr<ValueChange>(new ValueChange(aName,aAttrs,eMode,_aNewValue.getValueType())); - } -} - -//----------------------------------------------- -std::auto_ptr<ValueChange> OTreeChangeFactory::createValueChange( - uno::Any const& _aNewValue, - ValueNode const& _aOldValue - ) -{ - return std::auto_ptr<ValueChange>(new ValueChange(_aNewValue,_aOldValue)); -} - -//----------------------------------------------- -std::auto_ptr<ValueChange> OTreeChangeFactory::createValueChange( - ValueChange::SetToDefault _aSetToDefault, - ValueNode const& _aOldValue - ) -{ - return std::auto_ptr<ValueChange>(new ValueChange(_aSetToDefault,_aOldValue)); -} - //= SubtreeChanges ============================================================ std::auto_ptr<SubtreeChange> OTreeChangeFactory::createDummyChange( configuration::Name const& _aName, @@ -148,15 +97,6 @@ std::auto_ptr<SubtreeChange> OTreeChangeFactory::createDummyChange( } //----------------------------------------------- -std::auto_ptr<SubtreeChange> OTreeChangeFactory::createGroupNodeChange( - Name const& _aName, - node::Attributes _aAttrs, - bool _bToDefault) -{ - return std::auto_ptr<SubtreeChange>(new SubtreeChange(_aName,_aAttrs,_bToDefault)); -} - -//----------------------------------------------- std::auto_ptr<SubtreeChange> OTreeChangeFactory::createSetNodeChange( Name const& _aName, Name const& _aTemplateName, |