sfx2/source/sidebar/TabBar.cxx | 8 ++++++++ sfx2/source/sidebar/TabBar.hxx | 1 + 2 files changed, 9 insertions(+)
New commits: commit df70b1d1796a35afd30810f3f670f8f2bf32ba98 Author: Andre Fischer <[email protected]> Date: Wed May 8 12:01:43 2013 +0000 Related: #i122251# Avoid compiler warning (cherry picked from commit 4a84ca3c6515bddb02a789d9386b6c6e74b037dc) Change-Id: I24bac356682aff5905010485eac833037f585764 diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 5f8c4f5..11f8e2e 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -254,7 +254,7 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) -long TabBar::Notify (NotifyEvent& rEvent) +long TabBar::Notify (NotifyEvent&) { return sal_False; } commit c06569bd310804ae09b411adc6d279fc665d3a96 Author: Andre Fischer <[email protected]> Date: Wed May 8 11:57:24 2013 +0000 Resolves: #i122251# Prevent key events from being forwarded... from sidebar tab bar to Calc (cherry picked from commit 2abab958f237c62abbd59b46b36354db60f23009) Change-Id: Ie47d086699986b64cbdc15df649adea705351307 diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index bde7039..5f8c4f5 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -254,6 +254,14 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) +long TabBar::Notify (NotifyEvent& rEvent) +{ + return sal_False; +} + + + + RadioButton* TabBar::CreateTabItem (const DeckDescriptor& rDeckDescriptor) { RadioButton* pItem = ControlFactory::CreateTabItem(this); diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index 2f158cb..a9479cb 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -66,6 +66,7 @@ public: virtual void Paint (const Rectangle& rUpdateArea); virtual void DataChanged (const DataChangedEvent& rDataChangedEvent); + virtual long Notify (NotifyEvent& rEvent); static sal_Int32 GetDefaultWidth (void); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
