mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused SCHATTR_DIAGRAM_STYLE

Browse Source 
and associated SvxChartStyleItem and SvxChartStyle

Change-Id: I1564a4583125dd32af71e4eff338dfcefc6517c4
Reviewed-on: https://gerrit.libreoffice.org/33988
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-02-07 11:42:00 +02:00
parent 7c62784314
commit a3190d7201
5 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
View File

@@ -212,7 +212,6 @@ const sal_uInt16 nLineAndFillPropertyWhichPairs[] =
const sal_uInt16 nChartStyleWhichPairs[] = const sal_uInt16 nChartStyleWhichPairs[] =
{ {
SCHATTR_DIAGRAM_STYLE, SCHATTR_DIAGRAM_STYLE,
SCHATTR_STYLE_SHAPE, SCHATTR_STYLE_SHAPE, SCHATTR_STYLE_SHAPE, SCHATTR_STYLE_SHAPE,
SCHATTR_NUM_OF_LINES_FOR_BAR, SCHATTR_NUM_OF_LINES_FOR_BAR, SCHATTR_NUM_OF_LINES_FOR_BAR, SCHATTR_NUM_OF_LINES_FOR_BAR,
SCHATTR_SPLINE_ORDER, SCHATTR_SPLINE_ORDER, SCHATTR_SPLINE_ORDER, SCHATTR_SPLINE_ORDER,

13
chart2/source/inc/chartview/ChartSfxItemIds.hxx
View File

@@ -142,13 +142,12 @@
#define SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3) #define SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3)
#define SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4) #define SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4)
#define SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5) #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 + 6)
#define SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 7) #define SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 7)
#define SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 8) #define SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 8)
#define SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 9) #define SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 9)
#define SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 10) #define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10)
#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 11) #define SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 11)
#define SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 12)
#define SCHATTR_CHARTTYPE_END SCHATTR_INCLUDE_HIDDEN_CELLS #define SCHATTR_CHARTTYPE_END SCHATTR_INCLUDE_HIDDEN_CELLS

1
chart2/source/view/main/ChartItemPool.cxx
View File

@@ -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_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_ORDER - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 );
rPoolDefaults[SCHATTR_SPLINE_RESOLUTION - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 ); 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_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_STARTING_ANGLE - SCHATTR_START] = new SfxInt32Item( SCHATTR_STARTING_ANGLE, 90 );
rPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false ); rPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false );

23
include/svx/chrtitem.hxx
View File

@@ -22,15 +22,6 @@
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
enum class SvxChartStyle
{
Line2D,
Column2D,
AddIn
};
#define CHSTYLE_COUNT ((sal_uInt16)SvxChartStyle::AddIn + 1)
enum class SvxChartTextOrder enum class SvxChartTextOrder
{ {
SideBySide, SideBySide,
@@ -80,20 +71,6 @@ enum class SvxChartRegress
#define CHREGRESS_COUNT ((sal_uInt16)SvxChartRegress::Unknown + 1) #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 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
{ {
public: public:

23
svx/source/items/chrtitem.cxx
View File

@@ -32,29 +32,6 @@ using namespace ::com::sun::star;
SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);} 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, SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
sal_uInt16 nId) : sal_uInt16 nId) :
SfxEnumItem(nId, (sal_uInt16)eOrder) SfxEnumItem(nId, (sal_uInt16)eOrder)