diff options
Diffstat (limited to 'svx/source/sidebar/paragraph')
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b50c587ab0ed..f5cdf2b26231 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -72,7 +72,7 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create ( } void ParaPropertyPanel::HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if (maContext == rContext) { @@ -146,7 +146,7 @@ void ParaPropertyPanel::HandleContextChange ( break; } - mpTBxOutline->Show( maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_DrawImpress ); + mpTBxOutline->Show( maContext.GetApplication_DI() == vcl::EnumContext::Application_DrawImpress ); } void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 50fde91799cf..4b204749efd3 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -56,7 +56,7 @@ public: SfxBindings* GetBindings() { return mpBindings;} virtual void HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -107,7 +107,7 @@ private: ::sfx2::sidebar::ControllerItem maIncIndentControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; - ::sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index 7822db158fa7..e4dc5d0c897f 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -137,9 +137,9 @@ void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::Cont if(pWindow) { - ::sfx2::sidebar::EnumContext eContext = ::sfx2::sidebar::EnumContext( - ::sfx2::sidebar::EnumContext::GetApplicationEnum(rEvent.ApplicationName), - ::sfx2::sidebar::EnumContext::GetContextEnum(rEvent.ContextName)); + vcl::EnumContext eContext = vcl::EnumContext( + vcl::EnumContext::GetApplicationEnum(rEvent.ApplicationName), + vcl::EnumContext::GetContextEnum(rEvent.ContextName)); pWindow->SetContext(eContext); } } diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 93a2099c92c2..e5d81ed0c97d 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -135,7 +135,7 @@ void ParaLRSpacingWindow::dispose() VclVBox::dispose(); } -void ParaLRSpacingWindow::SetContext(const ::sfx2::sidebar::EnumContext& eContext) +void ParaLRSpacingWindow::SetContext(const vcl::EnumContext& eContext) { m_aContext = eContext; } 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); }; |