diff options
| author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2021-04-25 15:59:39 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-23 11:50:15 +0200 |
| commit | 6c9c2ab6437ca28e8deea4ae492bb429165aa243 (patch) | |
| tree | 7abb8a34834d1fc368120c6a7734453877e0e70b /sd | |
| parent | 669926c70db7837f698b9aaa94afeaf70d242c18 (diff) | |
tdf#59323: pptx import: import footer fields as properties
Makes footer, slidenum and datetime placeholders that are inserted to
the slides themselves on pptx files imported as slide properties if it
is possible to do so without losing information (style, position etc.)
If that is not the case and the footers have some special style applied
to them that isn't inherited from master slides, fallbacks to the current
implementation importing them as shapes.
Also since the default way of displaying slide footers in LO use the
respective text fields on master slides, information in master/layout
slide datetime and footer placeholders respectively get replaced with
<date/time> text fields and <footer> text fields.
Change-Id: Ib2f7d18103b62c0c9a8453e01cfd2fd1aa1d39af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117008
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117626
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/numfmt.pptx | bin | 41105 -> 41390 bytes | |||
| -rw-r--r-- | sd/qa/unit/data/pptx/slidenum_field.pptx | bin | 34130 -> 32715 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/sd/qa/unit/data/pptx/numfmt.pptx b/sd/qa/unit/data/pptx/numfmt.pptx Binary files differindex aca6927101d6..e5f0f5cf151a 100644 --- a/sd/qa/unit/data/pptx/numfmt.pptx +++ b/sd/qa/unit/data/pptx/numfmt.pptx diff --git a/sd/qa/unit/data/pptx/slidenum_field.pptx b/sd/qa/unit/data/pptx/slidenum_field.pptx Binary files differindex f3c184056905..3388568831d7 100644 --- a/sd/qa/unit/data/pptx/slidenum_field.pptx +++ b/sd/qa/unit/data/pptx/slidenum_field.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 5e09f0a2996f..f06af50d5110 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1822,7 +1822,7 @@ void SdImportTest::testTdf95932() sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf95932.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); - SdrObject *const pObj = pPage->GetObj(2); + SdrObject *const pObj = pPage->GetObj(1); CPPUNIT_ASSERT(pObj); const XFillStyleItem& rStyleItem = dynamic_cast<const XFillStyleItem&>( |