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

[Caolán McNamara]

 svtools/source/control/tabbar.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ca95160830305c507a776c3fc0b13c71dee0dbe7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 26 16:21:34 2015 +0100

    Push without Pop
    
    regression from
    
    commit fb8f83c12e991ad01f049332c022697736d03986
    Date:   Mon May 11 14:33:01 2015 +0900
    
        refactor TabBar to use RenderContext
    
    Change-Id: Ie77d23e164a880cec6ba5f5387070da1ada30760

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index fb736eb..d84695a 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1285,7 +1285,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect)
                 rRenderContext.SetLineColor();
                 rRenderContext.SetFillColor(aSelectColor);
                 aDrawer.drawOverTopBorder();
-                return;
+                break;
             }
 
             pItem = prev();
@@ -1293,7 +1293,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect)
         else
         {
             if (bCurrent)
-                return;
+                break;
 
             pItem = NULL;
         }
@@ -1301,6 +1301,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect)
         if (!pItem)
             pItem = pCurItem;
     }
+    rRenderContext.Pop();
 }
 
 void TabBar::Resize()