[Libreoffice-commits] core.git: chart2/source include/svx svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Feb 8 08:13:20 UTC 2017
chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx | 1
chart2/source/inc/chartview/ChartSfxItemIds.hxx | 13 +++----
chart2/source/view/main/ChartItemPool.cxx | 1
include/svx/chrtitem.hxx | 23 --------------
svx/source/items/chrtitem.cxx | 23 --------------
5 files changed, 6 insertions(+), 55 deletions(-)
New commits:
commit a3190d72011be267a8c4f155f48bcb0fa207bc83
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Feb 7 11:42:00 2017 +0200
remove unused SCHATTR_DIAGRAM_STYLE
and associated SvxChartStyleItem and SvxChartStyle
Change-Id: I1564a4583125dd32af71e4eff338dfcefc6517c4
Reviewed-on: https://gerrit.libreoffice.org/33988
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index eb7cdde..2c43f1e 100644
--- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
+++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
@@ -212,7 +212,6 @@ const sal_uInt16 nLineAndFillPropertyWhichPairs[] =
const sal_uInt16 nChartStyleWhichPairs[] =
{
- SCHATTR_DIAGRAM_STYLE, SCHATTR_DIAGRAM_STYLE,
SCHATTR_STYLE_SHAPE, SCHATTR_STYLE_SHAPE,
SCHATTR_NUM_OF_LINES_FOR_BAR, SCHATTR_NUM_OF_LINES_FOR_BAR,
SCHATTR_SPLINE_ORDER, SCHATTR_SPLINE_ORDER,
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
index d2b873c..f87fcd5 100644
--- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
+++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
@@ -142,13 +142,12 @@
#define SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3)
#define SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4)
#define SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5)
-#define SCHATTR_DIAGRAM_STYLE (SCHATTR_CHARTTYPE_START + 6)
-#define SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 7)
-#define SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 8)
-#define SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 9)
-#define SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 10)
-#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 11)
-#define SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 12)
+#define SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 6)
+#define SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 7)
+#define SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 8)
+#define SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 9)
+#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10)
+#define SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 11)
#define SCHATTR_CHARTTYPE_END SCHATTR_INCLUDE_HIDDEN_CELLS
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 09e8f5e..4909b12 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -138,7 +138,6 @@ ChartItemPool::ChartItemPool():
rPoolDefaults[SCHATTR_NUM_OF_LINES_FOR_BAR - SCHATTR_START] = new SfxInt32Item( SCHATTR_NUM_OF_LINES_FOR_BAR, 0 );
rPoolDefaults[SCHATTR_SPLINE_ORDER - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 );
rPoolDefaults[SCHATTR_SPLINE_RESOLUTION - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 );
- rPoolDefaults[SCHATTR_DIAGRAM_STYLE - SCHATTR_START] = new SvxChartStyleItem( SvxChartStyle::Column2D, SCHATTR_DIAGRAM_STYLE );
rPoolDefaults[SCHATTR_GROUP_BARS_PER_AXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, false);
rPoolDefaults[SCHATTR_STARTING_ANGLE - SCHATTR_START] = new SfxInt32Item( SCHATTR_STARTING_ANGLE, 90 );
rPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false );
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index e14939e..31c669a 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -22,15 +22,6 @@
#include <svl/eitem.hxx>
#include <svx/svxdllapi.h>
-enum class SvxChartStyle
-{
- Line2D,
- Column2D,
- AddIn
-};
-
-#define CHSTYLE_COUNT ((sal_uInt16)SvxChartStyle::AddIn + 1)
-
enum class SvxChartTextOrder
{
SideBySide,
@@ -80,20 +71,6 @@ enum class SvxChartRegress
#define CHREGRESS_COUNT ((sal_uInt16)SvxChartRegress::Unknown + 1)
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
-{
-public:
- SvxChartStyleItem(SvxChartStyle eStyle /*= SvxChartStyle::Line2D*/,
- sal_uInt16 nId );
- SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
-
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
- virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
-
- sal_uInt16 GetValueCount() const override { return CHSTYLE_COUNT; }
-};
-
-
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
{
public:
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 0efa60b..945ed3e 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -32,29 +32,6 @@ using namespace ::com::sun::star;
SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);}
-SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
- SfxEnumItem(nId, (sal_uInt16)eStyle)
-{
-}
-
-
-SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
- SfxEnumItem(nId, rIn)
-{
-}
-
-
-SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
-{
- return new SvxChartStyleItem(*this);
-}
-
-
-SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
-{
- return new SvxChartStyleItem(rIn, Which());
-}
-
SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
sal_uInt16 nId) :
SfxEnumItem(nId, (sal_uInt16)eOrder)
More information about the Libreoffice-commits
mailing list