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