diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:09:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:09:05 +0000 |
| commit | 8fc957628712f075bfe07c54f4fefb7a48e807f7 (patch) | |
| tree | a346ec25d61b121289765ae13780a13f87997df6 /sc/source/filter/xml/XMLDDELinksContext.cxx | |
| parent | 21043a1cb822bf545f033cd6d519c8715b483744 (diff) | |
INTEGRATION: CWS rowlimit (1.10.324); FILE MERGED
2004/03/17 12:24:58 er 1.10.324.3: #i1967# type correctness (ScMatrix parameters are SCSIZE now)
2004/03/15 17:24:03 er 1.10.324.2: RESYNC: (1.10-1.11); FILE MERGED
2004/02/13 17:17:06 er 1.10.324.1: #i1967# document interface uses SCCOL/SCROW/SCTAB, API and filter use sal_Int32
Diffstat (limited to 'sc/source/filter/xml/XMLDDELinksContext.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLDDELinksContext.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index d6f403f36bba..18761f45da99 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLDDELinksContext.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2004-03-08 11:52:54 $ + * last change: $Author: obo $ $Date: 2004-06-04 11:09:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -215,7 +215,7 @@ void ScXMLDDELinkContext::EndElement() { if (nPosition > -1 && nColumns && nRows && GetScImport().GetDocument()) { - ScMatrixRef pMatrix = new ScMatrix( static_cast<USHORT>(nColumns), static_cast<USHORT>(nRows) ); + ScMatrixRef pMatrix = new ScMatrix( static_cast<SCSIZE>(nColumns), static_cast<SCSIZE>(nRows) ); DBG_ASSERT(static_cast<sal_uInt32>(nColumns * nRows) == aDDELinkTable.size(), "there is a wrong cells count"); sal_Int32 nCol(0); @@ -231,8 +231,8 @@ void ScXMLDDELinkContext::EndElement() else nCol++; - USHORT nScCol( static_cast< USHORT >( nCol ) ); - USHORT nScRow( static_cast< USHORT >( nRow ) ); + SCSIZE nScCol( static_cast< SCSIZE >( nCol ) ); + SCSIZE nScRow( static_cast< SCSIZE >( nRow ) ); if( aItr->bEmpty ) pMatrix->PutEmpty( nScCol, nScRow ); else if( aItr->bString ) |