diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-25 15:58:03 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-25 16:12:13 -0400 |
| commit | 2be411acef8bd7ef02ddfbaeb6543fb876934112 (patch) | |
| tree | 4dc27508657d6fc9734c1eb1f831c9507dbf2a75 /sc | |
| parent | fd4d8cee4b8c3bc7ec50d30c25090bfe61fd8037 (diff) | |
Combine SetMatrixCellData() with SetCellData().
Change-Id: I170eca29a36e2d2db2f91bd588e912d7d56b4d4d
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/XMLExportIterator.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLExportIterator.hxx | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 2cf43250d084..1a14dafeaa50 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -693,14 +693,11 @@ void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell, table::CellAddre if (mpCell) rMyCell.maBaseCell = *mpCell; } -} -void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell ) -{ rMyCell.bIsMatrixCovered = false; rMyCell.bIsMatrixBase = false; - bool bIsMatrixBase(false); + bool bIsMatrixBase = false; ScAddress aScAddress; ScUnoConversion::FillScAddress( aScAddress, rMyCell.aCellAddress ); @@ -879,7 +876,6 @@ bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pC pDetectiveOp->SetCellData( aCell ); HasAnnotation( aCell ); - SetMatrixCellData( aCell ); bool bIsAutoStyle; // Ranges before the previous cell are not needed by ExportFormatRanges anymore and can be removed sal_Int32 nRemoveBeforeRow = aLastAddress.Row; diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 98eedf414ad3..6433510d5c0f 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -401,7 +401,6 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); - void SetMatrixCellData( ScMyCell& rMyCell ); void HasAnnotation( ScMyCell& aCell ); public: ScMyNotEmptyCellsIterator(ScXMLExport& rExport); |