Hullo SC Devs,
A quick question to any more-knowledgeable-than-me person on whether
there's a reason these spots in the calc code base are hard-coded to
sal_Int16, rather than using SCCOL?
Thanks,
Kevin
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 705f794..b6bded9 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -189,12 +189,12 @@ typedef ::std::vector< ScPivotField > ScPivotFieldVector;
struct ScDPFuncData
{
- short mnCol;
+ SCCOL mnCol;
sal_uInt16 mnFuncMask;
::com::sun::star::sheet::DataPilotFieldReference maFieldRef;
- explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask );
- explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask,
+ explicit ScDPFuncData( SCCOL nNewCol, sal_uInt16 nNewFuncMask );
+ explicit ScDPFuncData( SCCOL nNewCol, sal_uInt16 nNewFuncMask,
const ::com::sun::star::sheet::DataPilotFieldReference& rFieldRef );
};
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 533bbb9..cffbaf0 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -465,7 +465,7 @@ void ImportExcel:: WinProtection( void )
void ImportExcel::Columndefault( void )
{// Default Cell Attributes
- sal_uInt16 nColMic, nColMac;
+ SCCOL nColMic, nColMac;
sal_uInt8 nOpt0;
aIn >> nColMic >> nColMac;
@@ -651,7 +651,7 @@ void ImportExcel::Builtinfmtcnt( void )
void ImportExcel::Colinfo( void )
{// Column Formatting Information
- sal_uInt16 nColFirst, nColLast, nColWidth, nXF;
+ SCCOL nColFirst, nColLast, nColWidth, nXF;
sal_uInt16 nOpt;
aIn >> nColFirst >> nColLast >> nColWidth >> nXF >> nOpt;
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 1b65585..5437ef6 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -103,7 +103,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
nSrcTab ( nSourceTab ), // ist nicht im QueryParam
nFieldCount ( 0 )
{
- for (sal_uInt16 i=0; i<=MAXCOL; i++)
+ for (SCCOL i=0; i<=MAXCOL; i++)
pEntryLists[i] = NULL;
Init( rArgSet );
@@ -114,7 +114,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
ScPivotFilterDlg::~ScPivotFilterDlg()
{
- for (sal_uInt16 i=0; i<=MAXCOL; i++)
+ for (SCCOL i=0; i<=MAXCOL; i++)
delete pEntryLists[i];
if ( pOutItem )
@@ -567,7 +567,7 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
if ( pBox == &aBtnCase ) // Wertlisten
{
- for (sal_uInt16 i=0; i<=MAXCOL; i++)
+ for (SCCOL i=0; i<=MAXCOL; i++)
DELETEZ( pEntryLists[i] );
String aCurVal1 = aEdVal1.GetText();
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
