applied_patches/0825-cws-ooxml03-docx-sw-fix-section-columns.diff

   1 --- sw/source/filter/docx/docx-docxattributeoutput.cxx  (revision 271190)
   2 +++ sw/source/filter/docx/docx-docxattributeoutput.cxx  (working copy)
   3 @@ -3198,12 +3198,12 @@
   4      // Get the columns attributes
   5      FastAttributeList *pColsAttrList = m_pSerializer->createAttrList();
   6
   7 +    pColsAttrList->add( FSNS( XML_w, XML_num ),
   8 +            OString::valueOf( sal_Int32( nCols ) ). getStr( ) );
   9 +
  10      const char* pEquals = "false";
  11      if ( bEven )
  12      {
  13 -        pColsAttrList->add( FSNS( XML_w, XML_num ),
  14 -                OString::valueOf( sal_Int32( nCols ) ). getStr( ) );
  15 -
  16          USHORT nWidth = rCol.GetGutterWidth( true );
  17          pColsAttrList->add( FSNS( XML_w, XML_space ),
  18                 OString::valueOf( sal_Int32( nWidth ) ).getStr( ) );
  19 @@ -3233,7 +3233,7 @@
  20              if ( n + 1 != nCols )
  21              {
  22                  USHORT nSpacing = rColumns[n]->GetRight( ) + rColumns[n + 1]->GetLeft( );
  23 -                pColAttrList->add( FSNS( XML_w, XML_w ),
  24 +                pColAttrList->add( FSNS( XML_w, XML_space ),
  25                      OString::valueOf( sal_Int32( nSpacing ) ).getStr( ) );
  26              }
  27