chart2/source/controller/sidebar/ChartAreaPanel.cxx | 4 +++-
chart2/source/controller/sidebar/ChartLinePanel.cxx | 7 ++++---
include/svx/sidebar/LinePropertyPanelBase.hxx | 3 +++
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 16 +++++++++++++---
4 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit af77042f62bc18c278c1acf6548b3ed41f0da871
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Oct 12 23:50:20 2015 +0200
disable arrow heads in chart sidebar, tdf#94971
Change-Id: I631f34faf2befeb7cc61027c8fd59ef7b3543785
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 2a1fb03..252a07e 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 02c86f6..b2372de 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 74f814e..b288da9 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: */
commit 01cc898aac11b608c3565a9c22970f10e4b63438
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Oct 12 23:25:38 2015 +0200
update the line panel for data points, related tdf#94969
Change-Id: Ieffdfd1cc0d6b5cc0dd8394896aeb49838096a6b
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 1bb4bfc..2a1fb03 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -137,9 +137,9 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()),
"LineColor")
{
std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE,
OBJECTTYPE_DIAGRAM,
- OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND,
OBJECTTYPE_DATA_CURVE,
- OBJECTTYPE_DATA_AVERAGE_LINE,
- OBJECTTYPE_AXIS};
+ OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT,
+ OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE,
+ OBJECTTYPE_DATA_AVERAGE_LINE, OBJECTTYPE_AXIS};
mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
Initialize();
}
commit 2753cd308716f5f14a59242032f2242fe0776ca2
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Oct 12 23:22:50 2015 +0200
update area panel for data points, tdf#94969
Change-Id: I700ae8ff591ef1ea82887b1ec2cd7b4be04978db
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 54928df0..815a12a 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -247,7 +247,9 @@ ChartAreaPanel::ChartAreaPanel(vcl::Window* pParent,
mbModelValid(true),
maFillColorWrapper(mxModel, getColorToolBoxControl(mpToolBoxColor.get()),
"FillColor")
{
- std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE,
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE,
OBJECTTYPE_LEGEND};
+ std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE,
OBJECTTYPE_DIAGRAM,
+ OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT,
+ OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND};
mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
Initialize();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
