Kaydet (Commit) ba99a885 authored tarafından Julien Nabet's avatar Julien Nabet

Some cppcheck cleaning

Change-Id: I5c119795077f9fbb84c32bc6ca95533d689998b9
üst 0a2eb9cf
...@@ -118,9 +118,8 @@ SalX11Screen ...@@ -118,9 +118,8 @@ SalX11Screen
GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen) GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen)
{ {
gint nMonitor; gint nMonitor;
GdkScreen *pScreen = NULL;
pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); GdkScreen *pScreen = getScreenMonitorFromIdx (nScreen, nMonitor);
if (!pScreen) if (!pScreen)
return SalX11Screen (0); return SalX11Screen (0);
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
......
...@@ -2846,7 +2846,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( ...@@ -2846,7 +2846,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
GtkShadowType shadowType; GtkShadowType shadowType;
gint x, y, w, h; gint x, y, w, h;
gint g_x=0, g_y=0, g_w=10, g_h=10; gint g_x=0, g_y=0, g_w=10, g_h=10;
bool bPaintButton = true;
GtkWidget* pButtonWidget = gWidgetData[m_nXScreen].gToolbarButtonWidget; GtkWidget* pButtonWidget = gWidgetData[m_nXScreen].gToolbarButtonWidget;
GdkRectangle clipRect; GdkRectangle clipRect;
...@@ -2898,7 +2897,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( ...@@ -2898,7 +2897,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
// handle button // handle button
else if( nPart == PART_BUTTON ) else if( nPart == PART_BUTTON )
{ {
bPaintButton = (nState & CTRL_STATE_PRESSED) bool bPaintButton = (nState & CTRL_STATE_PRESSED)
|| (nState & CTRL_STATE_ROLLOVER); || (nState & CTRL_STATE_ROLLOVER);
if( aValue.getTristateVal() == BUTTONVALUE_ON ) if( aValue.getTristateVal() == BUTTONVALUE_ON )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment