summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/registry/registry.h16
-rw-r--r--include/registry/registry.hxx19
-rw-r--r--include/registry/regtype.h14
-rw-r--r--registry/source/keyimpl.cxx22
-rw-r--r--registry/source/keyimpl.hxx3
-rw-r--r--registry/source/registry.cxx1
-rw-r--r--registry/source/regkey.cxx30
-rw-r--r--registry/source/regkey.hxx1
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx22
9 files changed, 2 insertions, 126 deletions
diff --git a/include/registry/registry.h b/include/registry/registry.h
index 15e6c9dd42ff..68e6014cca40 100644
--- a/include/registry/registry.h
+++ b/include/registry/registry.h
@@ -283,22 +283,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueTyp
RegValue pValueList,
sal_uInt32 len);
-/** This function returns the type of a key.
-
- The registry differentiates two possible types:
- - RG_KEYTYPE represents a real key
- - RG_LINKTYPE used to represent a link (no longer used)
- @param[in] hKey identifies a currently open key. The key specified by keyName is a subkey
- of the key identified by hKey.
- @param[in] keyName points to a null terminated string specifying the name of the key which keytype
- will be returned.
- @param[out] pKeyType returns the type of the key.
- @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
- rtl_uString* keyName,
- RegKeyType* pKeyType);
-
/** This function resolves a keyname.
@param[in] hKey identifies a currently open key. The key specified by keyName is a subkey
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 7f023a0504a9..f290d9a96571 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -67,7 +67,6 @@ struct Registry_Api
RegError (REGISTRY_CALLTYPE *getStringListValue) (RegKeyHandle, rtl_uString*, sal_Char***, sal_uInt32*);
RegError (REGISTRY_CALLTYPE *getUnicodeListValue)(RegKeyHandle, rtl_uString*, sal_Unicode***, sal_uInt32*);
RegError (REGISTRY_CALLTYPE *freeValueList) (RegValueType, RegValue, sal_uInt32);
- RegError (REGISTRY_CALLTYPE *getKeyType) (RegKeyHandle, rtl_uString*, RegKeyType*);
RegError (REGISTRY_CALLTYPE *getResolvedKeyName) (RegKeyHandle, rtl_uString*, sal_Bool, rtl_uString**);
RegError (REGISTRY_CALLTYPE *getKeyNames) (RegKeyHandle, rtl_uString*, rtl_uString***, sal_uInt32*);
RegError (REGISTRY_CALLTYPE *freeKeyNames) (rtl_uString**, sal_uInt32);
@@ -604,15 +603,6 @@ public:
*/
inline RegError deleteLink(const rtl::OUString& linkName);
- /** returns the type of the specified key.
-
- @param name specifies the name of the key or link.
- @param pKeyType returns the type of the key (always RG_KEYTYPE).
- @return REG_NO_ERROR if succeeds else an error code.
- */
- inline RegError getKeyType(const rtl::OUString& name,
- RegKeyType* pKeyType) const;
-
/** used to return the target of a link.
@deprecated Links are no longer supported.
@@ -1099,15 +1089,6 @@ inline RegError RegistryKey::deleteLink(const rtl::OUString& )
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyType(const rtl::OUString& keyName,
- RegKeyType* pKeyType) const
- {
- if (m_registry.isValid())
- return m_registry.m_pApi->getKeyType(m_hImpl, keyName.pData, pKeyType);
- else
- return REG_INVALID_KEY;
- }
-
inline RegError RegistryKey::getLinkTarget(const rtl::OUString& ,
rtl::OUString& ) const
{
diff --git a/include/registry/regtype.h b/include/registry/regtype.h
index 9ae76a8a4288..97f4e44479a3 100644
--- a/include/registry/regtype.h
+++ b/include/registry/regtype.h
@@ -48,20 +48,6 @@ namespace o3tl
template<> struct typed_flags<RegAccessMode> : is_typed_flags<RegAccessMode, 0x07> {};
}
-/** defines the type of a registry key.
-
- The registry differs between normal keys which can contain subkeys or
- a value and link keys which navigate over the linktarget to an existing
- other key (which are no longer supported).
-*/
-enum SAL_DLLPUBLIC_RTTI RegKeyType
-{
- /// represents a real key
- RG_KEYTYPE,
- /// represents a link (which is no longer supported)
- RG_LINKTYPE
-};
-
/** defines the type of a key value.
A registry key can contain a value which has one of seven different types.
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 4f6c770ddd5b..4f1a4f4aa585 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -975,28 +975,6 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode***
}
-// getKeyType()
-
-RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
-{
- *pKeyType = RG_KEYTYPE;
-
- REG_GUARD(m_pRegistry->m_mutex);
-
- if ( !name.isEmpty() )
- {
- ORegKey* pThis = const_cast< ORegKey* >(this);
-
- RegKeyHandle hKey = 0;
- RegError _ret = pThis->openKey(name, &hKey);
- if (_ret != REG_NO_ERROR)
- return _ret;
- (void) pThis->releaseKey(hKey);
- }
-
- return REG_NO_ERROR;
-}
-
RegError ORegKey::getResolvedKeyName(const OUString& keyName,
OUString& resolvedName)
{
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index c0b868f66654..0504e2b0b453 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -90,9 +90,6 @@ public:
sal_Unicode*** pValueList,
sal_uInt32* pLen) const;
- RegError getKeyType(const OUString& name,
- RegKeyType* pKeyType) const;
-
RegError getResolvedKeyName(const OUString& keyName,
OUString& resolvedName);
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index f34f9e28e2ff..5daacedbcf6f 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -436,7 +436,6 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
&getStringListValue,
&getUnicodeListValue,
&freeValueList,
- &getKeyType,
&getResolvedKeyName,
&getKeyNames,
&freeKeyNames};
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 2307e2e12a51..3170a0c5f9db 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -612,23 +612,6 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType,
}
-// getKeyType
-
-RegError REGISTRY_CALLTYPE getKeyType(RegKeyHandle hKey,
- rtl_uString* keyName,
- RegKeyType* pKeyType)
-{
- ORegKey* pKey = static_cast< ORegKey* >(hKey);
- if (!pKey)
- return REG_INVALID_KEY;
-
- if (pKey->isDeleted())
- return REG_INVALID_KEY;
-
- return pKey->getKeyType(keyName, pKeyType);
-}
-
-
// getName
RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey,
@@ -920,19 +903,6 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
}
-// reg_getKeyType
-
-RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
- rtl_uString* keyName,
- RegKeyType* pKeyType)
-{
- if (!hKey)
- return REG_INVALID_KEY;
-
- return getKeyType(hKey, keyName, pKeyType);
-}
-
-
// reg_getResolvedKeyName
RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
diff --git a/registry/source/regkey.hxx b/registry/source/regkey.hxx
index 7fa48d795c2c..38c3d6694d3e 100644
--- a/registry/source/regkey.hxx
+++ b/registry/source/regkey.hxx
@@ -56,7 +56,6 @@ RegError REGISTRY_CALLTYPE getStringListValue(
RegError REGISTRY_CALLTYPE getUnicodeListValue(
RegKeyHandle, rtl_uString*, sal_Unicode***, sal_uInt32*);
RegError REGISTRY_CALLTYPE freeValueList(RegValueType, RegValue, sal_uInt32);
-RegError REGISTRY_CALLTYPE getKeyType(RegKeyHandle, rtl_uString*, RegKeyType*);
RegError REGISTRY_CALLTYPE getResolvedKeyName(
RegKeyHandle, rtl_uString*, sal_Bool, rtl_uString**);
RegError REGISTRY_CALLTYPE getKeyNames(
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()
generated by cgit (git 2.34.1) at 2024-07-10 19:32:03 +0000