summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
Diffstat (limited to 'registry')
-rw-r--r--registry/source/keyimpl.cxx32
-rw-r--r--registry/source/regimpl.cxx30
2 files changed, 31 insertions, 31 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 9fa3dab7d1c8..2aeb31015d9d 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -219,11 +219,11 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy
{
OStoreStream rValue;
sal_uInt8* pBuffer;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
OUString sImplValueName( VALUE_PREFIX );
@@ -301,7 +301,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal
REG_GUARD(m_pRegistry->m_mutex);
- if ( rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT , sImplValueName, store_AccessCreate) )
+ if ( rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT , sImplValueName, storeAccessMode::Create) )
{
return RegError::SET_VALUE_FAILED;
}
@@ -371,7 +371,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
REG_GUARD(m_pRegistry->m_mutex);
- if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) )
+ if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, storeAccessMode::Create) )
{
return RegError::SET_VALUE_FAILED;
}
@@ -430,7 +430,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
REG_GUARD(m_pRegistry->m_mutex);
- if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) )
+ if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, storeAccessMode::Create) )
{
return RegError::SET_VALUE_FAILED;
}
@@ -498,7 +498,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
REG_GUARD(m_pRegistry->m_mutex);
- if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) )
+ if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, storeAccessMode::Create) )
{
return RegError::SET_VALUE_FAILED;
}
@@ -557,11 +557,11 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const
sal_uInt8* pBuffer;
RegValueType valueType;
sal_uInt32 valueSize;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
OUString sImplValueName( VALUE_PREFIX );
@@ -651,11 +651,11 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue
sal_uInt8* pBuffer;
RegValueType valueType;
sal_uInt32 valueSize;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
OUString sImplValueName( VALUE_PREFIX );
@@ -765,11 +765,11 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal
sal_uInt8* pBuffer;
RegValueType valueType;
sal_uInt32 valueSize;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
OUString sImplValueName( VALUE_PREFIX );
@@ -871,11 +871,11 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode***
sal_uInt8* pBuffer;
RegValueType valueType;
sal_uInt32 valueSize;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
OUString sImplValueName( VALUE_PREFIX );
@@ -1009,7 +1009,7 @@ OStoreDirectory ORegKey::getStoreDir()
OStoreDirectory rStoreDir;
OUString fullPath;
OUString relativName;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if ( m_name.equals(m_pRegistry->ROOT) )
{
@@ -1023,7 +1023,7 @@ OStoreDirectory ORegKey::getStoreDir()
if (m_pRegistry->isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
rStoreDir.create(getStoreFile(), fullPath, relativName, accessMode);
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 75e64bc940b8..0655a4642c43 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -455,21 +455,21 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
{
RegError eRet = RegError::INVALID_REGISTRY;
OStoreFile rRegFile;
- storeAccessMode sAccessMode = store_AccessReadWrite;
+ storeAccessMode sAccessMode = storeAccessMode::ReadWrite;
storeError errCode;
if (bCreate)
{
- sAccessMode = store_AccessCreate;
+ sAccessMode = storeAccessMode::Create;
}
else if (accessMode & RegAccessMode::READONLY)
{
- sAccessMode = store_AccessReadOnly;
+ sAccessMode = storeAccessMode::ReadOnly;
m_readOnly = true;
}
if (regName.isEmpty() &&
- store_AccessCreate == sAccessMode)
+ storeAccessMode::Create == sAccessMode)
{
errCode = rRegFile.createInMemory();
}
@@ -670,7 +670,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
token = sFullKeyName.getToken( 0, '/', nIndex );
if (!token.isEmpty())
{
- if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, store_AccessCreate))
+ if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, storeAccessMode::Create))
{
return RegError::CREATE_KEY_FAILED;
}
@@ -716,7 +716,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
sal_Int32 n = path.lastIndexOf('/') + 1;
switch (OStoreDirectory().create(
pKey->getStoreFile(), path.copy(0, n), path.copy(n),
- isReadOnly() ? store_AccessReadOnly : store_AccessReadWrite))
+ isReadOnly() ? storeAccessMode::ReadOnly : storeAccessMode::ReadWrite))
{
case store_E_NotExists:
return RegError::KEY_NOT_EXISTS;
@@ -953,13 +953,13 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
RegValueType valueType;
sal_uInt32 valueSize;
sal_uInt32 nSize;
- storeAccessMode sourceAccess = store_AccessReadWrite;
+ storeAccessMode sourceAccess = storeAccessMode::ReadWrite;
OUString sTargetPath(pTargetKey->getName());
OUString sSourcePath(pSourceKey->getName());
if (pSourceKey->isReadOnly())
{
- sourceAccess = store_AccessReadOnly;
+ sourceAccess = storeAccessMode::ReadOnly;
}
if (nCut)
@@ -1019,7 +1019,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
OStoreFile rTargetFile(pTargetKey->getStoreFile());
- if (!rValue.create(rTargetFile, sTargetPath, valueName, store_AccessReadWrite))
+ if (!rValue.create(rTargetFile, sTargetPath, valueName, storeAccessMode::ReadWrite))
{
if (valueType == RegValueType::BINARY)
{
@@ -1043,7 +1043,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
}
// write
- if (rValue.create(rTargetFile, sTargetPath, valueName, store_AccessCreate))
+ if (rValue.create(rTargetFile, sTargetPath, valueName, storeAccessMode::Create))
{
rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
@@ -1292,7 +1292,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
sFullKeyName += keyName;
OStoreDirectory rStoreDir;
- if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, store_AccessCreate))
+ if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, storeAccessMode::Create))
{
return RegError::CREATE_KEY_FAILED;
}
@@ -1396,11 +1396,11 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
RegValueType valueType;
OUString sFullPath(sPath);
OString sIndent;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
if (isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
for (int i= 0; i < nSpc; i++) sIndent += " ";
@@ -1631,12 +1631,12 @@ RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_In
OStoreDirectory rStoreDir;
OUString sFullPath(sPath);
OString sIndent;
- storeAccessMode accessMode = store_AccessReadWrite;
+ storeAccessMode accessMode = storeAccessMode::ReadWrite;
RegError _ret = RegError::NO_ERROR;
if (isReadOnly())
{
- accessMode = store_AccessReadOnly;
+ accessMode = storeAccessMode::ReadOnly;
}
for (int i= 0; i < nSpace; i++) sIndent += " ";