applied_patches/0837-cws-ooxml03-docx-sw-fix-nested-tables.diff

   1 Index: docxattributeoutput.cxx
   2 ===================================================================
   3 --- sw/source/filter/docx/docx-docxattributeoutput.cxx  (revision 271364)
   4 +++ sw/source/filter/docx/docx-docxattributeoutput.cxx  (working copy)
   5 @@ -153,15 +153,7 @@
   6      {
   7          sal_uInt32 nRow = pTextNodeInfo->getRow();
   8          sal_uInt32 nCell = pTextNodeInfo->getCell();
   9 -        sal_uInt32 nCurrentDepth = pTextNodeInfo->getDepth();
  10
  11 -        // Find the first inner table that does not start here
  12 -        sal_uInt32 nUntilDepth = nCurrentDepth;
  13 -        ww8::WW8TableNodeInfoInner::Pointer_t pInner;
  14 -        for ( ;
  15 -              nUntilDepth > 0 && ( pInner = pTextNodeInfo->getInnerForDepth( nUntilDepth ) )->getRow() == 0 && pInner->getCell() == 0;
  16 -              --nUntilDepth ) {}
  17 -
  18          // New cell/row?
  19          if ( m_nTableDepth > 0 && !m_bTableCellOpen )
  20          {
  21 @@ -177,12 +169,14 @@
  22              // Do we have to start the table?
  23              // [If we are at the rigth depth already, it means that we
  24              // continue the table cell]
  25 +            sal_uInt32 nCurrentDepth = pTextNodeInfo->getDepth();
  26 +
  27              if ( nCurrentDepth > m_nTableDepth )
  28              {
  29                  // Start all the tables that begin here
  30 -                for ( sal_uInt32 nDepth = nUntilDepth + 1; nDepth <= pTextNodeInfo->getDepth(); ++nDepth )
  31 +                for ( sal_uInt32 nDepth = m_nTableDepth + 1; nDepth <= pTextNodeInfo->getDepth(); ++nDepth )
  32                  {
  33 -                    pInner = pTextNodeInfo->getInnerForDepth( nDepth );
  34 +                    ww8::WW8TableNodeInfoInner::Pointer_t pInner( pTextNodeInfo->getInnerForDepth( nDepth ) );
  35
  36                      StartTable( pInner );
  37                      StartTableRow( pInner );