diff options
author | Oliver Bolte <obo@openoffice.org> | 2000-11-14 09:27:37 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2000-11-14 09:27:37 +0000 |
commit | d98079e4b851e95c09e94aff811634e93ee2f39d (patch) | |
tree | 7b3b30a4be921ec94492185c6f71f97f2e58bc35 /configmgr | |
parent | 7bc10890d745fa27ae1d5dedc6a2b9c7f5932435 (diff) |
typcasting missing by linux compiler
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/treemgr/configpath.cxx | 8 | ||||
-rw-r--r-- | configmgr/source/treemgr/configset.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/configmgr/source/treemgr/configpath.cxx b/configmgr/source/treemgr/configpath.cxx index be301b826367..70e6aba7cbac 100644 --- a/configmgr/source/treemgr/configpath.cxx +++ b/configmgr/source/treemgr/configpath.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configpath.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jb $ $Date: 2000-11-10 19:18:28 $ + * last change: $Author: obo $ $Date: 2000-11-14 10:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -232,7 +232,7 @@ PathRep PathRep::compose(PathRep const& aRelativePath) const { Components aResult( components() ); aResult.insert(aResult.end(), aRelativePath.begin(), aRelativePath.end()); - return aResult; + return (PathRep) aResult; } //----------------------------------------------------------------------------- @@ -253,7 +253,7 @@ PathRep PathRep::parent() const throw InvalidName(OUString(RTL_CONSTASCII_USTRINGPARAM("<empty>")), " - is empty. Cannot construct parent path"); aResult.pop_back(); - return aResult; + return (PathRep) aResult; } //----------------------------------------------------------------------------- diff --git a/configmgr/source/treemgr/configset.cxx b/configmgr/source/treemgr/configset.cxx index 5485bdc74ec0..a2afbc954f07 100644 --- a/configmgr/source/treemgr/configset.cxx +++ b/configmgr/source/treemgr/configset.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configset.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dg $ $Date: 2000-11-13 11:54:51 $ + * last change: $Author: obo $ $Date: 2000-11-14 10:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -312,8 +312,8 @@ ElementTree SetElementFactory::instantiateTemplate(TemplateHolder const& aTempla OSL_ENSURE(m_aProvider.get().isValid(), "ERROR: Template Instance Factory has no template provider - cannot instantiate element"); OSL_ENSURE(aTemplate.isValid(), "ERROR: Template is NULL - cannot instantiate element"); - if (!m_aProvider.get().isValid()) return 0; - if (!aTemplate.isValid()) return 0; + if (!m_aProvider.get().isValid()) return (ElementTree) 0; + if (!aTemplate.isValid()) return (ElementTree) 0; ElementTree aRet( new ElementTreeImpl( aTemplate, m_aProvider.getBodyPtr() ) ); @@ -327,7 +327,7 @@ ElementTree SetElementFactory::instantiateOnDefault(std::auto_ptr<INode> aTree, OSL_ENSURE(aTree.get(), "ERROR: Tree is NULL - cannot instantiate element"); OSL_ENSURE(aDummyTemplate.isValid(), "ERROR: Template is NULL - cannot instantiate element"); - if (!aTree.get()) return 0; + if (!aTree.get()) return (ElementTree) 0; ElementTreeImpl* pNewTree = new ElementTreeImpl( NodeType::getDeferredChangeFactory(),*aTree, ~0u, aDummyTemplate ); pNewTree->takeNodeFrom(aTree); |