diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-27 16:42:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-31 12:35:53 +0200 |
commit | 3f60a32aa2413ca67eb243a3ba91abd3327a07b3 (patch) | |
tree | 0ca0517f15f0eab898b8fe1c1e8bbcef51e5b40b | |
parent | 55ee8a75c1a5670d547465a10314a85284283ea6 (diff) |
xmloff: sal_Bool->bool
Change-Id: If694d16088ae0dcdc8b99797eed575c90d646fe5
-rw-r--r-- | include/xmloff/ProgressBarHelper.hxx | 12 | ||||
-rw-r--r-- | include/xmloff/SettingsExportHelper.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/SinglePropertySetInfoCache.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/ProgressBarHelper.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/SettingsExportHelper.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/SinglePropertySetInfoCache.cxx | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index 08a663dde267..827e35f6f913 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -36,23 +36,23 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper sal_Int32 nRange; sal_Int32 nReference; sal_Int32 nValue; - sal_Bool bStrict; + bool bStrict; // #96469#; if the value goes over the Range the progressbar starts again - sal_Bool bRepeat; + bool bRepeat; #ifdef DBG_UTIL - sal_Bool bFailure; + bool bFailure; #endif public: ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator, - const sal_Bool bStrict); + const bool bStrict); ~ProgressBarHelper(); void SetText(OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } void SetRange(sal_Int32 nVal) { nRange = nVal; } void SetReference(sal_Int32 nVal) { nReference = nVal; } void SetValue(sal_Int32 nValue); - void SetRepeat(sal_Bool bValue) { bRepeat = bValue; } + void SetRepeat(bool bValue) { bRepeat = bValue; } inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); } void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); } @@ -62,7 +62,7 @@ public: sal_Int32 GetReference() { return nReference; } sal_Int32 GetValue() { return nValue; } - sal_Bool GetRepeat() { return bRepeat; } + bool GetRepeat() { return bRepeat; } }; #endif diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx index 67351e8e6bc1..346a20c8c560 100644 --- a/include/xmloff/SettingsExportHelper.hxx +++ b/include/xmloff/SettingsExportHelper.hxx @@ -59,7 +59,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper void CallTypeFunction(const com::sun::star::uno::Any& rAny, const OUString& rName) const; - void exportBool(const sal_Bool bValue, const OUString& rName) const; + void exportBool(const bool bValue, const OUString& rName) const; void exportByte(const sal_Int8 nValue, const OUString& rName) const; void exportShort(const sal_Int16 nValue, const OUString& rName) const; void exportInt(const sal_Int32 nValue, const OUString& rName) const; @@ -75,7 +75,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper const OUString& rName) const; void exportMapEntry(const com::sun::star::uno::Any& rAny, const OUString& rName, - const sal_Bool bNameAccess) const; + const bool bNameAccess) const; void exportNameAccess( const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& aNamed, const OUString& rName) const; diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx index 85ff232be964..28ed54698556 100644 --- a/include/xmloff/SinglePropertySetInfoCache.hxx +++ b/include/xmloff/SinglePropertySetInfoCache.hxx @@ -39,13 +39,13 @@ public: inline SinglePropertySetInfoCache( const OUString& rName ); ~SinglePropertySetInfoCache() {}; - sal_Bool hasProperty( + bool hasProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& rPropSetInfo ); - inline sal_Bool hasProperty( + inline bool hasProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rPropSet ); }; @@ -56,7 +56,7 @@ inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( { } -inline sal_Bool SinglePropertySetInfoCache::hasProperty( +inline bool SinglePropertySetInfoCache::hasProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rPropSet ) { diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index 87b67f73a435..43804bea4001 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -28,15 +28,15 @@ using namespace ::com::sun::star; static const sal_Int32 nDefaultProgressBarRange = 1000000; ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator, - const sal_Bool bTempStrict) + const bool bTempStrict) : xStatusIndicator(xTempStatusIndicator) , nRange(nDefaultProgressBarRange) , nReference(100) , nValue(0) , bStrict(bTempStrict) -, bRepeat(sal_True) +, bRepeat(true) #ifdef DBG_UTIL -, bFailure(sal_False) +, bFailure(false) #endif { } @@ -101,7 +101,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue) else if (!bFailure) { OSL_FAIL("tried to set a wrong value on the progressbar"); - bFailure = sal_True; + bFailure = true; } #endif } diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 7137f8e6f290..0df2dd5572ef 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -180,7 +180,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, } } -void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const OUString& rName) const +void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); @@ -360,7 +360,7 @@ void XMLSettingsExportHelper::exportbase64Binary( void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, const OUString& rName, - const sal_Bool bNameAccess) const + const bool bNameAccess) const { DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name"); uno::Sequence<beans::PropertyValue> aProps; @@ -390,7 +390,7 @@ void XMLSettingsExportHelper::exportNameAccess( m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True ); uno::Sequence< OUString > aNames(aNamed->getElementNames()); for (sal_Int32 i = 0; i < aNames.getLength(); i++) - exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], sal_True); + exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], true); m_rContext.EndElement( sal_True ); } } @@ -410,7 +410,7 @@ void XMLSettingsExportHelper::exportIndexAccess( sal_Int32 nCount = aIndexed->getCount(); for (sal_Int32 i = 0; i < nCount; i++) { - exportMapEntry(aIndexed->getByIndex(i), sEmpty, sal_False); + exportMapEntry(aIndexed->getByIndex(i), sEmpty, false); } m_rContext.EndElement( sal_True ); } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index eadd16c0f3db..8e9cbfedf0aa 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2005,7 +2005,7 @@ ProgressBarHelper* SvXMLExport::GetProgressBarHelper() { if (!mpProgressBarHelper) { - mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, sal_True); + mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, true); if (mxExportInfo.is()) { diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 0791a90ab846..95742c402d78 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -829,7 +829,7 @@ void SAL_CALL SvXMLImport::unknown( const OUString& ) void SvXMLImport::SetStatistics(const uno::Sequence< beans::NamedValue> &) { - GetProgressBarHelper()->SetRepeat(sal_False); + GetProgressBarHelper()->SetRepeat(false); GetProgressBarHelper()->SetReference(0); } @@ -1398,7 +1398,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper() { if (!mpProgressBarHelper) { - mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, sal_False); + mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, false); if (mxImportInfo.is()) { diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx index aa9a0d08c5f3..aff0fa11761c 100644 --- a/xmloff/source/style/SinglePropertySetInfoCache.cxx +++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; -sal_Bool SinglePropertySetInfoCache::hasProperty( +bool SinglePropertySetInfoCache::hasProperty( const Reference< XPropertySet >& rPropSet, Reference< XPropertySetInfo >& rPropSetInfo ) { |