Kaydet (Commit) dc8a8248 authored tarafından Miklos Vajna's avatar Miklos Vajna

tdf#121664 DOCX import: fix lack of line numbering reset on page break

Regression from commit d6206295 (Use
constants for ST_LineNumberRestart values, 2014-10-01) where I forgot to
adapt the constructor's initializer list to also use the new constants.

Change-Id: I7113d23cceb3a00f0d466b63c99a18bf3dfd0ee3
Reviewed-on: https://gerrit.libreoffice.org/64489
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 3915570a
...@@ -51,6 +51,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") ...@@ -51,6 +51,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx")
CPPUNIT_ASSERT_EQUAL(2, getPages()); CPPUNIT_ASSERT_EQUAL(2, getPages());
} }
DECLARE_OOXMLIMPORT_TEST(testTdf121664, "tdf121664.docx")
{
uno::Reference<text::XLineNumberingProperties> xLineNumbering(mxComponent, uno::UNO_QUERY);
CPPUNIT_ASSERT(xLineNumbering.is());
// Without the accompanying fix in place, numbering did not restart on the
// second page.
CPPUNIT_ASSERT(
getProperty<bool>(xLineNumbering->getLineNumberingProperties(), "RestartAtEachPage"));
}
DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx") DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx")
{ {
// sectPr element that is child element of body must be the last child. However, Word accepts it // sectPr element that is child element of body must be the last child. However, Word accepts it
......
...@@ -396,7 +396,7 @@ SectionPropertyMap::SectionPropertyMap( bool bIsFirstSection ) ...@@ -396,7 +396,7 @@ SectionPropertyMap::SectionPropertyMap( bool bIsFirstSection )
, m_nDxtCharSpace( 0 ) , m_nDxtCharSpace( 0 )
, m_bGridSnapToChars( true ) , m_bGridSnapToChars( true )
, m_nLnnMod( 0 ) , m_nLnnMod( 0 )
, m_nLnc( 0 ) , m_nLnc(NS_ooxml::LN_Value_ST_LineNumberRestart_newPage)
, m_ndxaLnn( 0 ) , m_ndxaLnn( 0 )
, m_nLnnMin( 0 ) , m_nLnnMin( 0 )
, m_bDefaultHeaderLinkToPrevious( true ) , m_bDefaultHeaderLinkToPrevious( true )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment