diff options
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r-- | svx/source/sidebar/PanelFactory.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaTransparencyGradientControl.hxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/styles/StylesPropertyPanel.cxx | 19 | ||||
-rw-r--r-- | svx/source/sidebar/styles/StylesPropertyPanel.hxx | 17 |
6 files changed, 7 insertions, 34 deletions
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index a1c479855d52..eaadd63ba0a7 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -148,7 +148,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } else if (rsResourceURL.endsWith("/StylesPropertyPanel")) { - pControl = StylesPropertyPanel::Create(pParentWindow, xFrame, pBindings); + pControl = StylesPropertyPanel::Create(pParentWindow, xFrame); } else if (rsResourceURL.endsWith("/ParaPropertyPanel")) { diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index b408123c8e91..7701b79c9639 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -47,7 +47,6 @@ public: void Rearrange(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem* pGradientItem); void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol ); - void SetControlState_Impl(css::awt::GradientStyle eXGS); private: VclPtr<FixedText> maFtTrgrCenterX; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 749070b91c66..87064e08febf 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -96,7 +96,6 @@ private: DECL_LINK( ModifyContrastHdl, void * ); DECL_LINK( ModifyTransHdl, void * ); DECL_LINK( ClickColorModeHdl, void * ); - DECL_LINK( ImplPopupModeEndHdl, FloatingWindow* ); DECL_LINK( RedHdl, void*); DECL_LINK( GreenHdl, void*); DECL_LINK( BlueHdl, void*); diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 9e39384031eb..ae6036c72fcb 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -152,7 +152,6 @@ private: void SelectEndStyle(bool bStart); void SelectLineStyle(); - DECL_LINK(ImplWidthPopupModeEndHdl, FloatingWindow* ); DECL_LINK(ChangeLineStyleHdl, void*); DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); DECL_LINK(ChangeTransparentHdl , void *); diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 12190cab81f4..9e310a9ad1c5 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -8,22 +8,18 @@ namespace svx { namespace sidebar { VclPtr<vcl::Window> StylesPropertyPanel::Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings) + const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (pParent == NULL) throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", NULL, 0); if ( ! rxFrame.is()) throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to StylesPropertyPanel::Create", NULL, 2); - return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame,pBindings); + return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame); } -StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings ) - : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame), - mpBindings(pBindings) +StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame ) + : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame) { } @@ -43,13 +39,6 @@ void StylesPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) } -void StylesPropertyPanel::NotifyItemUpdate ( - const sal_uInt16 /*nSId*/, - const SfxItemState /*eState*/, - const SfxPoolItem* /*pState*/, - const bool /*bIsEnabled*/) -{ -} }} diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 73bc30c8b22c..7408bdf888a0 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -25,26 +25,13 @@ public: static VclPtr<vcl::Window> Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void DataChanged( const DataChangedEvent& rEvent ) SAL_OVERRIDE; - virtual void NotifyItemUpdate( - const sal_uInt16 nSId, - const SfxItemState eState, - const SfxPoolItem* pState, - const bool bIsEnabled); //SAL_OVERRIDE; - StylesPropertyPanel( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); - SfxBindings* GetBindings() { return mpBindings; } - -private: - SfxBindings* mpBindings; - //more controls will be added later + const css::uno::Reference<css::frame::XFrame>& rxFrame); }; } } //end of namespace svx::sidebar |