From 883481fd200510f5ae62e7ab7cd18f7d925c2c47 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 25 Apr 2014 12:49:17 +0200 Subject: Improve TabBar return types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DeactivatePage() goes from returning long to returning bool. StartRenaming goes from returning long to returning bool. AllowRenaming goes from returning long to returning a constant from a new enum. Change-Id: Ib87e8d7ceb4e23846547257b358ca4dfd41eb6ca Reviewed-on: https://gerrit.libreoffice.org/9161 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svtools/source/control/tabbar.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'svtools') diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index b3727f3820b1..5c118cbe25cf 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1807,32 +1807,32 @@ Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const -long TabBar::DeactivatePage() +bool TabBar::DeactivatePage() { if ( maDeactivatePageHdl.IsSet() ) return maDeactivatePageHdl.Call( this ); else - return sal_True; + return true; } -long TabBar::StartRenaming() +bool TabBar::StartRenaming() { if ( maStartRenamingHdl.IsSet() ) return maStartRenamingHdl.Call( this ); else - return sal_True; + return true; } -long TabBar::AllowRenaming() +TabBarAllowRenamingReturnCode TabBar::AllowRenaming() { if ( maAllowRenamingHdl.IsSet() ) - return maAllowRenamingHdl.Call( this ); + return (TabBarAllowRenamingReturnCode) maAllowRenamingHdl.Call( this ); else - return sal_True; + return TABBAR_RENAMING_YES; } @@ -2407,7 +2407,7 @@ void TabBar::EndEditMode( bool bCancel ) mpEdit->SetPostEvent(); if ( !bCancel ) { - long nAllowRenaming = AllowRenaming(); + TabBarAllowRenamingReturnCode nAllowRenaming = AllowRenaming(); if ( nAllowRenaming == TABBAR_RENAMING_YES ) SetPageText( mnEditId, maEditText ); else if ( nAllowRenaming == TABBAR_RENAMING_NO ) -- cgit