diff --git a/configmgr/source/misc/anypair.cxx b/configmgr/source/misc/anypair.cxx index 4f9b5de76e2e..1c24eb4dc205 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. * @@ -518,21 +518,6 @@ namespace configmgr return anypair_any_assign_Data(&_pAnyPair->desc, &_pAnyPair->second, cfgmgr_SELECT_SECOND, _pUnoAny); } -// ----------------------------------------------------------------------------- - 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) { @@ -591,14 +576,6 @@ namespace configmgr return uno::Any( aTmpAny.pData, aTmpAny.pType ); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- - // ctors - AnyPair::AnyPair() - { - anypair_construct_default(&m_aAnyPair); - } - // ----------------------------------------------------------------------------- AnyPair::AnyPair(uno::Type const& _aType) // one Type, any's are null { @@ -663,20 +640,6 @@ namespace configmgr return anypair_assign_second(&m_aAnyPair,&_aAny); } -// ----------------------------------------------------------------------------- - 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) {