diff options
| author | Daniel Bankston <daniel.e.bankston@gmail.com> | 2012-05-25 17:22:21 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-01 19:40:08 +0200 |
| commit | 66ff25666ddb390e5c4bddaaa7d706991297a975 (patch) | |
| tree | d5e23ffe4cd0519afefcb7af411c5be926c769a1 /sc/source/filter/xml/xmlcelli.hxx | |
| parent | 2b47dd55a3ee886806277b5636517d3d97417bad (diff) | |
Remove unnecessary code in ODS import for matrix and merge
MyScTables matrix methods and ScXMLTableRowCellContext merge methods used
getCellRangePosition() (that was adopted from ScCellRangeObj) which contains
logic that is no longer necessary since since the UNO calls have been converted
to direct Sc calls.
Change-Id: Ibfa335860d142effb120d3e4f28a36d3d3c58666
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.hxx')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 4f8b4f9d4303..9cdcac5920bd 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -82,8 +82,8 @@ class ScXMLTableRowCellContext : public SvXMLImportContext sal_Int16 GetCellType(const rtl::OUString& sOUValue) const; - bool IsMerged(const ScRange& rScRange, const ScAddress& rScCell, ScRange& rScCellAddress) const; - void DoMerge(const ScAddress& rScCellPos, const sal_Int32 nCols, const sal_Int32 nRows); + bool IsMerged(ScRange& rScRange, const ScAddress& rScCell) const; + void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows); void SetContentValidation(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet); void SetCellProperties(const com::sun::star::uno::Reference<com::sun::star::table::XCellRange>& xCellRange, |