mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb88 (1.8.10); FILE MERGED

Browse Source 
2008/06/03 15:29:52 sb 1.8.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 13:02:34 +00:00
parent 96a0d5b33b
commit aa9ab2f1df
3 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configmgr/source/registry/cfgregistrykey.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: cfgregistrykey.hxx,v $ * $RCSfile: cfgregistrykey.hxx,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -94,17 +94,6 @@ public:
,sal_Bool _bWriteable ,sal_Bool _bWriteable
); );
/** builds an registry key for a configuration child node.
@param _rxParentNode the parent of the node. Used for update access and for obtaining the initial value.
@param _rRelativeName te relative name within the parent
@param _bWriteable should the key be writeable ?
*/
OConfigurationRegistryKey(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentNode
,const ::rtl::OUString& _rRelativeName
,sal_Bool _bWriteable
);
/** builds an registry key for a configuration value container node. /** builds an registry key for a configuration value container node.
@param _rCurrentValue the current value of the node. Must be the same as _rxParentNode->getByName(_rRelativeName) would provide @param _rCurrentValue the current value of the node. Must be the same as _rxParentNode->getByName(_rRelativeName) would provide
@param _rxParentNode the parent of the value node. Used for update access and for obtaining the initial value. @param _rxParentNode the parent of the value node. Used for update access and for obtaining the initial value.

14
configmgr/source/tree/mergehelper.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: mergehelper.cxx,v $ * $RCSfile: mergehelper.cxx,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -33,7 +33,6 @@
#include <stdio.h> #include <stdio.h>
#include "mergehelper.hxx"
#include "nodeconverter.hxx" #include "nodeconverter.hxx"
#include "treeprovider.hxx" #include "treeprovider.hxx"
#include "treenodefactory.hxx" #include "treenodefactory.hxx"
@@ -138,17 +137,6 @@ private:
} // anon namepsace } // anon namepsace
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// this is our 'exported' function // this is our 'exported' function
void mergeLayerToTree(SubtreeChange & _aLayerTree,ISubtree& _aTree)
{
// coarse: _aTree += _aLayerTree;
AttributeSetter(node::isDefault, true).applyToNode(_aTree);
SubtreeChange aMergeChange(_aLayerTree, SubtreeChange::NoChildCopy());
if (OCleanupLayerAction::adjust(aMergeChange,_aLayerTree,_aTree))
MergeLayerToTree(_aTree).merge(aMergeChange);
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
namespace namespace

17
configmgr/source/tree/treefragment.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: treefragment.cxx,v $ * $RCSfile: treefragment.cxx,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -57,21 +57,6 @@ bool TreeFragment::isNamed(rtl::OUString const & _aName) const
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool TreeFragment::hasDefaults() const
{
switch (this->header.state & State::mask_state)
{
default: OSL_ASSERT(false); // not reachable
case State::merged:
case State::defaulted: return true;
case State::replaced:
case State::added: return false;
}
}
//-----------------------------------------------------------------------------
bool TreeFragment::hasDefaultsAvailable() const bool TreeFragment::hasDefaultsAvailable() const
{ {
return (this->header.state & State::flag_default_avail) || isDefault(); return (this->header.state & State::flag_default_avail) || isDefault();