summaryrefslogtreecommitdiff
path: root/registry/source
diff options
context:
space:
mode:
Diffstat (limited to 'registry/source')
-rw-r--r--registry/source/keyimpl.hxx4
-rw-r--r--registry/source/reflread.cxx12
-rw-r--r--registry/source/regimpl.cxx24
-rw-r--r--registry/source/regimpl.hxx18
4 files changed, 29 insertions, 29 deletions
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 281872eb48da..7d76d18d32aa 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -99,7 +99,7 @@ public:
bool isDeleted() const
{ return m_bDeleted != 0; }
- void setDeleted (sal_Bool bKeyDeleted)
+ void setDeleted (bool bKeyDeleted)
{ m_bDeleted = bKeyDeleted ? 1 : 0; }
bool isModified() const
@@ -108,7 +108,7 @@ public:
void setModified (bool bModified = true)
{ m_bModified = bModified ? 1 : 0; }
- sal_Bool isReadOnly() const
+ bool isReadOnly() const
{ return m_pRegistry->isReadOnly(); }
sal_uInt32 countSubKeys();
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 7fffd6e6ed1d..1eaf9552e299 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -249,7 +249,7 @@ public:
CPInfoTag readTag(sal_uInt16 index);
const sal_Char* readUTF8NameConstant(sal_uInt16 index);
- sal_Bool readBOOLConstant(sal_uInt16 index);
+ bool readBOOLConstant(sal_uInt16 index);
sal_Int8 readBYTEConstant(sal_uInt16 index);
sal_Int16 readINT16Constant(sal_uInt16 index);
sal_uInt16 readUINT16Constant(sal_uInt16 index);
@@ -343,15 +343,15 @@ const sal_Char* ConstantPool::readUTF8NameConstant(sal_uInt16 index)
return aName;
}
-sal_Bool ConstantPool::readBOOLConstant(sal_uInt16 index)
+bool ConstantPool::readBOOLConstant(sal_uInt16 index)
{
- sal_Bool aBool = sal_False;
+ bool aBool = false;
if (m_pIndex && (index> 0) && (index <= m_numOfEntries))
{
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == CP_TAG_CONST_BOOL)
{
- aBool = (sal_Bool) readBYTE(m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA);
+ aBool = readBYTE(m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA) != 0;
}
}
@@ -1081,7 +1081,7 @@ public:
sal_uInt16 m_offset_SUPERTYPES;
TypeRegistryEntry(
- const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer);
+ const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer);
// throws std::bad_alloc
~TypeRegistryEntry();
@@ -1090,7 +1090,7 @@ public:
};
TypeRegistryEntry::TypeRegistryEntry(
- const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer):
+ const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer):
BlopObject(buffer, len, copyBuffer), m_pCP(NULL), m_pFields(NULL),
m_pMethods(NULL), m_pReferences(NULL), m_refCount(1), m_nSuperTypes(0),
m_offset_SUPERTYPES(0)
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 348bdf10e648..9c23c266c622 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -653,7 +653,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
{
*phNewKey = m_openKeyTable[sFullKeyName];
((ORegKey*)*phNewKey)->acquire();
- ((ORegKey*)*phNewKey)->setDeleted(sal_False);
+ ((ORegKey*)*phNewKey)->setDeleted(false);
return REG_NO_ERROR;
}
@@ -850,7 +850,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
pOldKey->setModified();
// set flag deleted !!!
- pOldKey->setDeleted(sal_True);
+ pOldKey->setDeleted(true);
return pKey->closeKey(pOldKey);
}
@@ -900,7 +900,7 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey)
// loadKey
//
RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
- sal_Bool bWarnings, sal_Bool bReport)
+ bool bWarnings, bool bReport)
{
RegError _ret = REG_NO_ERROR;
ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -948,7 +948,7 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
// saveKey
//
RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName,
- sal_Bool bWarnings, sal_Bool bReport)
+ bool bWarnings, bool bReport)
{
RegError _ret = REG_NO_ERROR;
ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -1002,8 +1002,8 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
ORegKey* pSourceKey,
const OUString& valueName,
sal_uInt32 nCut,
- sal_Bool bWarnings,
- sal_Bool bReport)
+ bool bWarnings,
+ bool bReport)
{
OStoreStream rValue;
sal_uInt8* pBuffer;
@@ -1130,9 +1130,9 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
const OUString& sTargetPath,
sal_uInt32 srcValueSize,
sal_uInt8* pSrcBuffer,
- sal_Bool bReport)
+ bool bReport)
{
- RegistryTypeReader reader(pSrcBuffer, srcValueSize, sal_False);
+ RegistryTypeReader reader(pSrcBuffer, srcValueSize, false);
if (reader.getTypeClass() == RT_TYPE_INVALID)
{
@@ -1159,7 +1159,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
if (!rValue.readAt(VALUE_HEADEROFFSET, pBuffer, valueSize, rwBytes) &&
(rwBytes == valueSize))
{
- RegistryTypeReader reader2(pBuffer, valueSize, sal_False);
+ RegistryTypeReader reader2(pBuffer, valueSize, false);
if ((reader.getTypeClass() != reader2.getTypeClass())
|| reader2.getTypeClass() == RT_TYPE_INVALID)
@@ -1335,8 +1335,8 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
ORegKey* pSourceKey,
const OUString& keyName,
sal_uInt32 nCut,
- sal_Bool bWarnings,
- sal_Bool bReport)
+ bool bWarnings,
+ bool bReport)
{
RegError _ret = REG_NO_ERROR;
OUString sRelPath(pSourceKey->getName().copy(nCut));
@@ -1359,7 +1359,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
if (m_openKeyTable.count(sFullKeyName) > 0)
{
- m_openKeyTable[sFullKeyName]->setDeleted(sal_False);
+ m_openKeyTable[sFullKeyName]->setDeleted(false);
}
ORegKey* pTmpKey = 0;
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index deeae444311f..055e0d0a5770 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -91,13 +91,13 @@ public:
RegError loadKey(RegKeyHandle hKey,
const OUString& regFileName,
- sal_Bool bWarings=sal_False,
- sal_Bool bReport=sal_False);
+ bool bWarings=false,
+ bool bReport=false);
RegError saveKey(RegKeyHandle hKey,
const OUString& regFileName,
- sal_Bool bWarings=sal_False,
- sal_Bool bReport=sal_False);
+ bool bWarings=false,
+ bool bReport=false);
RegError dumpRegistry(RegKeyHandle hKey) const;
@@ -128,14 +128,14 @@ private:
ORegKey* pSourceKey,
const OUString& valueName,
sal_uInt32 nCut,
- sal_Bool bWarnings=sal_False,
- sal_Bool bReport=sal_False);
+ bool bWarnings=false,
+ bool bReport=false);
RegError checkBlop(store::OStoreStream& rValue,
const OUString& sTargetPath,
sal_uInt32 srcValueSize,
sal_uInt8* pSrcBuffer,
- sal_Bool bReport=sal_False);
+ bool bReport=false);
RegError mergeModuleValue(store::OStoreStream& rTargetValue,
RegistryTypeReader& reader,
@@ -145,8 +145,8 @@ private:
ORegKey* pSourceKey,
const OUString& keyName,
sal_uInt32 nCut,
- sal_Bool bWarnings=sal_False,
- sal_Bool bReport=sal_False);
+ bool bWarnings=false,
+ bool bReport=false);
RegError dumpValue(const OUString& sPath,
const OUString& sName,