From 824c59a38d0e5d3a7f65193e4b4087cf1e0fe64f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Feb 2014 23:02:16 +0100 Subject: store: sal_Bool -> bool Change-Id: I7d108e7ae387f9c07cce182a0bb09b69a6608226 --- include/store/store.hxx | 2 +- store/source/object.cxx | 2 +- store/source/object.hxx | 4 ++-- store/source/storbios.cxx | 2 +- store/source/storbios.hxx | 4 ++-- store/source/stordir.cxx | 2 +- store/source/stordir.hxx | 2 +- store/source/storlckb.cxx | 2 +- store/source/storlckb.hxx | 2 +- store/source/storpage.cxx | 2 +- store/source/storpage.hxx | 6 +++--- store/source/stortree.hxx | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/store/store.hxx b/include/store/store.hxx index 969aa6b859af..b3861df2da7a 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -326,7 +326,7 @@ public: @param it [in] current directory entry. @return sal_True to continue iteration, sal_False to stop. */ - virtual sal_Bool visit (const iterator& it) = 0; + virtual bool visit (const iterator& it) = 0; protected: ~traveller() {} diff --git a/store/source/object.cxx b/store/source/object.cxx index 20c7dae7e782..acafa83b11b6 100644 --- a/store/source/object.cxx +++ b/store/source/object.cxx @@ -71,7 +71,7 @@ void OStoreObject::operator delete (void *p) /* * isKindOf. */ -sal_Bool SAL_CALL OStoreObject::isKindOf (sal_uInt32 nTypeId) +bool SAL_CALL OStoreObject::isKindOf (sal_uInt32 nTypeId) { return (nTypeId == m_nTypeId); } diff --git a/store/source/object.hxx b/store/source/object.hxx index 91f528a47480..a3213a168bfa 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -39,7 +39,7 @@ class IStoreHandle : public rtl::IReference public: /** Replaces dynamic_cast type checking. */ - virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nTypeId) = 0; + virtual bool SAL_CALL isKindOf (sal_uInt32 nTypeId) = 0; protected: ~IStoreHandle() {} @@ -76,7 +76,7 @@ public: /** IStoreHandle. */ - virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nTypeId); + virtual bool SAL_CALL isKindOf (sal_uInt32 nTypeId); /** IReference. */ diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index b773c5d20397..719b32ee2c32 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -98,7 +98,7 @@ struct OStoreSuperBlock /** Comparison. */ - sal_Bool operator== (const OStoreSuperBlock & rhs) const + bool operator== (const OStoreSuperBlock & rhs) const { return ((m_aGuard == rhs.m_aGuard ) && (m_aDescr == rhs.m_aDescr ) && diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index 37d9dc3854db..d90be7eb5687 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -83,7 +83,7 @@ public: /** isValid. */ - inline sal_Bool isValid (void) const; + inline bool isValid (void) const; /** Page Access. */ @@ -233,7 +233,7 @@ inline bool OStorePageBIOS::isWriteable (void) const { return m_bWriteable; } -inline sal_Bool OStorePageBIOS::isValid (void) const +inline bool OStorePageBIOS::isValid (void) const { return m_xLockBytes.is(); } diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx index 4acb51b1dd76..885da4a4de8a 100644 --- a/store/source/stordir.cxx +++ b/store/source/stordir.cxx @@ -92,7 +92,7 @@ OStoreDirectory_Impl::~OStoreDirectory_Impl (void) /* * isKindOf. */ -sal_Bool SAL_CALL OStoreDirectory_Impl::isKindOf (sal_uInt32 nTypeId) +bool SAL_CALL OStoreDirectory_Impl::isKindOf (sal_uInt32 nTypeId) { return (nTypeId == m_nTypeId); } diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx index a996d03e6f1a..0a4a036a9aa3 100644 --- a/store/source/stordir.hxx +++ b/store/source/stordir.hxx @@ -70,7 +70,7 @@ public: /** IStoreHandle. */ - virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nTypeId); + virtual bool SAL_CALL isKindOf (sal_uInt32 nTypeId); protected: /** Destruction. diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx index 539bf3707cac..68539c37bcf3 100644 --- a/store/source/storlckb.cxx +++ b/store/source/storlckb.cxx @@ -66,7 +66,7 @@ OStoreLockBytes::~OStoreLockBytes (void) /* * isKindOf. */ -sal_Bool SAL_CALL OStoreLockBytes::isKindOf (sal_uInt32 nTypeId) +bool SAL_CALL OStoreLockBytes::isKindOf (sal_uInt32 nTypeId) { return (nTypeId == m_nTypeId); } diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx index 4ddaa2ca994b..d5b1e407f03e 100644 --- a/store/source/storlckb.hxx +++ b/store/source/storlckb.hxx @@ -105,7 +105,7 @@ public: /** IStoreHandle. */ - virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nMagic); + virtual bool SAL_CALL isKindOf (sal_uInt32 nMagic); protected: /** Destruction (OReference). diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index d7b9dc523e0c..1c4a331db9cf 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -61,7 +61,7 @@ OStorePageManager::~OStorePageManager (void) /* * isKindOf. */ -sal_Bool SAL_CALL OStorePageManager::isKindOf (sal_uInt32 nTypeId) +bool SAL_CALL OStorePageManager::isKindOf (sal_uInt32 nTypeId) { return (nTypeId == m_nTypeId); } diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index a72d13dacba7..384a1b974734 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -58,7 +58,7 @@ public: * @return sal_True upon successful initialization, * sal_False otherwise. */ - inline sal_Bool isValid (void) const; + inline bool isValid (void) const; /** DirectoryPage I/O (managed). */ @@ -130,7 +130,7 @@ public: /** IStoreHandle. */ - virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nTypeId); + virtual bool SAL_CALL isKindOf (sal_uInt32 nTypeId); protected: /** Destruction. @@ -190,7 +190,7 @@ private: OStorePageManager& operator= (const OStorePageManager&); }; -inline sal_Bool OStorePageManager::isValid (void) const +inline bool OStorePageManager::isValid (void) const { return (base::isValid() /* @@@ NYI && (m_aRoot.is()) */); } diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index 54768a1d0008..81d3d80e7bb6 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -198,14 +198,14 @@ struct OStoreBTreeNodeData : public store::OStorePageData /** queryMerge. */ - sal_Bool queryMerge (const self &rPageR) const + bool queryMerge (const self &rPageR) const { return ((usageCount() + rPageR.usageCount()) <= capacityCount()); } /** querySplit. */ - sal_Bool querySplit (void) const + bool querySplit (void) const { return (!(usageCount() < capacityCount())); } -- cgit