summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rwxr-xr-xsw/qa/extras/ooxmlexport/data/tdf104061_tableSectionColumns.docxbin0 -> 103497 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport9.cxx5
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx6
3 files changed, 7 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf104061_tableSectionColumns.docx b/sw/qa/extras/ooxmlexport/data/tdf104061_tableSectionColumns.docx
new file mode 100755
index 000000000000..b5d2a4fee9ed
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf104061_tableSectionColumns.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 89bc9d9429fb..d7cbdf77030a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -67,6 +67,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf41542_borderlessPadding, "tdf41542_borderlessPad
CPPUNIT_ASSERT_EQUAL( 3, getPages() );
}
+DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
+{
+ CPPUNIT_ASSERT_MESSAGE("There should be two or three pages", getPages() <= 3 );
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf46940_dontEquallyDistributeColumns, "tdf46940_dontEquallyDistributeColumns.docx")
{
uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index f12d5c7a3dfc..e4d4a247e4c9 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2885,9 +2885,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
// here the section break
sal_uLong nRstLnNum = 0;
const SfxItemSet* pSet;
- if ( rNd.IsTableNode() )
- pSet = &rNd.GetTableNode()->GetTable().GetFrameFormat()->GetAttrSet();
- else if ( rNd.IsContentNode() )
+ if ( rNd.IsContentNode() )
{
pSet = &rNd.GetContentNode()->GetSwAttrSet();
nRstLnNum = static_cast<const SwFormatLineNumber&>(pSet->Get(
@@ -2899,7 +2897,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
if ( pSet && NoPageBreakSection( pSet ) )
pSet = nullptr;
- if ( !pSet || rNd.IsTableNode() )
+ if ( !pSet )
{
// new Section with no own PageDesc/-Break
// -> write follow section break;