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

INTEGRATION: CWS sb88 (1.23.10); FILE MERGED

Browse Source 
2008/06/03 15:29:52 sb 1.23.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 13:01:54 +00:00
parent fb503f7425
commit 9cb4ca0132
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configmgr/source/tree/cmtreemodel.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: cmtreemodel.cxx,v $ * $RCSfile: cmtreemodel.cxx,v $
* $Revision: 1.23 $ * $Revision: 1.24 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -68,14 +68,6 @@ bool isLocalizedValueSet(SubtreeChange const& _aSubtree)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
bool isValueSet(ISubtree const& _aSubtree)
{
if ( !_aSubtree.isSetNode()) return false;
if ( !_aSubtree.getElementTemplateModule().equals(TEMPLATE_MODULE_NATIVE_VALUE) ) return false;
return true;
}
// -----------------------------------------------------------------------------
bool isValueSet(SubtreeChange const& _aSubtree) bool isValueSet(SubtreeChange const& _aSubtree)
{ {
if ( !_aSubtree.isSetNodeChange()) return false; if ( !_aSubtree.isSetNodeChange()) return false;

21
configmgr/source/tree/treeactions.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: treeactions.cxx,v $ * $RCSfile: treeactions.cxx,v $
* $Revision: 1.23 $ * $Revision: 1.24 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -40,25 +40,6 @@
//.......................................................................... //..........................................................................
namespace configmgr namespace configmgr
{ {
// -------------------------------------------------------------------------
namespace
{
struct ForceWritable : NodeModification
{
void handle(ValueNode& _rValue) { implForceWritable(_rValue); }
void handle(ISubtree& _rSubtree) { implForceWritable(_rSubtree); applyToChildren(_rSubtree); }
void implForceWritable(INode& _rNode) { _rNode.forceReadonlyToFinalized(); }
};
}
// -------------------------------------------------------------------------
void forceWritable(INode& _rNode)
{
ForceWritable aVisitor;
aVisitor.applyToNode(_rNode);
}
//========================================================================== //==========================================================================
//= OChangeActionCounter //= OChangeActionCounter