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 /svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | |
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 'svx/source/sidebar/paragraph/ParaSpacingWindow.hxx')
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 4a01ae8ed372..61ccfca53445 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -24,10 +24,10 @@ #include <editeng/lrspitem.hxx> #include <vcl/builder.hxx> #include <vcl/layout.hxx> +#include <vcl/EnumContext.hxx> #include <svx/relfld.hxx> #include <svtools/unitconv.hxx> #include <sfx2/sidebar/ControllerItem.hxx> -#include <sfx2/sidebar/EnumContext.hxx> using namespace com::sun::star; @@ -64,7 +64,7 @@ public: void SetValue(SfxItemState eState, const SfxPoolItem* pState); void SetUnit(FieldUnit eUnit); - void SetContext(const ::sfx2::sidebar::EnumContext& eContext); + void SetContext(const vcl::EnumContext& eContext); private: VclPtr<SvxRelativeField> m_pBeforeSpacing; @@ -73,7 +73,7 @@ private: SfxMapUnit m_eUnit; - ::sfx2::sidebar::EnumContext m_aContext; + vcl::EnumContext m_aContext; DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); }; |