[Libreoffice-commits] core.git: vcl/unx

[Tor Lillqvist]

 vcl/unx/gtk/window/gtksalframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eb1bfe680ae2d0202dde67b762ed48f7192e63e4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:19:19 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'int'
    
    Hack to avoid false positive from loplugin.
    
    Change-Id: I2b25f06299e40ea0cb155a6b748f38e1cb1ffc0d

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 547f543..7f7aeb5 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1362,7 +1362,8 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
 
     if( bDecoHandling )
     {
-        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? true : FALSE );
+        // 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 );
         if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) )
             lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false );
     }