diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-28 12:14:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-28 12:15:32 +0100 |
| commit | 35fb9ca387e6e977b873698e8f4f1c01d572ae8c (patch) | |
| tree | 1e49fdfa4f75c38811a0a8e1352c9245e227eb5c /vcl | |
| parent | WaE: implicit conversion (IntegralCast) from bool to 'int' (diff) | |
| download | core-35fb9ca387e6e977b873698e8f4f1c01d572ae8c.tar.gz core-35fb9ca387e6e977b873698e8f4f1c01d572ae8c.zip | |
bool clean-up fixup
Change-Id: I0a302d7f91ef07992f95a8ccd48efec862519ab1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 3fac60c1ba75..22f64bd7811a 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -196,7 +196,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, xPal->getNumberOfEntries() == 1L << nOriginalDepth); uno::Sequence<double> aIndex; CPPUNIT_ASSERT_MESSAGE( "Palette is not read-only", - xPal->setIndex(aIndex,true,0) == sal_False); + !xPal->setIndex(aIndex,true,0)); CPPUNIT_ASSERT_MESSAGE( "Palette entry 0 is not opaque", xPal->getIndex(aIndex,0)); CPPUNIT_ASSERT_MESSAGE( "Palette has no valid color space", diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 9f32854b8caf..55c592ab4c36 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1362,8 +1362,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) if( bDecoHandling ) { - // Using true or TRUE below causes a false warning from loplugin with Clang 3.2 - gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? 1 : FALSE ); + gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) != 0 ); if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) ) lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false ); } @@ -3155,7 +3154,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) GdkEventFocus aEvent; aEvent.type = GDK_FOCUS_CHANGE; aEvent.window = widget_get_window( m_pWindow ); - aEvent.send_event = 1; + aEvent.send_event = gint8(TRUE); aEvent.in = gint16(pEvent->xclient.data.l[1] == 1); signalFocus( m_pWindow, &aEvent, this ); } |