From 1f34524746a0849ee2c76241d7ac6934110009fe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 8 Apr 2015 12:43:52 +0200 Subject: remove reg keytype constants and related code since we no longer support the RG_LINKTYPE stuff Change-Id: If388ecfa0c475471b99b26155ad554ec702ca734 --- stoc/source/simpleregistry/simpleregistry.cxx | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'stoc') diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 122cee8410e0..34752df1d44c 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -264,28 +264,10 @@ sal_Bool Key::isValid() throw (css::uno::RuntimeException, std::exception) { return key_.isValid(); } -css::registry::RegistryKeyType Key::getKeyType(OUString const & rKeyName) +css::registry::RegistryKeyType Key::getKeyType(OUString const & ) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { - osl::MutexGuard guard(registry_->mutex_); - RegKeyType type; - RegError err = key_.getKeyType(rKeyName, &type); - if (err != REG_NO_ERROR) { - throw css::registry::InvalidRegistryException( - ("com.sun.star.registry.SimpleRegistry key getKeyType:" - " underlying RegistryKey::getKeyType() = " + - OUString::number(err)), - static_cast< OWeakObject * >(this)); - } - switch (type) { - default: - std::abort(); // this cannot happen - // pseudo-fall-through to avoid warnings on MSC - case RG_KEYTYPE: - return css::registry::RegistryKeyType_KEY; - case RG_LINKTYPE: - return css::registry::RegistryKeyType_LINK; - } + return css::registry::RegistryKeyType_KEY; } css::registry::RegistryValueType Key::getValueType() -- cgit