Spotted some mistakes in calc patch.
>From e7db01344f8fef4ca2f2f59868736033d0126b1b Mon Sep 17 00:00:00 2001 From: Maciej Rumianowski <maciej.rumianow...@gmail.com> Date: Mon, 18 Jul 2011 09:22:57 +0200 Subject: [PATCH] Get rid of SvULongs in calc
Instead of SvULongs use ::std::vector < sal_uLong > --- .../itemsetwrapper/DataPointItemConverter.cxx | 7 +------ .../itemsetwrapper/SeriesOptionsItemConverter.cxx | 7 +------ chart2/source/view/main/ChartItemPool.cxx | 8 +++----- sc/source/ui/docshell/impex.cxx | 11 +++++------ sc/source/ui/view/tabvwsh3.cxx | 8 ++++---- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 3802ffc..76e7db0 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 a199b66..7df2d61 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 2cdac8f..82df33d 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_uLong >() ); 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_uLong >() ); 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); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 7b0e30d..06fa392 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -49,8 +49,6 @@ class StarBASIC; #include <rtl/math.hxx> #include <svtools/htmlout.hxx> #include <svl/zforlist.hxx> -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> #include <unotools/charclass.hxx> @@ -58,6 +56,7 @@ class StarBASIC; #include <unotools/calendarwrapper.hxx> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <unotools/transliterationwrapper.hxx> +#include <vector> #include "global.hxx" #include "scerrors.hxx" @@ -1544,7 +1543,7 @@ sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm ) SCROW nEndRow = aRange.aEnd.Row(); sal_uLong nOldPos = rStrm.Tell(); sal_Bool bData = sal_Bool( !bSingle ); - SvULongs aFormats; + std::vector< sal_uLong > aFormats; if( !bSingle) bOk = StartPaste(); @@ -1730,9 +1729,9 @@ sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm ) if( nCol > nEndCol ) nEndCol = nCol; } - if ( 0 <= nFormat && nFormat < aFormats.Count() ) + if ( 0 <= nFormat && nFormat < (sal_Int32)aFormats.size() ) { - sal_uLong nKey = aFormats[(sal_uInt16)nFormat]; + sal_uLong nKey = aFormats[nFormat]; pDoc->ApplyAttr( nCol, nRow, aRange.aStart.Tab(), SfxUInt32Item( ATTR_VALUE_FORMAT, nKey ) ); } @@ -1759,7 +1758,7 @@ sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm ) ScGlobal::eLnge ); if ( nCheckPos ) nKey = 0; - aFormats.Insert( nKey, aFormats.Count() ); + aFormats.push_back( nKey ); } } else if( cTag == 'I' && *p == 'D' ) diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 270542c..1efecc8 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -810,7 +810,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SCTAB nTabCount = rDoc.GetTableCount(); SCTAB nTab; - SvULongs aIndexList( 4, 4 ); + ::std::vector < sal_uLong > aIndexList( 4, 4 ); SFX_REQUEST_ARG( rReq, pItem, SfxIntegerListItem, SID_SELECT_TABLES, false ); if ( pItem ) pItem->GetList( aIndexList ); @@ -839,7 +839,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) sal_uInt16 nSelCount = pDlg->GetSelectEntryCount(); sal_uInt16 nSelIx; for( nSelIx = 0; nSelIx < nSelCount; ++nSelIx ) - aIndexList.Insert( pDlg->GetSelectEntryPos( nSelIx ), nSelIx ); + aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectEntryPos( nSelIx ) ); delete pDlg; rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES, aIndexList ) ); } @@ -847,9 +847,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Ignore(); } - if ( aIndexList.Count() ) + if ( aIndexList.size() ) { - sal_uInt16 nSelCount = aIndexList.Count(); + sal_uInt16 nSelCount = aIndexList.size(); sal_uInt16 nSelIx; SCTAB nFirstVisTab = 0; -- 1.7.4.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice