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

Caolán McNamara caolanm at redhat.com
Tue Apr 28 12:36:58 PDT 2015


 vcl/source/control/tabctrl.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f016ed2e4f7b8bec79fcaf8e4b566861a7b6ae76
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 28 20:36:27 2015 +0100

    bNativeOK variable is not necessary
    
    Change-Id: I7e8d56bd3737f228a3a3b76f87023be16effb0ca

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index f9df33f..7ab6b2a 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1095,8 +1095,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
         aRect.Right()+=10;
     }
 
-    bool bNativeOK = false;
-    if( ! bLayout && (bNativeOK = IsNativeControlSupported( CTRL_TAB_PANE, PART_ENTIRE_CONTROL) ) )
+    if (!bLayout && IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL))
     {
         const ImplControlValue aControlValue;
 
@@ -1112,8 +1111,10 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
             aClipRgn.Intersect( rRect );
 
         if( !aClipRgn.IsEmpty() )
-            bNativeOK = DrawNativeControl( CTRL_TAB_PANE, PART_ENTIRE_CONTROL, aRect, nState,
-                aControlValue, OUString() );
+        {
+            DrawNativeControl(CTRL_TAB_PANE, PART_ENTIRE_CONTROL, aRect, nState,
+                aControlValue, OUString());
+        }
     }
     else
     {


More information about the Libreoffice-commits mailing list