diff options
author | Maciej Rumianowski <maciej.rumianowski@gmail.com> | 2011-07-19 10:50:54 +0200 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-07-20 17:01:05 -0400 |
commit | a945fbf59ca0847da961d905c44ca1eb947bb369 (patch) | |
tree | cd3777d63691f052601beb903b66af84be81c8d5 /chart2 | |
parent | d0e479962694ae7944d9d3cfa0bedda76c473e07 (diff) |
Get rid of SvULongs in calc
Instead of SvULongs use ::std::vector < sal_Int32 >
Diffstat (limited to 'chart2')
3 files changed, 5 insertions, 17 deletions
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index e399e4ba82b1..1c494c94de31 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -54,8 +54,6 @@ #include <editeng/brshitem.hxx> //SfxIntegerListItem #include <svl/ilstitem.hxx> -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> #include <vcl/graph.hxx> #include <com/sun/star/graphic/XGraphic.hpp> @@ -641,10 +639,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS: { - SvULongs aList; - for ( sal_Int32 nN=0; nN<m_aAvailableLabelPlacements.getLength(); nN++ ) - aList.Insert( m_aAvailableLabelPlacements[nN], sal::static_int_cast< sal_uInt16 >(nN) ); - rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) ); + rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aAvailableLabelPlacements ) ); } break; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 1782d9513caa..20277edf0c00 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -51,8 +51,6 @@ //SfxIntegerListItem #include <svl/ilstitem.hxx> -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> #include <rtl/math.hxx> #include <functional> @@ -433,10 +431,7 @@ void SeriesOptionsItemConverter::FillSpecialItem( } case SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS: { - SvULongs aList; - for ( sal_Int32 nN=0; nN<m_aSupportedMissingValueTreatments.getLength(); nN++ ) - aList.Insert( m_aSupportedMissingValueTreatments[nN], sal::static_int_cast< sal_uInt16 >(nN) ); - rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) ); + rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aSupportedMissingValueTreatments ) ); break; } case SCHATTR_INCLUDE_HIDDEN_CELLS: diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 0e8c53566098..887352b9ca90 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -39,10 +39,9 @@ #include <svl/stritem.hxx> #include <svl/rectitem.hxx> #include <svl/ilstitem.hxx> -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> #include <editeng/editids.hrc> #include <svx/svxids.hrc> +#include <vector> #include <com/sun/star/chart2/LegendPosition.hpp> @@ -63,8 +62,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_DATADESCR_SHOW_SYMBOL - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL); ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,C2U(" ")); ppPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0); - SvULongs aTmp; - ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS,aTmp); + ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); @@ -157,7 +155,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, sal_False ); ppPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0); - ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,aTmp); + ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True); ppPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0); |