diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 13:06:11 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 13:06:11 +0000 |
commit | 3185259b2235b2cdc395d57a8acad14cf67644ba (patch) | |
tree | a5258d4dbf76e174772db0373bfefd597ba34fcc /configmgr | |
parent | 9dd8216b0d1ba32887796d9c782c441b0406e620 (diff) |
INTEGRATION: CWS sb88 (1.15.10); FILE MERGED
2008/06/03 15:29:53 sb 1.15.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/treemgr/configpath.cxx | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/configmgr/source/treemgr/configpath.cxx b/configmgr/source/treemgr/configpath.cxx index 1164d5b5a5..1df4ec2381 100644 --- a/configmgr/source/treemgr/configpath.cxx +++ b/configmgr/source/treemgr/configpath.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: configpath.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -265,41 +265,6 @@ Name Component::getTypeName() const SAL_THROW(()) } //----------------------------------------------------------------------------- -bool Component::splitCompositeName(Name& _rName, Name& _rType) const SAL_THROW(()) -{ - if (isSimpleName()) - { - _rName = m_aName; - _rType = Name(); - return false; - } - else - { - OUString sName, sType; - implSplitCompositeName(m_aName,sType,sName); - _rName = Name(sName, PackageOnly()); - _rType = Name(sType, PackageOnly()); - return true; - } -} -//----------------------------------------------------------------------------- - -bool Component::splitCompositeName(OUString& _rName, OUString& _rType) const SAL_THROW(()) -{ - if (isSimpleName()) - { - _rName = m_aName.toString(); - _rType = OUString(); - return false; - } - else - { - implSplitCompositeName(m_aName,_rType,_rName); - return true; - } -} -//----------------------------------------------------------------------------- - Component makeEmptyComponent() SAL_THROW(()) { return Component( OUString(), PackageOnly() ); @@ -1083,12 +1048,14 @@ AbsolutePath AbsolutePath::getParentPath() const return AbsolutePath( Path::Rep(begin(),end()-1) ); } +#if OSL_DEBUG_LEVEL > 0 //----------------------------------------------------------------------------- bool AbsolutePath::isDetached() const SAL_THROW(()) { return !m_aRep.isEmpty() && begin()->isEmpty(); } +#endif //----------------------------------------------------------------------------- OUString AbsolutePath::toString() const SAL_THROW(()) |