summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-02 15:42:25 +0200
committerNoel Grandin <noel@peralex.com>2014-05-05 12:47:48 +0200
commit4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch)
treeb059d288339a68aa4c3901f1100e99b04d05a23d /vcl/unx
parentb4107411900f5bb4c215e2d9db09fc2b2b82939b (diff)
simplify ternary conditions "xxx ? yyy : false"
Look for code like: xxx ? yyy : false; Which can be simplified to: xxx && yyy Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx7
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx6
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx4
6 files changed, 10 insertions, 13 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index a476957b45ef..0d7889b51bb4 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -4023,7 +4023,7 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro
sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception)
{
- return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false;
+ return m_xRealDragSource.is() && m_xRealDragSource->isDragImageSupported();
}
sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception)
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index bbc2b369fcbe..d99c406df8a8 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -113,7 +113,7 @@ X11SalGraphics::X11SalGraphics()
#if ENABLE_GRAPHITE
// check if graphite fonts have been disabled
static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" );
- bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : false;
+ bDisableGraphite_ = pDisableGraphiteStr && (pDisableGraphiteStr[0]!='0');
#endif
pBrushGC_ = NULL;
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 56aa036c8266..cd0d0b5c0aeb 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -156,7 +156,7 @@ bool X11SalVirtualDevice::Init( SalDisplay *pDisplay,
pGraphics_->Init( this, pColormap, bDeleteColormap );
- return hDrawable_ != None ? true : false;
+ return hDrawable_ != None;
}
X11SalVirtualDevice::X11SalVirtualDevice() :
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index d51577dd029a..3a818d242a50 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -821,10 +821,7 @@ const PPDKey* PPDParser::getKey( const OUString& rKey ) const
bool PPDParser::hasKey( const PPDKey* pKey ) const
{
- return
- pKey ?
- ( m_aKeys.find( pKey->getKey() ) != m_aKeys.end() ? true : false ) :
- false;
+ return pKey && ( m_aKeys.find( pKey->getKey() ) != m_aKeys.end() );
}
static sal_uInt8 getNibble( sal_Char cChar )
@@ -1676,7 +1673,7 @@ bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable )
if( ! pResetValue && bDefaultable )
pResetValue = pKey->getDefaultValue();
- bool bRet = pResetValue ? ( setValue( pKey, pResetValue ) == pResetValue ? true : false ) : false;
+ bool bRet = pResetValue && ( setValue( pKey, pResetValue ) == pResetValue );
return bRet;
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 558eba0b63e6..30dd88c7569c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -507,12 +507,12 @@ namespace {
*this
);
- return bMatch ? true : false;
+ return bMatch;
}
bool operator () ( const UnoFilterEntry& _rEntry )
{
OUString aShrunkName = shrinkFilterName( _rEntry.First );
- return aShrunkName == rTitle ? true : false;
+ return aShrunkName == rTitle;
}
};
}
@@ -1217,7 +1217,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr
//actually select something from the list.
gint nItems = gtk_tree_model_iter_n_children(
gtk_combo_box_get_model(pWidget), NULL);
- gtk_widget_set_sensitive(GTK_WIDGET(pWidget), nItems > 1 ? true : false);
+ gtk_widget_set_sensitive(GTK_WIDGET(pWidget), nItems > 1);
}
uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) const
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index b5967e0c31dc..5f4fa94131fd 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2932,7 +2932,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11Screen nXScreen )
{
- bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
+ bool bWasVisible = m_pWindow && IS_WIDGET_MAPPED(m_pWindow);
if( bWasVisible )
Show( false );
@@ -3035,7 +3035,7 @@ bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
{
#if !GTK_CHECK_VERSION(3,0,0)
GetGenericData()->ErrorTrapPush(); // permanantly ignore unruly children's errors
- createNewWindow( pSysParent->aWindow, (pSysParent->nSize > sizeof(long)) ? pSysParent->bXEmbedSupport : false, m_nXScreen );
+ createNewWindow( pSysParent->aWindow, (pSysParent->nSize > sizeof(long)) && pSysParent->bXEmbedSupport, m_nXScreen );
return true;
#else
(void)pSysParent;