[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/wrtww8.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eae70b11109414880fe9349a9bce2dd2b3ace66a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 26 16:51:20 2012 +0100

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 28e8c29..e0bacc4 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;