diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:51:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:51:35 +0000 |
| commit | 9e2229c1c0130b834fda4505dee4edd00d722c6f (patch) | |
| tree | 23a6b1d494d6a5f93be99dc4fa2dd267e6d0e429 /configmgr | |
| parent | 9241621bdf62f08bef445cb85be34c7f5eb8586b (diff) | |
INTEGRATION: CWS sb88 (1.12.10); FILE MERGED
2008/06/03 15:29:50 sb 1.12.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/misc/anypair.cxx | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/configmgr/source/misc/anypair.cxx b/configmgr/source/misc/anypair.cxx index ac10313e3c..72061a2479 100644 --- a/configmgr/source/misc/anypair.cxx +++ b/configmgr/source/misc/anypair.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anypair.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -519,21 +519,6 @@ namespace configmgr } // ----------------------------------------------------------------------------- - sal_Bool anypair_assign_both(cfgmgr_AnyPair* _pAnyPair, uno_Any const * _pUnoAny) - { - CFG_PRECOND( _pAnyPair != NULL ); - CFG_PRECOND( _pUnoAny != NULL ); - - sal_Bool bOK = anypair_assign_first(_pAnyPair,_pUnoAny); - if (bOK) - { - // same type - second assignment must succeed as well - OSL_VERIFY( anypair_assign_second(_pAnyPair,_pUnoAny) ); - } - return bOK; - } - -// ----------------------------------------------------------------------------- void anypair_assign(cfgmgr_AnyPair* _pAnyPair, cfgmgr_AnyPair const * _pAnyPairFrom) { if (_pAnyPair != _pAnyPairFrom) @@ -592,14 +577,6 @@ namespace configmgr } // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- - // ctors - AnyPair::AnyPair() - { - anypair_construct_default(&m_aAnyPair); - } - -// ----------------------------------------------------------------------------- AnyPair::AnyPair(uno::Type const& _aType) // one Type, any's are null { anypair_construct_type(&m_aAnyPair, _aType.getTypeLibType()); @@ -664,20 +641,6 @@ namespace configmgr } // ----------------------------------------------------------------------------- - sal_Bool AnyPair::setValue(uno::Any const& _aAny, SelectMember _select) - { - switch (_select) - { - case SELECT_FIRST: return anypair_assign_first (&m_aAnyPair,&_aAny); - case SELECT_SECOND: return anypair_assign_second(&m_aAnyPair,&_aAny); - case SELECT_BOTH: return anypair_assign_both (&m_aAnyPair,&_aAny); - - default: OSL_ENSURE(false, "AnyPair: Unknown member selector"); - return false; - } - } - -// ----------------------------------------------------------------------------- void AnyPair::clear(SelectMember _select) { switch (_select) |