applied_patches/0832-cws-ooxml03-docx-sw-fix-gridcols.diff

   1 --- sw/source/filter/docx/docx-docxattributeoutput.cxx
   2 +++ sw/source/filter/docx/docx-docxattributeoutput.cxx
   3 @@ -1338,14 +1338,11 @@
   4      // Write the table grid infos
   5      m_pSerializer->startElementNS( XML_w, XML_tblGrid, FSEND );
   6
   7 -    const SwWriteTableCols& aCols = m_pTableWrt->GetCols( );
   8 -    for ( USHORT i = 0, len = aCols.Count( ); i < len; i++ )
   9 -    {
  10 -        USHORT nWidth = m_pTableWrt->GetAbsWidth( i, 1 );
  11 +    std::vector<SwTwips> gridCols = GetGridCols( pTableTextNodeInfoInner );
  12 +    for ( std::vector<SwTwips>::const_iterator it = gridCols.begin(); it != gridCols.end(); ++it )
  13          m_pSerializer->singleElementNS( XML_w, XML_gridCol,
  14 -               FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ),
  15 +               FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( *it ) ).getStr( ),
  16                 FSEND );
  17 -    }
  18
  19      m_pSerializer->endElementNS( XML_w, XML_tblGrid );
  20  }