Improve TabBar return types

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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 8 insertions, 8 deletions

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 )