diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-22 13:31:57 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-07-23 08:41:46 +0200 |
commit | 95aad95fbec35c3aab777b176218a29821f79574 (patch) | |
tree | 860e5fc0890830b27c391b4492d6b91631ef9850 /registry/source/regimpl.cxx | |
parent | e412e16d56caf426bac04c7e5966e2a9efa7c408 (diff) |
inline a handful of use-once #defines
Change-Id: Id2654555c4042f8c0bdbd6bab6507e705f08326b
Diffstat (limited to 'registry/source/regimpl.cxx')
-rw-r--r-- | registry/source/regimpl.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index d31458af72bb..3499a5a83167 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -456,16 +456,16 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo { RegError eRet = RegError::INVALID_REGISTRY; OStoreFile rRegFile; - storeAccessMode sAccessMode = REG_MODE_OPEN; + storeAccessMode sAccessMode = store_AccessReadWrite; storeError errCode; if (bCreate) { - sAccessMode = REG_MODE_CREATE; + sAccessMode = store_AccessCreate; } else if (accessMode & RegAccessMode::READONLY) { - sAccessMode = REG_MODE_OPENREAD; + sAccessMode = store_AccessReadOnly; m_readOnly = true; } @@ -673,7 +673,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, KEY_MODE_CREATE)) + if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, store_AccessCreate)) { return RegError::CREATE_KEY_FAILED; } @@ -720,7 +720,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() ? KEY_MODE_OPENREAD : KEY_MODE_OPEN)) + isReadOnly() ? store_AccessReadOnly : store_AccessReadWrite)) { case store_E_NotExists: return RegError::KEY_NOT_EXISTS; @@ -1010,13 +1010,13 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, RegValueType valueType; sal_uInt32 valueSize; sal_uInt32 nSize; - storeAccessMode sourceAccess = VALUE_MODE_OPEN; + storeAccessMode sourceAccess = store_AccessReadWrite; OUString sTargetPath(pTargetKey->getName()); OUString sSourcePath(pSourceKey->getName()); if (pSourceKey->isReadOnly()) { - sourceAccess = VALUE_MODE_OPENREAD; + sourceAccess = store_AccessReadOnly; } if (nCut) @@ -1076,7 +1076,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, OStoreFile rTargetFile(pTargetKey->getStoreFile()); - if (!rValue.create(rTargetFile, sTargetPath, valueName, VALUE_MODE_OPEN)) + if (!rValue.create(rTargetFile, sTargetPath, valueName, store_AccessReadWrite)) { if (valueType == RegValueType::BINARY) { @@ -1100,7 +1100,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } // write - if (rValue.create(rTargetFile, sTargetPath, valueName, VALUE_MODE_CREATE)) + if (rValue.create(rTargetFile, sTargetPath, valueName, store_AccessCreate)) { rtl_freeMemory(pBuffer); return RegError::INVALID_VALUE; @@ -1352,7 +1352,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey, sFullKeyName += keyName; OStoreDirectory rStoreDir; - if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, KEY_MODE_CREATE)) + if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, store_AccessCreate)) { return RegError::CREATE_KEY_FAILED; } @@ -1458,11 +1458,11 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ RegValueType valueType; OUString sFullPath(sPath); OString sIndent; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } for (int i= 0; i < nSpc; i++) sIndent += " "; @@ -1694,12 +1694,12 @@ RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_In OStoreDirectory rStoreDir; OUString sFullPath(sPath); OString sIndent; - storeAccessMode accessMode = KEY_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; RegError _ret = RegError::NO_ERROR; if (isReadOnly()) { - accessMode = KEY_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } for (int i= 0; i < nSpace; i++) sIndent += " "; |