Kaydet (Commit) 2765cf0c authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

sal_Bool->bool in rdbmaker

Change-Id: I454e5f4522cd5c5c1f04fde7cb79feab5ae63528
üst b6831de3
...@@ -33,7 +33,7 @@ struct TypeReader_Impl ...@@ -33,7 +33,7 @@ struct TypeReader_Impl
{ {
TypeReader_Impl(const sal_uInt8* buffer, TypeReader_Impl(const sal_uInt8* buffer,
sal_uInt32 bufferLen, sal_uInt32 bufferLen,
sal_Bool copyData) bool copyData)
: m_refCount(0) : m_refCount(0)
, m_copyData(copyData) , m_copyData(copyData)
, m_blopSize(bufferLen) , m_blopSize(bufferLen)
...@@ -62,7 +62,7 @@ struct TypeReader_Impl ...@@ -62,7 +62,7 @@ struct TypeReader_Impl
} }
sal_Int32 m_refCount; sal_Int32 m_refCount;
sal_Bool m_copyData; bool m_copyData;
sal_Int32 m_blopSize; sal_Int32 m_blopSize;
const sal_uInt8* m_pBlop; const sal_uInt8* m_pBlop;
typereg::Reader* m_pReader; typereg::Reader* m_pReader;
...@@ -77,7 +77,7 @@ public: ...@@ -77,7 +77,7 @@ public:
inline TypeReader( const sal_uInt8* buffer, inline TypeReader( const sal_uInt8* buffer,
sal_uInt32 bufferLen, sal_uInt32 bufferLen,
sal_Bool copyData) bool copyData)
{ {
m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData); m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData);
acquire(); acquire();
......
...@@ -94,14 +94,14 @@ struct RegistryTypeManagerImpl ...@@ -94,14 +94,14 @@ struct RegistryTypeManagerImpl
RegistryTypeManagerImpl() RegistryTypeManagerImpl()
: m_pMergedRegistry(NULL) : m_pMergedRegistry(NULL)
, m_base("/") , m_base("/")
, m_isMerged(sal_False) , m_isMerged(false)
{} {}
T2TypeClassMap m_t2TypeClass; T2TypeClassMap m_t2TypeClass;
RegistryList m_registries; RegistryList m_registries;
Registry* m_pMergedRegistry; Registry* m_pMergedRegistry;
::rtl::OString m_base; ::rtl::OString m_base;
sal_Bool m_isMerged; bool m_isMerged;
}; };
class RegistryTypeManager : public TypeManager class RegistryTypeManager : public TypeManager
......
...@@ -168,7 +168,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name) ...@@ -168,7 +168,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer)) if (!key.getValue(OUString(), pBuffer))
{ {
reader = TypeReader(pBuffer, valueSize, sal_True); reader = TypeReader(pBuffer, valueSize, true);
} }
rtl_freeMemory(pBuffer); rtl_freeMemory(pBuffer);
} }
...@@ -195,7 +195,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name) ...@@ -195,7 +195,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer)) if (!key.getValue(OUString(), pBuffer))
{ {
TypeReader reader(pBuffer, valueSize, sal_False); TypeReader reader(pBuffer, valueSize, false);
RTTypeClass ret = reader.getTypeClass(); RTTypeClass ret = reader.getTypeClass();
......
...@@ -277,7 +277,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) ...@@ -277,7 +277,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
} }
m_options["-L"] = OString(); m_options["-L"] = OString();
m_generateTypeList = sal_True; m_generateTypeList = true;
break; break;
default: default:
throw IllegalArgument("the option is unknown" + OString(av[i])); throw IllegalArgument("the option is unknown" + OString(av[i]));
......
...@@ -27,7 +27,7 @@ class RdbOptions : public Options ...@@ -27,7 +27,7 @@ class RdbOptions : public Options
public: public:
RdbOptions() RdbOptions()
: Options() : Options()
, m_generateTypeList(sal_False) , m_generateTypeList(false)
{} {}
~RdbOptions() {} ~RdbOptions() {}
...@@ -39,11 +39,11 @@ public: ...@@ -39,11 +39,11 @@ public:
::rtl::OString prepareVersion(); ::rtl::OString prepareVersion();
sal_Bool generateTypeList() bool generateTypeList()
{ return m_generateTypeList; } { return m_generateTypeList; }
protected: protected:
sal_Bool m_generateTypeList; bool m_generateTypeList;
}; };
#endif // _RDBMAKER_RDBOPTIONS_HXX_ #endif // _RDBMAKER_RDBOPTIONS_HXX_
......
...@@ -66,7 +66,7 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name) ...@@ -66,7 +66,7 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name)
if ( (blopSize = getTypeBlop( name.getStr(), &pBlop)) > 0 ) if ( (blopSize = getTypeBlop( name.getStr(), &pBlop)) > 0 )
{ {
reader = TypeReader(pBlop, blopSize, sal_True); reader = TypeReader(pBlop, blopSize, true);
} }
if ( pBlop ) if ( pBlop )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment