sc/source/filter/inc/commentsbuffer.hxx | 3 +--
sc/source/filter/oox/commentsbuffer.cxx | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit a4b7a2475d33311fef16197bf6a945ad5121fc8e
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Fri Dec 30 17:08:19 2016 +0100
tdf#48140 replace CellRangeAddress in xlsx import (4)
Change-Id: I4576c8553205c075ae932567242d98aae3c20b1a
Reviewed-on: https://gerrit.libreoffice.org/32573
Tested-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
diff --git a/sc/source/filter/inc/commentsbuffer.hxx
b/sc/source/filter/inc/commentsbuffer.hxx
index 255c5a9..e2d9f32 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 faea93f..d9f22f4 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
