diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-01-21 13:22:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-21 15:36:30 +0100 |
commit | af71531ea292c62f785f8300205eddea8c2d33d2 (patch) | |
tree | 540517eacbe212591f2747cb5e5aecafad7cf83c /include | |
parent | 1f846a5a51f0f613087fa68fb364c11912ac2c0f (diff) |
Resolves: tdf#130035 reuse toolbar for arrow styles in sidebar
Change-Id: I8fdbf97a2e3f535767f0163a87c99ead8a3198cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87139
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index c91c2dd136b6..1a68126513cc 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -77,19 +77,15 @@ protected: virtual void setLineJoint(const XLineJointItem* pItem) = 0; virtual void setLineCap(const XLineCapItem* pItem) = 0; - void updateLineStyle(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); void updateLineDash(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); void updateLineTransparence(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); void updateLineWidth(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); - void updateLineStart(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); - void updateLineEnd(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); void updateLineJoint(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); void updateLineCap(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem); - void FillLineEndList(); void FillLineStyleList(); - void SelectEndStyle(bool bStart); + void SelectLineStyle(); void ActivateControls(); @@ -110,8 +106,8 @@ private: std::unique_ptr<SvxLineLB> mxLBStyle; std::unique_ptr<weld::Label> mxFTTransparency; std::unique_ptr<weld::MetricSpinButton> mxMFTransparent; - std::unique_ptr<SvxLineEndLB> mxLBStart; - std::unique_ptr<SvxLineEndLB> mxLBEnd; + std::unique_ptr<weld::Toolbar> mxArrowsTB; + std::unique_ptr<ToolbarUnoDispatcher> mxArrowsDispatch; std::unique_ptr<weld::Label> mxFTEdgeStyle; std::unique_ptr<weld::ComboBox> mxLBEdgeStyle; std::unique_ptr<weld::Label> mxFTCapStyle; @@ -127,10 +123,7 @@ private: sal_uInt16 mnTrans; MapUnit meMapUnit; sal_Int32 mnWidthCoreValue; - XLineEndListRef mxLineEndList; XDashListRef mxLineStyleList; - std::unique_ptr<XLineStartItem> mpStartItem; - std::unique_ptr<XLineEndItem> mpEndItem; // images from resource OUString maIMGNone; |