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 /sc | |
| parent | d0e479962694ae7944d9d3cfa0bedda76c473e07 (diff) | |
Get rid of SvULongs in calc
Instead of SvULongs use ::std::vector < sal_Int32 >
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 11 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 7bec48d4846c..72b09a253cbf 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_uInt32 > 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_uInt32 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 aefc0092d3fb..922e31cb7eca 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -73,8 +73,7 @@ #include "protectiondlg.hxx" #include <svl/ilstitem.hxx> -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> +#include <vector> #include <svx/zoomslideritem.hxx> #include <svx/svxdlg.hxx> @@ -810,7 +809,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SCTAB nTabCount = rDoc.GetTableCount(); SCTAB nTab; - SvULongs aIndexList( 4, 4 ); + ::std::vector < sal_Int32 > aIndexList; SFX_REQUEST_ARG( rReq, pItem, SfxIntegerListItem, SID_SELECT_TABLES, false ); if ( pItem ) pItem->GetList( aIndexList ); @@ -839,7 +838,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 +846,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Ignore(); } - if ( aIndexList.Count() ) + if ( !aIndexList.empty() ) { - sal_uInt16 nSelCount = aIndexList.Count(); + sal_uInt16 nSelCount = aIndexList.size(); sal_uInt16 nSelIx; SCTAB nFirstVisTab = 0; |