diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:14:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:09 +0100 |
| commit | 0c9d002ecdd410b8b5be1fc91f4b84c7cbe5f5bc (patch) | |
| tree | e181242f63eeaa2c015b4ee9233647dfc9a227eb /xmloff | |
| parent | a067822a515579c59f660d9ce03dca1495768672 (diff) | |
bool improvements
Change-Id: I42127c096aa4310e3c8b6c9b6487b4de63e7ac9a
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/nmspmap.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/core/xmlcnimp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/animexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/XMLFontAutoStylePool.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 204fb11acf40..b68cafe28a76 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -68,9 +68,9 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap() { } -int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const +bool SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const { - return static_cast < int > (aNameHash == rCmp.aNameHash); + return aNameHash == rCmp.aNameHash; } sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey ) diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx index ca467fba0a29..9e5796a5092c 100644 --- a/xmloff/source/core/xmlcnimp.cxx +++ b/xmloff/source/core/xmlcnimp.cxx @@ -36,7 +36,7 @@ SvXMLAttrContainerData::~SvXMLAttrContainerData() { } -int SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) const +bool SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) const { return ( *(rCmp.pimpl) == *(pimpl) ); } diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 53abb8b5f2fb..83aff726378b 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -211,7 +211,7 @@ struct XMLEffectHint sal_Int32 mnPresId; sal_Int32 mnPathShapeId; - int operator<(const XMLEffectHint& rComp) const { return mnPresId < rComp.mnPresId; } + bool operator<(const XMLEffectHint& rComp) const { return mnPresId < rComp.mnPresId; } XMLEffectHint() : meKind( XMLE_SHOW ), mbTextEffect( sal_False ), diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 0e0ec13d4616..33fcbb37b127 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -768,7 +768,7 @@ struct ZOrderHint sal_Int32 nIs; sal_Int32 nShould; - int operator<(const ZOrderHint& rComp) const { return nShould < rComp.nShould; } + bool operator<(const ZOrderHint& rComp) const { return nShould < rComp.nShould; } }; class ShapeSortContext diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index d979e9df4c7e..b83bf9cd4cc6 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -107,8 +107,8 @@ struct XMLFontAutoStylePoolEntryCmp_Impl { XMLFontAutoStylePoolEntry_Impl* const& r1, XMLFontAutoStylePoolEntry_Impl* const& r2 ) const { - sal_Int8 nEnc1(r1->GetEncoding() != RTL_TEXTENCODING_SYMBOL); - sal_Int8 nEnc2(r2->GetEncoding() != RTL_TEXTENCODING_SYMBOL); + bool nEnc1(r1->GetEncoding() != RTL_TEXTENCODING_SYMBOL); + bool nEnc2(r2->GetEncoding() != RTL_TEXTENCODING_SYMBOL); if( nEnc1 != nEnc2 ) return nEnc1 < nEnc2; else if( r1->GetPitch() != r2->GetPitch() ) |