diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-08-25 13:05:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-08-25 14:28:48 +0200 |
| commit | bea5d07ed1a50d3bea81de047eb9fe94c7a4e361 (patch) | |
| tree | f623ccda061e5ea6488316178f08d74275ede236 | |
| parent | b5b75ea9764c2e91c824fb8f5f5e6fcb6edfb4ea (diff) | |
some minor restructuring, code still needs refactoring
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 468b6e9b1013..74cc5b8d6e8d 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -781,10 +781,11 @@ void ScXMLTableRowCellContext::EndElement() rXMLImport.GetTextImport()->ResetCursor(); } } - table::CellAddress aCellPos = rXMLImport.GetTables().GetRealCellPos(); + ScMyTables& rTables = rXMLImport.GetTables(); + table::CellAddress aCellPos = rTables.GetRealCellPos(); if (aCellPos.Column > 0 && nRepeatedRows > 1) aCellPos.Row -= (nRepeatedRows - 1); - uno::Reference<table::XCellRange> xCellRange(rXMLImport.GetTables().GetCurrentXCellRange()); + uno::Reference<table::XCellRange> xCellRange(rTables.GetCurrentXCellRange()); if (xCellRange.is()) { if (bIsMerged) @@ -833,7 +834,6 @@ void ScXMLTableRowCellContext::EndElement() mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource) bIsEmpty = false; - ScMyTables& rTables = rXMLImport.GetTables(); for (sal_Int32 i = 0; i < nCellsRepeated; ++i) { aCurrentPos.Column = aCellPos.Column + i; @@ -1097,7 +1097,7 @@ void ScXMLTableRowCellContext::EndElement() { if (nMatrixCols > 0 && nMatrixRows > 0) { - rXMLImport.GetTables().AddMatrixRange( + rTables.AddMatrixRange( aCellPos.Column, aCellPos.Row, aCellPos.Column + nMatrixCols - 1, aCellPos.Row + nMatrixRows - 1, |