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

INTEGRATION: CWS cfgcleanup (1.26.56); FILE MERGED

Browse source 
2004/02/09 15:30:35 jb 1.26.56.1: #i25025# Eliminate warnings from gcc
This commit is contained in:
Kurt Zenker 2004-03-23 09:31:34 +00:00
parent 7c92fdcfc4
commit 604dbc76ee
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configmgr/source/treemgr/configset.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: configset.cxx,v $ * $RCSfile: configset.cxx,v $
* *
* $Revision: 1.26 $ * $Revision: 1.27 $
* *
* last change: $Author: rt $ $Date: 2003-04-24 08:14:49 $ * last change: $Author: kz $ $Date: 2004-03-23 10:31:34 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -198,37 +198,37 @@ osl::Mutex& ElementRef::getTreeLock() const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ElementTree::ElementTree() ElementTree::ElementTree()
: m_accessor(NULL) : m_aTreeHolder()
, m_aTreeHolder() , m_accessor(NULL)
{ {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ElementTree::ElementTree(data::Accessor const& _accessor, ElementTreeImpl* pTree) ElementTree::ElementTree(data::Accessor const& _accessor, ElementTreeImpl* pTree)
: m_accessor(_accessor) : m_aTreeHolder(pTree)
, m_aTreeHolder(pTree) , m_accessor(_accessor)
{ {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ElementTree::ElementTree(data::Accessor const& _accessor, ElementTreeHolder const& pTree) ElementTree::ElementTree(data::Accessor const& _accessor, ElementTreeHolder const& pTree)
: m_accessor(_accessor) : m_aTreeHolder(pTree)
, m_aTreeHolder(pTree) , m_accessor(_accessor)
{ {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ElementTree::ElementTree(ElementTree const& aOther) ElementTree::ElementTree(ElementTree const& aOther)
: m_accessor(aOther.m_accessor) : m_aTreeHolder(aOther.m_aTreeHolder)
, m_aTreeHolder(aOther.m_aTreeHolder) , m_accessor(aOther.m_accessor)
{ {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ElementTree& ElementTree::operator=(ElementTree const& aOther) ElementTree& ElementTree::operator=(ElementTree const& aOther)
{ {
m_accessor = aOther.m_accessor;
m_aTreeHolder = aOther.m_aTreeHolder; m_aTreeHolder = aOther.m_aTreeHolder;
m_accessor = aOther.m_accessor;
return *this; return *this;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -260,7 +260,7 @@ TemplateHolder ElementTree::getTemplate() const
{ {
OSL_PRECOND(isValid(),"ERROR: Trying to get the template of a NULL element tree"); OSL_PRECOND(isValid(),"ERROR: Trying to get the template of a NULL element tree");
if (m_aTreeHolder,isValid()) if (isValid())
return m_aTreeHolder->getTemplate(); return m_aTreeHolder->getTemplate();
else else
return TemplateHolder(); return TemplateHolder();