diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-25 12:49:17 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-28 11:37:37 +0000 |
commit | 883481fd200510f5ae62e7ab7cd18f7d925c2c47 (patch) | |
tree | e33af672348ab9a9719f1b49184edfbb46f21f03 /include | |
parent | remove some dodgy defines from the ICGM filter (diff) | |
download | core-883481fd200510f5ae62e7ab7cd18f7d925c2c47.tar.gz core-883481fd200510f5ae62e7ab7cd18f7d925c2c47.zip |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/tabbar.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 0c7751a404fe..4ca74cee1c7d 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -313,12 +313,13 @@ typedef sal_uInt16 TabBarPageBits; #define TPB_SPECIAL ((TabBarPageBits)0x0001) -// - TabBar-Types - +// - TabBar-Types - used in TabBar::AllowRenaming - -#define TABBAR_RENAMING_YES ((long)sal_True) -#define TABBAR_RENAMING_NO ((long)sal_False) -#define TABBAR_RENAMING_CANCEL ((long)2) +enum TabBarAllowRenamingReturnCode { + TABBAR_RENAMING_NO, + TABBAR_RENAMING_YES, + TABBAR_RENAMING_CANCEL +}; // - TabBar - @@ -425,9 +426,9 @@ public: virtual void DoubleClick(); virtual void Split(); virtual void ActivatePage(); - virtual long DeactivatePage(); - virtual long StartRenaming(); - virtual long AllowRenaming(); + virtual bool DeactivatePage(); + virtual bool StartRenaming(); + virtual TabBarAllowRenamingReturnCode AllowRenaming(); virtual void EndRenaming(); virtual void Mirror(); |