diff options
| -rw-r--r-- | rdbmaker/inc/codemaker/registry.hxx | 6 | ||||
| -rw-r--r-- | rdbmaker/inc/codemaker/typemanager.hxx | 4 | ||||
| -rw-r--r-- | rdbmaker/source/codemaker/typemanager.cxx | 4 | ||||
| -rw-r--r-- | rdbmaker/source/rdbmaker/rdboptions.cxx | 2 | ||||
| -rw-r--r-- | rdbmaker/source/rdbmaker/rdboptions.hxx | 6 | ||||
| -rw-r--r-- | rdbmaker/source/rdbmaker/specialtypemanager.cxx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx index bb30b85fb1e6..67eae3818838 100644 --- a/rdbmaker/inc/codemaker/registry.hxx +++ b/rdbmaker/inc/codemaker/registry.hxx @@ -33,7 +33,7 @@ struct TypeReader_Impl { TypeReader_Impl(const sal_uInt8* buffer, sal_uInt32 bufferLen, - sal_Bool copyData) + bool copyData) : m_refCount(0) , m_copyData(copyData) , m_blopSize(bufferLen) @@ -62,7 +62,7 @@ struct TypeReader_Impl } sal_Int32 m_refCount; - sal_Bool m_copyData; + bool m_copyData; sal_Int32 m_blopSize; const sal_uInt8* m_pBlop; typereg::Reader* m_pReader; @@ -77,7 +77,7 @@ public: inline TypeReader( const sal_uInt8* buffer, sal_uInt32 bufferLen, - sal_Bool copyData) + bool copyData) { m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData); acquire(); diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx index 086ce75224ff..a6da27d29db0 100644 --- a/rdbmaker/inc/codemaker/typemanager.hxx +++ b/rdbmaker/inc/codemaker/typemanager.hxx @@ -94,14 +94,14 @@ struct RegistryTypeManagerImpl RegistryTypeManagerImpl() : m_pMergedRegistry(NULL) , m_base("/") - , m_isMerged(sal_False) + , m_isMerged(false) {} T2TypeClassMap m_t2TypeClass; RegistryList m_registries; Registry* m_pMergedRegistry; ::rtl::OString m_base; - sal_Bool m_isMerged; + bool m_isMerged; }; class RegistryTypeManager : public TypeManager diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx index b0d0a14ca8a0..1348a1e94b70 100644 --- a/rdbmaker/source/codemaker/typemanager.cxx +++ b/rdbmaker/source/codemaker/typemanager.cxx @@ -168,7 +168,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name) sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { - reader = TypeReader(pBuffer, valueSize, sal_True); + reader = TypeReader(pBuffer, valueSize, true); } rtl_freeMemory(pBuffer); } @@ -195,7 +195,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name) sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { - TypeReader reader(pBuffer, valueSize, sal_False); + TypeReader reader(pBuffer, valueSize, false); RTTypeClass ret = reader.getTypeClass(); diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx index 6353f413ea9c..54d92eb1921c 100644 --- a/rdbmaker/source/rdbmaker/rdboptions.cxx +++ b/rdbmaker/source/rdbmaker/rdboptions.cxx @@ -277,7 +277,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) } m_options["-L"] = OString(); - m_generateTypeList = sal_True; + m_generateTypeList = true; break; default: throw IllegalArgument("the option is unknown" + OString(av[i])); diff --git a/rdbmaker/source/rdbmaker/rdboptions.hxx b/rdbmaker/source/rdbmaker/rdboptions.hxx index 7352cd4acce0..aebf6d1323ef 100644 --- a/rdbmaker/source/rdbmaker/rdboptions.hxx +++ b/rdbmaker/source/rdbmaker/rdboptions.hxx @@ -27,7 +27,7 @@ class RdbOptions : public Options public: RdbOptions() : Options() - , m_generateTypeList(sal_False) + , m_generateTypeList(false) {} ~RdbOptions() {} @@ -39,11 +39,11 @@ public: ::rtl::OString prepareVersion(); - sal_Bool generateTypeList() + bool generateTypeList() { return m_generateTypeList; } protected: - sal_Bool m_generateTypeList; + bool m_generateTypeList; }; #endif // _RDBMAKER_RDBOPTIONS_HXX_ diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx index b643adb421e4..72f8341107c7 100644 --- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx +++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx @@ -66,7 +66,7 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name) if ( (blopSize = getTypeBlop( name.getStr(), &pBlop)) > 0 ) { - reader = TypeReader(pBlop, blopSize, sal_True); + reader = TypeReader(pBlop, blopSize, true); } if ( pBlop ) |