summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-25 15:39:59 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-04-28 12:01:04 +0000
commit2554d0ab4e293c2e68477c1b390367c15353234e (patch)
treebb4c25068a8c0323749f7a9fe2c2e0c8ea5fb7d3
parent883481fd200510f5ae62e7ab7cd18f7d925c2c47 (diff)
remove unused code from TabBar
Change-Id: I9f975d99893135b414c749c4fe86912362375c4e Reviewed-on: https://gerrit.libreoffice.org/9162 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/svtools/tabbar.hxx21
-rw-r--r--svtools/source/control/tabbar.cxx18
2 files changed, 3 insertions, 36 deletions
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 4ca74cee1c7d..20e644b7e5e4 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -372,13 +372,7 @@ private:
bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end.
bool mbScrollAlwaysEnabled;
Link maSelectHdl;
- Link maDoubleClickHdl;
Link maSplitHdl;
- Link maActivatePageHdl;
- Link maDeactivatePageHdl;
- Link maStartRenamingHdl;
- Link maAllowRenamingHdl;
- Link maEndRenamingHdl;
Link maScrollAreaContextHdl;
size_t maCurrentItemList;
@@ -537,23 +531,8 @@ public:
Size CalcWindowSizePixel() const;
void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
- const Link& GetSplitHdl() const { return maSplitHdl; }
- void SetActivatePageHdl( const Link& rLink ) { maActivatePageHdl = rLink; }
- const Link& GetActivatePageHdl() const { return maActivatePageHdl; }
- void SetDeactivatePageHdl( const Link& rLink ) { maDeactivatePageHdl = rLink; }
- const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl; }
- void SetStartRenamingHdl( const Link& rLink ) { maStartRenamingHdl = rLink; }
- const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; }
- void SetAllowRenamingHdl( const Link& rLink ) { maAllowRenamingHdl = rLink; }
- const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; }
- void SetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl = rLink; }
- const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; }
void SetScrollAreaContextHdl( const Link& rLink ) { maScrollAreaContextHdl = rLink; }
- const Link& GetScrollAreaContextHdl() const { return maScrollAreaContextHdl; }
// accessibility
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 5c118cbe25cf..2b1f0ede4784 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1692,7 +1692,6 @@ void TabBar::Select()
void TabBar::DoubleClick()
{
- maDoubleClickHdl.Call( this );
}
@@ -1715,7 +1714,6 @@ void TabBar::ImplActivatePage()
void TabBar::ActivatePage()
{
- maActivatePageHdl.Call( this );
}
@@ -1809,37 +1807,27 @@ Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const
bool TabBar::DeactivatePage()
{
- if ( maDeactivatePageHdl.IsSet() )
- return maDeactivatePageHdl.Call( this );
- else
- return true;
+ return true;
}
bool TabBar::StartRenaming()
{
- if ( maStartRenamingHdl.IsSet() )
- return maStartRenamingHdl.Call( this );
- else
- return true;
+ return true;
}
TabBarAllowRenamingReturnCode TabBar::AllowRenaming()
{
- if ( maAllowRenamingHdl.IsSet() )
- return (TabBarAllowRenamingReturnCode) maAllowRenamingHdl.Call( this );
- else
- return TABBAR_RENAMING_YES;
+ return TABBAR_RENAMING_YES;
}
void TabBar::EndRenaming()
{
- maEndRenamingHdl.Call( this );
}