diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 12:59:50 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 12:59:50 +0000 |
commit | 3a3f1ebd59f26605530ff8f8021eddc3302e9cd4 (patch) | |
tree | 2dab6f0a71a981b054fc4ece3fd4c549c1386122 /configmgr | |
parent | b4a0bfc3c319789cb80f81491c99ab27a182be2c (diff) |
INTEGRATION: CWS sb88 (1.18.10); FILE MERGED
2008/06/03 15:29:52 sb 1.18.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/tree/localizedtreeactions.cxx | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/configmgr/source/tree/localizedtreeactions.cxx b/configmgr/source/tree/localizedtreeactions.cxx index 28ad4115fa..bb7111aacb 100644 --- a/configmgr/source/tree/localizedtreeactions.cxx +++ b/configmgr/source/tree/localizedtreeactions.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: localizedtreeactions.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -297,18 +297,6 @@ static data::TreeSegment old_cloneExpandedForLocale(OUString const& _sName, INod } //-------------------------------------------------------------------------- -// convert to the given locale format, no matter what the original representation -data::TreeSegment cloneForLocale(INode const* _pNode, OUString const& _sLocale) -{ - using namespace localehelper; - OSL_ENSURE( !designatesAllLocales(makeLocale(_sLocale)), - "WARNING: This function doesn't work from single values to expanded sets so far"); - - OUString sName = _pNode ? _pNode->getName() : OUString(); - return old_cloneExpandedForLocale(sName, _pNode,_sLocale); -} -//-------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- //-------------------------------------------------------------------------- data::TreeSegment cloneExpandedForLocale(data::TreeAccessor const & _aTree, OUString const& _sLocale) @@ -569,23 +557,6 @@ std::auto_ptr<SubtreeChange> ExpandChangesForLocale::expanded(ValueChange const& } // anonymous namespace //-------------------------------------------------------------------------- -void expandForLocale(ISubtree& _rNode, OUString const& _sLocale) -{ - using namespace localehelper; - - if ( ! designatesAllLocales(makeLocale(_sLocale)) ) // nothing to reduce - ExpandTreeForLocale::expand(_rNode,_sLocale); -} -//-------------------------------------------------------------------------- - -void expandForLocale(SubtreeChange& _rNode, OUString const& _sLocale) -{ - using namespace localehelper; - - if ( ! designatesAllLocales(makeLocale(_sLocale)) ) // nothing to reduce - ExpandChangesForLocale::expand(_rNode,_sLocale); -} - //-------------------------------------------------------------------------- //.......................................................................... } // namespace configmgr |