diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-12 23:50:20 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-12 23:54:14 +0200 |
commit | af77042f62bc18c278c1acf6548b3ed41f0da871 (patch) | |
tree | 7aa6730ab77075ae837b95c8ba252e98613dd8ad | |
parent | 01cc898aac11b608c3565a9c22970f10e4b63438 (diff) |
disable arrow heads in chart sidebar, tdf#94971
Change-Id: I631f34faf2befeb7cc61027c8fd59ef7b3543785
-rw-r--r-- | chart2/source/controller/sidebar/ChartLinePanel.cxx | 1 | ||||
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx | 3 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 16 |
3 files changed, 17 insertions, 3 deletions
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 2a1fb0366544..252a07eda566 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -136,6 +136,7 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent, mbModelValid(true), maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), "LineColor") { + disableArrowHead(); std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 02c86f6ef232..b2372de1042b 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -118,6 +118,8 @@ protected: void setMapUnit(SfxMapUnit eMapUnit); + void disableArrowHead(); + protected: VclPtr<sfx2::sidebar::SidebarToolBox> mpTBColor; @@ -162,6 +164,7 @@ private: /// bitfield bool mbWidthValuable : 1; + bool mbArrowSupported; void Initialize(); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 74f814ea77e0..b288da9e2b10 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -179,7 +179,8 @@ LinePropertyPanelBase::LinePropertyPanelBase( maIMGNone(SVX_RES(IMG_NONE_ICON)), mpIMGWidthIcon(), mxFrame(rxFrame), - mbWidthValuable(true) + mbWidthValuable(true), + mbArrowSupported(true) { get(mpFTWidth, "widthlabel"); get(mpTBWidth, "width"); @@ -396,7 +397,8 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault, } else { - mpLBStart->Enable(); + if (mbArrowSupported) + mpLBStart->Enable(); } if(bSetOrDefault) @@ -422,7 +424,8 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault, } else { - mpLBEnd->Enable(); + if (mbArrowSupported) + mpLBEnd->Enable(); } if(bSetOrDefault) @@ -933,6 +936,13 @@ void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) meMapUnit = eMapUnit; } +void LinePropertyPanelBase::disableArrowHead() +{ + mbArrowSupported = false; + mpLBStart->Hide(); + mpLBEnd->Hide(); +} + }} // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |