strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#91896# fixes to make the new code build with SunCC

Browse source
This commit is contained in:
Jörg Barfurth 2002-02-15 13:34:35 +00:00
parent 9a7b280c95
commit e823c3b696
8 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configmgr/source/data/makefile.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.1 $
# $Revision: 1.2 $
#
# last change: $Author: jb $ $Date: 2002-02-11 14:55:52 $
# last change: $Author: jb $ $Date: 2002-02-15 14:34:33 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -78,7 +78,6 @@ SLOFILES= \
$(SLO)$/simpleheap.obj \
$(SLO)$/heap.obj \
$(SLO)$/segmentheap.obj \
$(SLO)$/sequence.obj \
$(SLO)$/anydata.obj \
$(SLO)$/sequence.obj \
$(SLO)$/types.obj \

8
configmgr/source/inc/flags.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: flags.hxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jb $ $Date: 2002-02-11 14:29:07 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -118,7 +118,7 @@ namespace configmgr
nodetype_set = 0x03 << nodetype_shift_, // 0xC0
flag_innernode = 0x02 << nodetype_shift_, // 0x80
flag_setnode = 0x01 << nodetype_shift_, // 0x40
flag_setnode = 0x01 << nodetype_shift_ // 0x40
};
typedef sal_uInt8 Field;
}
@ -159,7 +159,7 @@ namespace configmgr
flag_mandatory = 0x10, // marks this element as non-removable/replacable
flag_readonly = 0x20, // marks this element as read-only
flag_default_avail = 0x40, // marks this element as containing default values
flag_default_avail = 0x40 // marks this element as containing default values
};
typedef sal_uInt8 Field;
}

8
configmgr/source/inc/nodevisitor.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: nodevisitor.hxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jb $ $Date: 2002-02-11 14:29:07 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -85,7 +85,7 @@ namespace configmgr
enum Result { DONE, CONTINUE };
/// destructor. is pure to make this class abstract
virtual ~NodeVisitor() = 0;
virtual ~NodeVisitor() ; // = 0; - does not work well with SunCC 5.2
/// dispatch this to the children of <var>aNode</var>, until one returns DONE
Result visitChildren(GroupNodeAccess const& _aNode);
@ -126,7 +126,7 @@ namespace configmgr
{
public:
/// destructor. is pure to make this class abstract
virtual ~SetVisitor() = 0;
virtual ~SetVisitor() ; //= 0; - does not work well with SunCC 5.2
/// dispatch to <var>_aElementTree</var>
Result visitTree(TreeAccessor const& _aElementTree);

28
configmgr/source/tree/builddata.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: builddata.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jb $ $Date: 2002-02-11 14:55:53 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -116,6 +116,8 @@
namespace configmgr
{
//-----------------------------------------------------------------------------
typedef ValueNode OValueNode; // to avoid ambiguity with sharable::ValueNode
//-----------------------------------------------------------------------------
namespace data
{
@ -268,7 +270,7 @@ namespace configmgr
class ElementListBuilder;
virtual void handle(ISubtree const & _aNode);
virtual void handle(ValueNode const & _aNode);
virtual void handle(OValueNode const & _aNode);
Address makeTemplateData(rtl::OUString const & _aTemplateName, rtl::OUString const & _aTemplateModule);
@ -296,7 +298,7 @@ namespace configmgr
private:
void handleNode(INode const & _aSourceNode);
void handle(ValueNode const & _aSourceNode);
void handle(OValueNode const & _aSourceNode);
void handle(ISubtree const & _aSourceNode);
};
//-----------------------------------------------------------------------------
@ -353,7 +355,7 @@ namespace configmgr
std::auto_ptr<ISubtree> buildNodeTree(GroupNodeAccess const& _aGroupNode) const;
std::auto_ptr<ISubtree> buildNodeTree(SetNodeAccess const& _aSetNode) const;
std::auto_ptr<ValueNode> buildNode(ValueNodeAccess const& _aValueNode) const
std::auto_ptr<OValueNode> buildNodeTree(ValueNodeAccess const& _aValueNode) const
{ return this->convertNode(_aValueNode); }
static node::Attributes convertAttributes(NodeAccess const& _aNode)
@ -361,7 +363,7 @@ namespace configmgr
private:
std::auto_ptr<ISubtree> convertNode(GroupNodeAccess const& _aGroupNode) const;
std::auto_ptr<ISubtree> convertNode(SetNodeAccess const& _aSetNode) const;
std::auto_ptr<ValueNode> convertNode(ValueNodeAccess const& _aValueNode) const;
std::auto_ptr<OValueNode> convertNode(ValueNodeAccess const& _aValueNode) const;
Result handle(ValueNodeAccess const & _aNode);
Result handle(GroupNodeAccess const & _aNode);
@ -398,7 +400,7 @@ namespace configmgr
void mergeDefaults(TreeAddress _aBaseAddress, INode const& _aDefaultNode);
private:
void handle(ValueNode const & _aNode);
void handle(OValueNode const & _aNode);
void handle(ISubtree const & _aNode);
protected:
UpdateAccessor & updater() const { return m_updater; }
@ -916,7 +918,7 @@ void ConvertingDataTreeBuilder::handle(ISubtree const & _aNode)
}
//-----------------------------------------------------------------------------
void ConvertingDataTreeBuilder::handle(ValueNode const & _aNode)
void ConvertingDataTreeBuilder::handle(OValueNode const & _aNode)
{
sharable::Name aNodeName = allocName( _aNode );
Flags::Field aFlags = makeFlags(_aNode.getAttributes());
@ -1035,7 +1037,7 @@ void ConvertingDataTreeBuilder::ElementListBuilder::handleNode(INode const & _aS
}
//-----------------------------------------------------------------------------
void ConvertingDataTreeBuilder::ElementListBuilder::handle(ValueNode const & _aSourceNode)
void ConvertingDataTreeBuilder::ElementListBuilder::handle(OValueNode const & _aSourceNode)
{
handleNode(_aSourceNode);
}
@ -1051,7 +1053,7 @@ void ConvertingDataTreeBuilder::ElementListBuilder::handle(ISubtree const & _aS
std::auto_ptr<INode> ConvertingNodeBuilder::buildNode(TreeAccessor const & _aSourceTree, bool _bUseTreeName)
{
std::auto_ptr<INode> pResult = this->buildNode(_aSourceTree.getRootNode());
if (pResult.get != NULL)
if (pResult.get() != NULL)
{
// use the element name !
if (_bUseTreeName) pResult->setName( _aSourceTree.getName().toString() );
@ -1114,7 +1116,7 @@ std::auto_ptr<ISubtree> ConvertingNodeBuilder::convertNode(SetNodeAccess const&
}
//-----------------------------------------------------------------------------
std::auto_ptr<ValueNode> ConvertingNodeBuilder::convertNode(ValueNodeAccess const& _aValueNode) const
std::auto_ptr<OValueNode> ConvertingNodeBuilder::convertNode(ValueNodeAccess const& _aValueNode) const
{
uno::Any aUserValue = _aValueNode.getUserValue();
uno::Any aDefValue = _aValueNode.getDefaultValue();
@ -1136,7 +1138,7 @@ std::auto_ptr<ValueNode> ConvertingNodeBuilder::convertNode(ValueNodeAccess cons
NodeVisitor::Result ConvertingNodeBuilder::handle(ValueNodeAccess const & _aNode)
{
m_pNode = base_ptr(buildNode(_aNode));
m_pNode = base_ptr(buildNodeTree(_aNode));
return DONE;
}
//-----------------------------------------------------------------------------
@ -1183,7 +1185,7 @@ void DataTreeDefaultMerger::handle(ISubtree const & _aNode)
}
//-----------------------------------------------------------------------------
void DataTreeDefaultMerger::handle(ValueNode const & _aNode)
void DataTreeDefaultMerger::handle(OValueNode const & _aNode)
{
}
//-----------------------------------------------------------------------------

9
configmgr/source/tree/changes.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: changes.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: jb $ $Date: 2002-02-11 13:47:55 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -68,7 +68,8 @@
#include <osl/diagnose.h>
#endif
using namespace configmgr;
namespace configmgr
{
//==========================================================================
//= ValueChange
@ -381,4 +382,6 @@ void RemoveNode::takeRemovedTree(data::TreeSegment const & _aRemovedTree)
m_aOwnOldNode = _aRemovedTree;
}
//--------------------------------------------------------------------------
} // namespace configmgr

8
configmgr/source/treemgr/nodeimpl.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: nodeimpl.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: jb $ $Date: 2002-02-11 13:47:56 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -82,8 +82,8 @@
namespace configmgr
{
//-----------------------------------------------------------------------------
namespace memory { class Accessor; };
namespace data { class NodeAccess; };
namespace memory { class Accessor; }
namespace data { class NodeAccess; }
namespace view { class ViewStrategy; }
//-----------------------------------------------------------------------------
namespace configuration

5
configmgr/source/treemgr/treeimpl.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: treeimpl.hxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: jb $ $Date: 2002-02-11 13:47:56 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -419,6 +419,7 @@ namespace configmgr
/// set no-parent context for this tree
void clearContext();
inline // is protected and should be used only in the implementation
Name implGetOriginalName(NodeOffset nNode) const;
private:

10
configmgr/source/treemgr/viewstrategy.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewstrategy.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jb $ $Date: 2002-02-11 14:55:53 $
* last change: $Author: jb $ $Date: 2002-02-15 14:34:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -538,14 +538,16 @@ namespace configmgr
OSL_ASSERT( DONE == GroupMemberVisitor::DONE );
OSL_ASSERT( CONTINUE == GroupMemberVisitor::CONTINUE );
return static_cast<Result>(_aResult);
register int nResultValue = _aResult;
return static_cast<Result>(nResultValue);
}
static GroupMemberVisitor::Result unmapResult(Result _aResult)
{
OSL_ASSERT( DONE == GroupMemberVisitor::DONE );
OSL_ASSERT( CONTINUE == GroupMemberVisitor::CONTINUE );
return static_cast<GroupMemberVisitor::Result>(_aResult);
register int nResultValue = _aResult;
return static_cast<GroupMemberVisitor::Result>(nResultValue);
}
virtual Result handle(data::ValueNodeAccess const& _aValue);