summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-26 16:51:20 +0100
committerPetr Mladek <pmladek@suse.cz>2012-11-05 20:07:39 +0100
commiteae70b11109414880fe9349a9bce2dd2b3ace66a (patch)
treee157f7df248302c4492cda2e308829830842c2ff
parent7bc06bbea3480df0ada805609db081a4cd48a9b9 (diff)
Resolves: fdo#35991 rowspan is of size sal_Int32, not size long
Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4 (cherry picked from commit 8bd3bf0ff20fc18a0a6358e36b3f8a7e3b34a2bb) Reviewed-on: https://gerrit.libreoffice.org/919 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 28e8c29e80da..e0bacc44a296 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1856,7 +1856,7 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa
}
}
-static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan)
+static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, sal_Int32 nRowSpan)
{
sal_uInt16 nFlags = 0;