oox/source/drawingml/table/tablecell.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 087eb8031b444d62a10d744e7b5983f97c59883c
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Jul 15 11:28:30 2014 +0200
Do not prefer bandRow over firstCol/lastCol, nor the same with bandCol.
Change-Id: I0c573d721212c870e9ecc99ba5e8494073e09aaf
(cherry picked from commit 5d2f12a44d2af3e42e0c3a17ff556f5ada27b1b8)
Reviewed-on: https://gerrit.libreoffice.org/10330
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index c3c4f49..1bb6241 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -228,7 +228,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
if ( rProperties.isBandRow() )
{
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
- ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) )
+ ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+ ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+ ( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nRow;
if ( rProperties.isFirstRow() )
@@ -303,7 +305,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
}
if ( rProperties.isBandCol() )
{
- if ( ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+ if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
+ ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+ ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nColumn;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
