summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-08 12:43:52 +0200
committerNoel Grandin <noel@peralex.com>2015-04-09 08:41:11 +0200
commit1f34524746a0849ee2c76241d7ac6934110009fe (patch)
tree5757a12140ae39bfd52f7fb434760ad428724663 /registry
parent1bdbe0b475464402716c1c304d28376f1c37d820 (diff)
remove reg keytype constants and related code
since we no longer support the RG_LINKTYPE stuff Change-Id: If388ecfa0c475471b99b26155ad554ec702ca734
Diffstat (limited to 'registry')
-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
5 files changed, 0 insertions, 57 deletions
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(