[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/docxattributeoutput.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c8b6751cb4fb0dc834015a1cdfe3adb8506a0f2b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 17 15:57:33 2015 +0100

    get the vertical span from the reliable getRowSpansOfRow
    
    unstead of the unreliable pTblBox
    
    Change-Id: I083560fdbcf83173c5f3c42267ca2d8e4e6d9a17

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index f5e9581..09632bc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2839,7 +2839,8 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
     }
 
     // Vertical merges
-    long vSpan = pTblBox->getRowSpan( );
+    ww8::RowSpansPtr xRowSpans = pTableTextNodeInfoInner->getRowSpansOfRow();
+    sal_Int32 vSpan = (*xRowSpans)[nCell];
     if ( vSpan > 1 )
     {
         m_pSerializer->singleElementNS( XML_w, XML_vMerge,