diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-10-20 20:37:46 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-10-21 12:10:11 +0200 |
| commit | ba99a88511e5b0b5140837fde69dfa139d7aeb7a (patch) | |
| tree | e6b8bd3637c57b2e1432c985dad2b9d87b1c3a9a /vcl | |
| parent | 0a2eb9cfd667c1f3186cdeb9f7375aad81c66c0e (diff) | |
Some cppcheck cleaning
Change-Id: I5c119795077f9fbb84c32bc6ca95533d689998b9
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtksys.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index cc921b87fb4f..5342130911f3 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -118,9 +118,8 @@ SalX11Screen GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen) { gint nMonitor; - GdkScreen *pScreen = NULL; - pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); + GdkScreen *pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) return SalX11Screen (0); #if GTK_CHECK_VERSION(3,0,0) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 4985c43dfa06..5870070c2e89 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -2846,7 +2846,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( GtkShadowType shadowType; gint x, y, w, h; gint g_x=0, g_y=0, g_w=10, g_h=10; - bool bPaintButton = true; GtkWidget* pButtonWidget = gWidgetData[m_nXScreen].gToolbarButtonWidget; GdkRectangle clipRect; @@ -2898,7 +2897,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( // handle button else if( nPart == PART_BUTTON ) { - bPaintButton = (nState & CTRL_STATE_PRESSED) + bool bPaintButton = (nState & CTRL_STATE_PRESSED) || (nState & CTRL_STATE_ROLLOVER); if( aValue.getTristateVal() == BUTTONVALUE_ON ) { |