Kaydet (Commit) 70bfe5f7 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

remove deprecated Link functions from Registry

Change-Id: Id678d4b6263df86993b289e8439faac847dd7c5f
Reviewed-on: https://gerrit.libreoffice.org/26855Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst f904bd56
......@@ -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
{
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment