|
 |
f085be |
From 087eb8031b444d62a10d744e7b5983f97c59883c 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 11:28:30 +0200
|
|
|
f085be |
Subject: [PATCH 027/137] Do not prefer bandRow over firstCol/lastCol, nor the
|
|
|
f085be |
same with bandCol.
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I0c573d721212c870e9ecc99ba5e8494073e09aaf
|
|
|
f085be |
(cherry picked from commit 5d2f12a44d2af3e42e0c3a17ff556f5ada27b1b8)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10330
|
|
|
f085be |
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f085be |
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f085be |
---
|
|
|
f085be |
oox/source/drawingml/table/tablecell.cxx | 8 ++++++--
|
|
|
f085be |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
|
|
|
f085be |
index c3c4f49..1bb6241 100644
|
|
|
f085be |
--- a/oox/source/drawingml/table/tablecell.cxx
|
|
|
f085be |
+++ b/oox/source/drawingml/table/tablecell.cxx
|
|
|
f085be |
@@ -228,7 +228,9 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
|
|
|
f085be |
if ( rProperties.isBandRow() )
|
|
|
f085be |
{
|
|
|
f085be |
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
|
|
|
f085be |
- ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) )
|
|
|
f085be |
+ ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
|
|
|
f085be |
+ ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
|
|
|
f085be |
+ ( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
|
|
|
f085be |
{
|
|
|
f085be |
sal_Int32 nBand = nRow;
|
|
|
f085be |
if ( rProperties.isFirstRow() )
|
|
|
f085be |
@@ -303,7 +305,9 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
|
|
|
f085be |
}
|
|
|
f085be |
if ( rProperties.isBandCol() )
|
|
|
f085be |
{
|
|
|
f085be |
- if ( ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
|
|
|
f085be |
+ if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
|
|
|
f085be |
+ ( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
|
|
|
f085be |
+ ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
|
|
|
f085be |
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
|
|
|
f085be |
{
|
|
|
f085be |
sal_Int32 nBand = nColumn;
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|