From ed4cbd4f6726dcae80bf8b42bee97e5bcf465502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@collabora.com>
Date: Tue, 15 Jul 2014 10:58:51 +0200
Subject: [PATCH 028/137] bnc#887225: OOXML import: Correctly apply table style
for lastRow.
nMaxColumn and nMaxRow are indexes, so use size() - 1.
Change-Id: I20055e55cf2464710fe553fb8067bad13a339084
(cherry picked from commit 47645734c350f244b4a5642a709132ca1b7dc75d)
Reviewed-on: https://gerrit.libreoffice.org/10329
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
---
oox/source/drawingml/table/tableproperties.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 74b0b91..43e4b1f 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -288,7 +288,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa
Reference< XCellRange > xCellRange( xTable, UNO_QUERY_THROW );
rTableCell.pushToXCell( rFilterBase, pMasterTextListStyle, xCellRange->getCellByPosition( nColumn, nRow ), *this, rTableStyle,
- nColumn, aTableRowIter->getTableCells().size(), nRow, mvTableRows.size() );
+ nColumn, aTableRowIter->getTableCells().size()-1, nRow, mvTableRows.size()-1 );
}
}
}
--
1.9.3