diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-06-17 23:54:00 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-06-27 17:51:56 +0000 |
commit | 1df394503f1e62b091453c95c05a212892ae8d58 (patch) | |
tree | 4767346ce348cc498df09985b6fa431a45f255d3 /chart2 | |
parent | 0c80b4dfd27109def7a5bdc34c3fcc5499db6c0d (diff) |
GSoC notebookbar: switching tabs depending on context
+ sfx2::sidebar::EnumContext moved to the vcl module
+ TabPage contains vector with context values
+ vcl builder reads control's contexts from the "class" mark
+ ContextTabControl shows tabs depending on context
Change-Id: I661b0d3f35d46ace2a2e8eb1d374148f0c60017d
Reviewed-on: https://gerrit.libreoffice.org/26447
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'chart2')
9 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 5085223542aa..974d52d49561 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -121,7 +121,7 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const & m_eDrawMode( CHARTDRAW_SELECT ), mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler( [this]() { return this->GetContextName(); }, - this, sfx2::sidebar::EnumContext::Context_Cell)) + this, vcl::EnumContext::Context_Cell)) { m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) ); } diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index be80a4c88fef..ac0d6f4ae731 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -310,7 +310,7 @@ void ChartAxisPanel::DataChanged( } void ChartAxisPanel::HandleContextChange( - const ::sfx2::sidebar::EnumContext& ) + const vcl::EnumContext& ) { updateData(); } diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index d84f005faad8..6cb9ec7724d5 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -50,7 +50,7 @@ public: const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 1e52f24a399d..5a8625b996c5 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -501,7 +501,7 @@ void ChartElementsPanel::DataChanged( } void ChartElementsPanel::HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if(maContext == rContext) { diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index e336c82aef3b..43565def2afe 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -54,7 +54,7 @@ public: const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; // constructor/destuctor ChartElementsPanel( @@ -98,7 +98,7 @@ private: VclPtr<ListBox> mpLBLegendPosition; VclPtr<VclHBox> mpBoxLegend; - ::sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; css::uno::Reference<css::frame::XModel> mxModel; css::uno::Reference<css::util::XModifyListener> mxListener; diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 401e7cfab122..248b9e74876f 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -374,7 +374,7 @@ void ChartErrorBarPanel::DataChanged( } void ChartErrorBarPanel::HandleContextChange( - const ::sfx2::sidebar::EnumContext& ) + const vcl::EnumContext& ) { updateData(); } diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index 6beb6aec4dff..cff8398444ef 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -48,7 +48,7 @@ public: const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index b2a71cc08f66..7147dda6cb69 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -408,7 +408,7 @@ void ChartSeriesPanel::DataChanged( } void ChartSeriesPanel::HandleContextChange( - const ::sfx2::sidebar::EnumContext& ) + const vcl::EnumContext& ) { updateData(); } diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 72928b787e08..f9465c328555 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -58,7 +58,7 @@ public: const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, |