bool improvements

Change-Id: I4733554d3329525516511bbd60b9ad3fabc12be0

4 files changed, 20 insertions, 24 deletions

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index 995bbe223e30..09f5adc0c4fe 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -287,7 +287,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
     if ( ( rDesc.mnCompressionMode = mpCGM->ImplGetUI16() ) != 1 )
         rDesc.mbStatus = sal_False;
 
-    if ( ( rDesc.mnX || rDesc.mnY ) == 0 )
+    if ( !( rDesc.mnX || rDesc.mnY ) )
         rDesc.mbStatus = sal_False;
 
     sal_uInt32 nHeaderSize = 2 + 3 * nPrecision + 3 * mpCGM->ImplGetPointSize();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3d047a03a9d2..e6d882f29cde 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4456,7 +4456,7 @@ void PPTCharPropSet::ImplMakeUnique()
 void PPTCharPropSet::SetFont( sal_uInt16 nFont )
 {
     sal_uInt32  nMask = 1 << PPT_CharAttr_Font;
-    sal_uInt32  bDoNotMake = pCharSet->mnAttrSet & nMask;
+    bool bDoNotMake = (pCharSet->mnAttrSet & nMask) != 0;
 
     if ( bDoNotMake )
         bDoNotMake = nFont == pCharSet->mnFont;
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index af2e6f77c984..92d081a639b2 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -71,7 +71,7 @@ public:
 
     filter_info_impl();
     filter_info_impl( const filter_info_impl& rInfo );
-    int operator==( const filter_info_impl& ) const;
+    bool operator==( const filter_info_impl& ) const;
 
     com::sun::star::uno::Sequence< OUString > getFilterUserData() const;
 };
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index b7765e2e9231..c060691d5bee 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1574,28 +1574,24 @@ filter_info_impl::filter_info_impl( const filter_info_impl& rInfo ) :
 
 // -----------------------------------------------------------------------
 
-int filter_info_impl::operator==( const filter_info_impl& r ) const
+bool filter_info_impl::operator==( const filter_info_impl& r ) const
 {
-    if( maFilterName != r.maFilterName ||
-        maType != r.maType ||
-        maDocumentService != r.maDocumentService ||
-        maFilterService != r.maFilterService ||
-        maInterfaceName != r.maInterfaceName ||
-        maComment != r.maComment ||
-        maExtension != r.maExtension ||
-        maDocType != r.maDocType ||
-        maExportXSLT != r.maExportXSLT ||
-        maImportXSLT != r.maImportXSLT ||
-        maExportService != r.maExportService ||
-        maImportService != r.maImportService ||
-        maImportTemplate != r.maImportTemplate ||
-        maFlags != r.maFlags ||
-        maFileFormatVersion != r.maFileFormatVersion ||
-        mbNeedsXSLT2 != r.mbNeedsXSLT2
-        )
-        return false;
-
-    return true;
+    return maFilterName == r.maFilterName &&
+        maType == r.maType &&
+        maDocumentService == r.maDocumentService &&
+        maFilterService == r.maFilterService &&
+        maInterfaceName == r.maInterfaceName &&
+        maComment == r.maComment &&
+        maExtension == r.maExtension &&
+        maDocType == r.maDocType &&
+        maExportXSLT == r.maExportXSLT &&
+        maImportXSLT == r.maImportXSLT &&
+        maExportService == r.maExportService &&
+        maImportService == r.maImportService &&
+        maImportTemplate == r.maImportTemplate &&
+        maFlags == r.maFlags &&
+        maFileFormatVersion == r.maFileFormatVersion &&
+        mbNeedsXSLT2 == r.mbNeedsXSLT2;
 }
 
 // -----------------------------------------------------------------------