diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-11-19 12:42:36 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-11-24 17:41:30 +0100 |
commit | 02226081592e47b0c42489258ed688b9ebb7a939 (patch) | |
tree | 6e243aced9d1b2a53fcf113b48aaeaa43cf8a20d /sc/source/filter | |
parent | 708ef6a08dfcd357845c37dbe03fd1ebca5ba587 (diff) |
sc: Introduce Abstract Base Class for ScMatrix, for a future rework.
We want to introduce another type of ScMatrix that will directly contain
DoubleVectorRefToken and operate on that. The idea is that it is pointless to
construct a ScMatrix via lots of copying around, when we already have a nice
array of doubles.
Change-Id: I3e5d7b9e2e0f9b9bf350336a8582cfd852586b3f
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/excel/tokstack.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xihelper.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xilink.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xihelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLDDELinksContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 4bc6ba0e24fe..1a8a399f8b62 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -786,7 +786,7 @@ const TokenId TokenPool::StoreMatrix() pElement[ nElementAkt ] = nP_MatrixAkt; pType[ nElementAkt ] = T_Matrix; - pM = new ScMatrix( 0, 0 ); + pM = new ScFullMatrix( 0, 0 ); pM->IncRef( ); ppP_Matrix[ nP_MatrixAkt ] = pM; diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 62c1504a390f..6b1bc9497ddc 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -864,7 +864,7 @@ ScMatrixRef XclImpCachedMatrix::CreateScMatrix( svl::SharedStringPool& rPool ) c OSL_ENSURE( mnScCols * mnScRows == maValueList.size(), "XclImpCachedMatrix::CreateScMatrix - element count mismatch" ); if( mnScCols && mnScRows && static_cast< sal_uLong >( mnScCols * mnScRows ) <= maValueList.size() ) { - xScMatrix = new ScMatrix(mnScCols, mnScRows, 0.0); + xScMatrix = new ScFullMatrix(mnScCols, mnScRows, 0.0); XclImpValueList::const_iterator itValue = maValueList.begin(); for( SCSIZE nScRow = 0; nScRow < mnScRows; ++nScRow ) { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 6c212371d423..7b7ec4bc3563 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -270,7 +270,7 @@ sal_uInt16 XclImpTabInfo::GetCurrentIndex( sal_uInt16 nCreatedId, sal_uInt16 nMa // External names ============================================================= XclImpExtName::MOper::MOper(svl::SharedStringPool& rPool, XclImpStream& rStrm) : - mxCached(new ScMatrix(0,0)) + mxCached(new ScFullMatrix(0,0)) { SCSIZE nLastCol = rStrm.ReaduInt8(); SCSIZE nLastRow = rStrm.ReaduInt16(); diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index e6b90127c7ff..4e54d7c3ab2d 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -329,7 +329,7 @@ public: explicit XclImpCachedMatrix( XclImpStream& rStrm ); ~XclImpCachedMatrix(); - /** Creates a new ScMatrix object and fills it with the contained values. */ + /** Creates a new ScFullMatrix object and fills it with the contained values. */ ScMatrixRef CreateScMatrix( svl::SharedStringPool& rPool ) const; private: diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 5216fa02c232..43425db63388 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -153,7 +153,7 @@ void ScXMLDDELinkContext::EndElement() OSL_ENSURE( static_cast<size_t>(nColumns * nRows) == aDDELinkTable.size(), "ScXMLDDELinkContext::EndElement: adapted matrix dimension doesn't match either"); } - ScMatrixRef pMatrix = new ScMatrix(static_cast<SCSIZE>(nColumns), static_cast<SCSIZE>(nRows), 0.0); + ScMatrixRef pMatrix = new ScFullMatrix(static_cast<SCSIZE>(nColumns), static_cast<SCSIZE>(nRows), 0.0); sal_Int32 nCol(0); sal_Int32 nRow(-1); sal_Int32 nIndex(0); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index ded2e1941fd0..f55e570aec17 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1439,7 +1439,7 @@ void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress& rCellPos ) ScFormulaCell* pFCell = rXMLImport.GetDocument()->GetFormulaCell(rCellPos); if (pFCell) { - ScMatrixRef pMat(new ScMatrix(nMatrixCols, nMatrixRows)); + ScMatrixRef pMat(new ScFullMatrix(nMatrixCols, nMatrixRows)); if (bFormulaTextResult && maStringValue) { if (!IsPossibleErrorString()) |