diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-11-28 13:46:21 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-12-01 08:26:38 +0100 |
| commit | 4b0fa253a4540f5461397815d290586f9ddabe61 (patch) | |
| tree | c58c59871244dc75e538caeea40658303da00b8b /sw/qa/extras/ooxmlimport | |
| parent | 93357349ff1998b41ea1ebedf09dc1cc5da316f7 (diff) | |
tdf#136472 adjust ooxml import to handle first header/footer
Previously the ooxml import added a new page style when the first
header or footer was detected. Since then we gained support to add
first page header/footer in an existing page style so we don't need
to import it like that anymore.
This changes the import code so that the old complication to add
"First Page" page style is removed and it always just uses the
"Standard" page style for all 3 cases: first, left and right headers
and footers.
This also adjusts the existing tests to align with this change.
Change-Id: Ibf69597e6990499ac520ea9e323a5f73f429800b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157860
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 3a56fcd7d98f..5d5661f0fa0f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -178,7 +178,8 @@ xray ThisComponent.DrawPage(1).getByIndex(0).Anchor.PageStyleName // we want to test the textbox is on the first page (it was put onto another page without the fix), // use a small trick and instead of checking the page layout, check the page style uno::Reference<text::XTextContent> xTextContent(xShape, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("First Page"), getProperty<OUString>(xTextContent->getAnchor(), "PageStyleName")); + CPPUNIT_ASSERT_EQUAL(OUString("Standard"), getProperty<OUString>(xTextContent->getAnchor(), "PageStyleName")); + // TODO - This is not a reliable way to determine if something is on first page } CPPUNIT_TEST_FIXTURE(Test, testTdf129237) |