From 4f9b21248ffdf55cef9f3f9d1da76778ee000775 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 May 2014 15:42:25 +0200
Subject: simplify ternary conditions "xxx ? yyy : false"

Look for code like:
   xxx ? yyy : false;
Which can be simplified to:
   xxx && yyy

Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
---
 vcl/generic/print/common_gfx.cxx | 6 +++---
 vcl/generic/print/genprnpsp.cxx  | 2 +-
 vcl/generic/print/printerjob.cxx | 4 ++--
 vcl/generic/print/text_gfx.cxx   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'vcl/generic')

diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 71708590597b..1463492d8ac8 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -64,7 +64,7 @@ PrinterGfx::Init (PrinterJob &rPrinterJob)
     mnDpi = rPrinterJob.GetResolution();
     rPrinterJob.GetScale (mfScaleX, mfScaleY);
     const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
-    mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false;
+    mbUploadPS42Fonts = rInfo.m_pParser && rInfo.m_pParser->isType42Capable();
 
     return true;
 }
@@ -76,13 +76,13 @@ PrinterGfx::Init (const JobData& rData)
     mpPageBody      = NULL;
     mnDepth         = rData.m_nColorDepth;
     mnPSLevel       = rData.m_nPSLevel ? rData.m_nPSLevel : (rData.m_pParser ? rData.m_pParser->getLanguageLevel() : 2 );
-    mbColor         = rData.m_nColorDevice ? ( rData.m_nColorDevice == -1 ? false : true ) : (( rData.m_pParser ?  (rData.m_pParser->isColorDevice() ? true : false ) : true ) );
+    mbColor         = rData.m_nColorDevice ? ( rData.m_nColorDevice != -1 ) : ( rData.m_pParser ? rData.m_pParser->isColorDevice() : true );
     int nRes = rData.m_aContext.getRenderResolution();
     mnDpi           = nRes;
     mfScaleX        = (double)72.0 / (double)mnDpi;
     mfScaleY        = (double)72.0 / (double)mnDpi;
     const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) );
-    mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false;
+    mbUploadPS42Fonts = rInfo.m_pParser && rInfo.m_pParser->isType42Capable();
 
     return true;
 }
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index fc85e21e1afc..e80ec57b6b6c 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -970,7 +970,7 @@ bool PspSalPrinter::EndPage()
     bool bResult = m_aPrintJob.EndPage();
     m_aPrinterGfx.Clear();
     OSL_TRACE("PspSalPrinter::EndPage");
-    return bResult ? true : false;
+    return bResult;
 }
 
 sal_uLong PspSalPrinter::GetErrorCode()
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index dc3b84675665..19b19e86ab93 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -155,9 +155,9 @@ PrinterJob::IsColorPrinter () const
     bool bColor = false;
 
     if( m_aLastJobData.m_nColorDevice )
-        bColor = m_aLastJobData.m_nColorDevice == -1 ? false : true;
+        bColor = m_aLastJobData.m_nColorDevice != -1;
     else if( m_aLastJobData.m_pParser )
-        bColor = m_aLastJobData.m_pParser->isColorDevice() ? true : false;
+        bColor = m_aLastJobData.m_pParser->isColorDevice();
 
     return bColor;
 }
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 40a7dad60558..2513843d49e4 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -66,8 +66,8 @@ Font2::Font2(const PrinterGfx &rGfx)
     mpFont[1] = rGfx.getFallbackID();
 
     PrintFontManager &rMgr = PrintFontManager::get();
-    mbSymbol = mpFont[0] != -1 ?
-                rMgr.getFontEncoding(mpFont[0]) == RTL_TEXTENCODING_SYMBOL : false;
+    mbSymbol = mpFont[0] != -1 &&
+                rMgr.getFontEncoding(mpFont[0]) == RTL_TEXTENCODING_SYMBOL;
 }
 
 } // namespace psp
@@ -714,7 +714,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFon
     {
         if (aIter->GetFontType() == fonttype::TrueType)
         {
-            aIter->PSUploadFont (*pFile, *this, mbUploadPS42Fonts ? true : false, rSuppliedFonts );
+            aIter->PSUploadFont (*pFile, *this, mbUploadPS42Fonts, rSuppliedFonts );
         }
         else
         {
-- 
cgit