diff options
Diffstat (limited to 'include/svx/sidebar')
-rw-r--r-- | include/svx/sidebar/AreaPropertyPanelBase.hxx | 9 | ||||
-rw-r--r-- | include/svx/sidebar/InspectorTextPanel.hxx | 7 | ||||
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index a3103b6c04c2..434a6397d4e2 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -51,11 +51,6 @@ class SVX_DLLPUBLIC AreaPropertyPanelBase { public: - virtual void dispose() override; - - virtual void DataChanged( - const DataChangedEvent& rEvent) override; - virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, @@ -78,7 +73,7 @@ public: // constructor/destructor AreaPropertyPanelBase( - vcl::Window* pParent, + weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~AreaPropertyPanelBase() override; @@ -148,8 +143,6 @@ protected: OUString maImgSquare; OUString maImgLinear; - VclPtr<sfx2::sidebar::Panel> mpPanel; - std::unique_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem; std::unique_ptr< SfxUInt16Item > mpTransparanceItem; diff --git a/include/svx/sidebar/InspectorTextPanel.hxx b/include/svx/sidebar/InspectorTextPanel.hxx index 10ddf932fe06..ce4eecf8ad64 100644 --- a/include/svx/sidebar/InspectorTextPanel.hxx +++ b/include/svx/sidebar/InspectorTextPanel.hxx @@ -45,13 +45,10 @@ class SVX_DLLPUBLIC InspectorTextPanel : public PanelLayout { public: virtual ~InspectorTextPanel() override; - virtual void dispose() override; - static VclPtr<vcl::Window> Create(vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + static std::unique_ptr<PanelLayout> Create(weld::Widget* pParent); - InspectorTextPanel(vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + InspectorTextPanel(weld::Widget* pParent); void updateEntries(const std::vector<TreeNode>& rStore); diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 52411be57d2c..34668f486061 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -25,6 +25,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <svx/sidebar/LineWidthPopup.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/frame/XFrame.hpp> class ToolbarUnoDispatcher; class XLineStyleItem; @@ -46,7 +47,6 @@ class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout { public: virtual ~LinePropertyPanelBase() override; - virtual void dispose() override; void SetWidth(tools::Long nWidth); void SetWidthIcon(int n); @@ -55,7 +55,7 @@ public: void EndLineWidthPopup(); // constructor/destructor - LinePropertyPanelBase(vcl::Window* pParent, + LinePropertyPanelBase(weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void setLineWidth(const XLineWidthItem& rItem) = 0; |