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 /include/svx/sidebar | |
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 'include/svx/sidebar')
-rw-r--r-- | include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 6 | ||||
-rw-r--r-- | include/svx/sidebar/SelectionAnalyzer.hxx | 10 | ||||
-rw-r--r-- | include/svx/sidebar/SelectionChangeHandler.hxx | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index d5cb3916f84f..9b94e9067faa 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_SIDEBAR_CONTEXTCHANGEEVENTMULTIPLEXER_HXX #include <svx/svxdllapi.h> -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -41,7 +41,7 @@ public: */ static void NotifyContextChange ( const css::uno::Reference<css::frame::XController>& rxController, - const ::sfx2::sidebar::EnumContext::Context eContext); + const vcl::EnumContext::Context eContext); /** Notify the activation of a context. @param pViewShell @@ -53,7 +53,7 @@ public: */ static void NotifyContextChange ( SfxViewShell* pViewShell, - const ::sfx2::sidebar::EnumContext::Context eContext); + const vcl::EnumContext::Context eContext); private: static ::rtl::OUString GetModuleName ( diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx index 62c411624f2e..e80f5db6c0be 100644 --- a/include/svx/sidebar/SelectionAnalyzer.hxx +++ b/include/svx/sidebar/SelectionAnalyzer.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_SIDEBAR_SELECTIONANALYZER_HXX #define INCLUDED_SVX_SIDEBAR_SELECTIONANALYZER_HXX -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <svx/svxdllapi.h> class SdrMarkList; @@ -36,7 +36,7 @@ namespace svx { namespace sidebar { class SVX_DLLPUBLIC SelectionAnalyzer { public: - static sfx2::sidebar::EnumContext::Context GetContextForSelection_SC ( + static vcl::EnumContext::Context GetContextForSelection_SC ( const SdrMarkList& rMarkList); enum ViewType @@ -47,14 +47,14 @@ public: VT_Notes, VT_Outline }; - static sfx2::sidebar::EnumContext::Context GetContextForSelection_SD ( + static vcl::EnumContext::Context GetContextForSelection_SD ( const SdrMarkList& rMarkList, const ViewType eViewType); private: - static sfx2::sidebar::EnumContext::Context GetContextForObjectId_SC ( + static vcl::EnumContext::Context GetContextForObjectId_SC ( const sal_uInt16 nObjectId); - static sfx2::sidebar::EnumContext::Context GetContextForObjectId_SD ( + static vcl::EnumContext::Context GetContextForObjectId_SD ( const sal_uInt16 nObjectId, const ViewType eViewType); static sal_uInt32 GetInventorTypeFromMark ( diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 841ab32b546f..38d72ab2cca4 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_SIDEBAR_SELECTIONCHANGEHANDLER_HXX #include <svx/svxdllapi.h> -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> @@ -50,7 +50,7 @@ public: SelectionChangeHandler ( const std::function<rtl::OUString ()>& rSelectionChangeCallback, const css::uno::Reference<css::frame::XController>& rxController, - const sfx2::sidebar::EnumContext::Context eDefaultContext); + const vcl::EnumContext::Context eDefaultContext); virtual ~SelectionChangeHandler(); virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) @@ -71,7 +71,7 @@ private: const std::function<rtl::OUString ()> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; - const sfx2::sidebar::EnumContext::Context meDefaultContext; + const vcl::EnumContext::Context meDefaultContext; bool mbIsConnected; }; |