summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:02:15 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:02:15 +0000
commit2e48630cb62d3e72c7b8bd373c4d143864b40093 (patch)
treeb322a652bf37242fd3d23cdbdf3f46dbf11c60b0 /configmgr
parent8e655985bdeb11c4c5b2183b40fb1c20ee4d438a (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.cxx62
1 files changed, 1 insertions, 61 deletions
diff --git a/configmgr/source/tree/treechangefactory.cxx b/configmgr/source/tree/treechangefactory.cxx
index 608ca4b9ed..072514bd2c 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,