[Libreoffice-commits] core.git: fpicker/source

[Stephan Bergmann]

 fpicker/source/aqua/ControlHelper.hxx    |    4 ++--
 fpicker/source/aqua/ControlHelper.mm     |   12 ++++++------
 fpicker/source/aqua/FilterHelper.mm      |    2 +-
 fpicker/source/aqua/SalAquaFilePicker.mm |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 15648cb92290fb321c46efff66e5daa64b153e6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 28 20:46:04 2015 +0200

    loplugin:simplifybool
    
    Change-Id: Ia83a01c8c134729b5ccf978e7cd46e8e694958a0

diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index 1e2a774..eae0c02 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -89,7 +89,7 @@ public:
     // inline functions
 
     inline NSView* getUserPane() {
-        if (m_bIsUserPaneLaidOut == false) {
+        if (!m_bIsUserPaneLaidOut) {
             createUserPane();
         }
         return m_pUserPane;
@@ -101,7 +101,7 @@ public:
 
     inline void    setFilterControlNeeded(bool bNeeded) {
         m_bIsFilterControlNeeded = bNeeded;
-        if (bNeeded == true) {
+        if (bNeeded) {
             m_bUserPaneNeeded = true;
         }
     }
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index 5e76fb4..80e706f 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -313,7 +313,7 @@ void ControlHelper::createUserPane()
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    if (m_bUserPaneNeeded == false) {
+    if (!m_bUserPaneNeeded) {
         SAL_INFO("fpicker.aqua","no user pane needed");
         DBG_PRINT_EXIT(CLASS_NAME, __func__);
         return;
@@ -325,7 +325,7 @@ void ControlHelper::createUserPane()
         return;
     }
 
-    if (m_bIsFilterControlNeeded == true && m_pFilterControl == nil) {
+    if (m_bIsFilterControlNeeded && m_pFilterControl == nil) {
         createFilterControl();
     }
 
@@ -478,7 +478,7 @@ void ControlHelper::createControls()
 
     CResourceProvider aResProvider;
     for (int i = 0; i < LIST_LAST; i++) {
-        if (true == m_bListVisibility[i]) {
+        if (m_bListVisibility[i]) {
             m_bUserPaneNeeded = true;
 
             int elementName = getControlElementName([NSPopUpButton class], i);
@@ -504,7 +504,7 @@ void ControlHelper::createControls()
     }
 
     for (int i = 0/*#i102102*/; i < TOGGLE_LAST; i++) {
-        if (true == m_bToggleVisibility[i]) {
+        if (m_bToggleVisibility[i]) {
             m_bUserPaneNeeded = true;
 
             int elementName = getControlElementName([NSButton class], i);
@@ -802,7 +802,7 @@ void ControlHelper::layoutControls()
         return;
     }
 
-    if (m_bIsUserPaneLaidOut == true) {
+    if (m_bIsUserPaneLaidOut) {
         SAL_INFO("fpicker.aqua","user pane already laid out");
         DBG_PRINT_EXIT(CLASS_NAME, __func__);
         return;
@@ -993,7 +993,7 @@ void ControlHelper::updateFilterUI()
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    if (m_bIsFilterControlNeeded == false || m_pFilterHelper == NULL) {
+    if (!m_bIsFilterControlNeeded || m_pFilterHelper == NULL) {
         SAL_INFO("fpicker.aqua","no filter control needed or no filter helper present");
         DBG_PRINT_EXIT(CLASS_NAME, __func__);
         return;
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index cef9074..69d8f9c 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -261,7 +261,7 @@ void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
 
     SolarMutexGuard aGuard;
 
-    if(m_aCurrentFilter.equals(rFilter) == false)
+    if(!m_aCurrentFilter.equals(rFilter))
     {
         m_aCurrentFilter = rFilter;
     }
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 9c36c5b..a760f84 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -755,7 +755,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
 
     SolarMutexGuard aGuard;
 
-    if (m_pControlHelper->isAutoExtensionEnabled() == false) {
+    if (!m_pControlHelper->isAutoExtensionEnabled()) {
         OSL_TRACE("allowing other file types");
         [m_pDialog setAllowedFileTypes:nil];
         [m_pDialog setAllowsOtherFileTypes:YES];