summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-26 16:21:34 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-26 16:25:23 +0100
commit4ab5377b8c982279ca568dbc9c4bb974d2e00dcd (patch)
tree5fd57348c32e874304eab8b9fa3e8d5072aa5d5f
parent38ce0b5ccf5d4398a26304fde19f0bb42dd13b91 (diff)
Push without Pop
regression from commit fb8f83c12e991ad01f049332c022697736d03986 Date: Mon May 11 14:33:01 2015 +0900 refactor TabBar to use RenderContext Change-Id: Ie77d23e164a880cec6ba5f5387070da1ada30760 (cherry picked from commit ca95160830305c507a776c3fc0b13c71dee0dbe7)
-rw-r--r--svtools/source/control/tabbar.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 09c5442c283d..2a827335701e 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()