diff options
| -rw-r--r-- | include/registry/registry.hxx | 53 | ||||
| -rw-r--r-- | stoc/source/simpleregistry/simpleregistry.cxx | 48 |
2 files changed, 11 insertions, 90 deletions
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 9309e7ff0311..c110b3b0f9be 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -528,32 +528,6 @@ public: inline RegError getUnicodeListValue(const rtl::OUString& keyName, RegistryValueList<sal_Unicode*>& rValueList); - /** used to create a link. - - @deprecated Links are no longer supported. - - @return RegError::INVALID_LINK - */ - inline RegError createLink(const rtl::OUString& linkName, - const rtl::OUString& linkTarget); - - /** used to delete a link. - - @deprecated Links are no longer supported. - - @return RegError::INVALID_LINK - */ - inline RegError deleteLink(const rtl::OUString& linkName); - - /** used to return the target of a link. - - @deprecated Links are no longer supported. - - @return RegError::INVALID_LINK - */ - inline RegError getLinkTarget(const rtl::OUString& linkName, - rtl::OUString& rLinkTarget) const; - /** resolves a keyname. @param[in] keyName specifies the name of the key which will be resolved relative to this key. @@ -964,33 +938,6 @@ inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::createLink(const rtl::OUString& , - const rtl::OUString& ) - { - if (m_registry.isValid()) - return RegError::INVALID_LINK; // links are no longer supported - else - return RegError::INVALID_KEY; - } - -inline RegError RegistryKey::deleteLink(const rtl::OUString& ) - { - if (m_registry.isValid()) - return RegError::INVALID_LINK; // links are no longer supported - else - return RegError::INVALID_KEY; - } - -inline RegError RegistryKey::getLinkTarget(const rtl::OUString& , - rtl::OUString& ) const - { - if (m_registry.isValid()) - return RegError::INVALID_LINK; // links are no longer supported - else - return RegError::INVALID_KEY; - } - - inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName, rtl::OUString& rResolvedName) const { diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index eeef53671b78..1c279ba2b205 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -920,54 +920,28 @@ css::uno::Sequence< OUString > Key::getKeyNames() } sal_Bool Key::createLink( - OUString const & aLinkName, OUString const & aLinkTarget) + OUString const & /*aLinkName*/, OUString const & /*aLinkTarget*/) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { - osl::MutexGuard guard(registry_->mutex_); - RegError err = key_.createLink(aLinkName, aLinkTarget); - switch (err) { - case RegError::NO_ERROR: - return true; - case RegError::INVALID_KEY: - case RegError::DETECT_RECURSION: - throw css::registry::InvalidRegistryException( - (("com.sun.star.registry.SimpleRegistry key createLink:" - " underlying RegistryKey::createLink() = ") + - OUString::number(static_cast<int>(err))), + throw css::registry::InvalidRegistryException( + "com.sun.star.registry.SimpleRegistry key createLink: links are no longer supported", static_cast< OWeakObject * >(this)); - default: - return false; - } } -void Key::deleteLink(OUString const & rLinkName) +void Key::deleteLink(OUString const & /*rLinkName*/) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { - osl::MutexGuard guard(registry_->mutex_); - RegError err = key_.deleteLink(rLinkName); - if (err != RegError::NO_ERROR) { - throw css::registry::InvalidRegistryException( - (("com.sun.star.registry.SimpleRegistry key deleteLink:" - " underlying RegistryKey::deleteLink() = ") + - OUString::number(static_cast<int>(err))), - static_cast< OWeakObject * >(this)); - } + throw css::registry::InvalidRegistryException( + "com.sun.star.registry.SimpleRegistry key deleteLink: links are no longer supported", + static_cast< OWeakObject * >(this)); } -OUString Key::getLinkTarget(OUString const & rLinkName) +OUString Key::getLinkTarget(OUString const & /*rLinkName*/) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { - osl::MutexGuard guard(registry_->mutex_); - OUString target; - RegError err = key_.getLinkTarget(rLinkName, target); - if (err != RegError::NO_ERROR) { - throw css::registry::InvalidRegistryException( - (("com.sun.star.registry.SimpleRegistry key getLinkTarget:" - " underlying RegistryKey::getLinkTarget() = ") + - OUString::number(static_cast<int>(err))), - static_cast< OWeakObject * >(this)); - } - return target; + throw css::registry::InvalidRegistryException( + "com.sun.star.registry.SimpleRegistry key getLinkTarget: links are no longer supported", + static_cast< OWeakObject * >(this)); } OUString Key::getResolvedName(OUString const & aKeyName) |