diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-30 17:08:19 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-03 00:16:51 +0000 |
| commit | a4b7a2475d33311fef16197bf6a945ad5121fc8e (patch) | |
| tree | 2eb38945703f8e1f0226c7b96fec8ae4bbeb0183 | |
| parent | 2f9a7c1826cd1233986c97ad840136fd4ed43bca (diff) | |
tdf#48140 replace CellRangeAddress in xlsx import (4)
Change-Id: I4576c8553205c075ae932567242d98aae3c20b1a
Reviewed-on: https://gerrit.libreoffice.org/32573
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
| -rw-r--r-- | sc/source/filter/inc/commentsbuffer.hxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/oox/commentsbuffer.cxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 255c5a98100a..e2d9f3255ac5 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -29,8 +29,7 @@ namespace xls { struct CommentModel { - css::table::CellRangeAddress - maRange; /// Position of the comment in the worksheet. + ScRange maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). bool mbAutoFill; /// Auto Selection of comment object's fill style diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index faea93fb478d..d9f22f485512 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -131,10 +131,9 @@ RichStringRef const & Comment::createText() void Comment::finalizeImport() { // BIFF12 stores cell range instead of cell address, use first cell of this range - OSL_ENSURE( (maModel.maRange.StartColumn == maModel.maRange.EndColumn) && - (maModel.maRange.StartRow == maModel.maRange.EndRow), + OSL_ENSURE( maModel.maRange.aStart == maModel.maRange.aEnd, "Comment::finalizeImport - comment anchor should be a single cell" ); - CellAddress aNotePos( maModel.maRange.Sheet, maModel.maRange.StartColumn, maModel.maRange.StartRow ); + CellAddress aNotePos( maModel.maRange.aStart.Tab(), maModel.maRange.aStart.Col(), maModel.maRange.aStart.Row() ); if( getAddressConverter().checkCellAddress( aNotePos, true ) && maModel.mxText.get() ) try { Reference< XSheetAnnotationsSupplier > xAnnosSupp( getSheet(), UNO_QUERY_THROW ); |