diff options
| author | Mohammed Abdul Azeem <azeemmysore@gmail.com> | 2016-02-21 04:37:20 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-02-26 15:56:03 +0000 |
| commit | 4b63e7ee7e286b116d60dda676349024808182ed (patch) | |
| tree | 3e60ea89d5ca74fca923692af2d418b183505961 /sc/source/filter/oox/pivotcachebuffer.cxx | |
| parent | 9d198be7395cc236fd3453de1005b5abeb2ed801 (diff) | |
tdf#97654 - replaced CellAddress types with ScAddress.
Differences in default constructors is compensated and other changes have
been made as suggested.
Change-Id: I15bdf5043816502ace797c352242a4a59f1cd64e
Reviewed-on: https://gerrit.libreoffice.org/22579
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/source/filter/oox/pivotcachebuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/pivotcachebuffer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 2a6cfd19b50f..b13fadd3ec75 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1262,7 +1262,7 @@ void PivotCache::writeSourceHeaderCells( WorksheetHelper& rSheetHelper ) const OSL_ENSURE( static_cast< size_t >( maSheetSrcModel.maRange.EndColumn - maSheetSrcModel.maRange.StartColumn + 1 ) == maDatabaseFields.size(), "PivotCache::writeSourceHeaderCells - source cell range width does not match number of source fields" ); sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn; - sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column; + sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Col(); sal_Int32 nRow = maSheetSrcModel.maRange.StartRow; mnCurrRow = -1; updateSourceDataRow( rSheetHelper, nRow ); @@ -1286,7 +1286,7 @@ void PivotCache::importPCRecord( SequenceInputStream& rStrm, WorksheetHelper& rS sal_Int32 nRow = maSheetSrcModel.maRange.StartRow + nRowIdx; OSL_ENSURE( (maSheetSrcModel.maRange.StartRow < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow), "PivotCache::importPCRecord - invalid row index" ); sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn; - sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column; + sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Col(); for( PivotCacheFieldVector::const_iterator aIt = maDatabaseFields.begin(), aEnd = maDatabaseFields.end(); !rStrm.isEof() && (aIt != aEnd) && (nCol <= nMaxCol); ++aIt, ++nCol ) (*aIt)->importPCRecordItem( rStrm, rSheetHelper, nCol, nRow ); } @@ -1296,7 +1296,7 @@ void PivotCache::importPCItemIndexList( BiffInputStream& rStrm, WorksheetHelper& sal_Int32 nRow = maSheetSrcModel.maRange.StartRow + nRowIdx; OSL_ENSURE( (maSheetSrcModel.maRange.StartRow < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow), "PivotCache::importPCItemIndexList - invalid row index" ); sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn; - sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column; + sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Col(); for( PivotCacheFieldVector::const_iterator aIt = maDatabaseFields.begin(), aEnd = maDatabaseFields.end(); !rStrm.isEof() && (aIt != aEnd) && (nCol <= nMaxCol); ++aIt, ++nCol ) if( (*aIt)->hasSharedItems() ) (*aIt)->importPCItemIndex( rStrm, rSheetHelper, nCol, nRow ); |