diff options
| author | Balazs Varga <balazs.varga.extern@allotropia.de> | 2023-12-03 23:41:01 +0100 |
|---|---|---|
| committer | Balazs Varga <balazs.varga.extern@allotropia.de> | 2023-12-18 15:10:54 +0100 |
| commit | bff76421e234df7246a7f49c71a11432f86e09d1 (patch) | |
| tree | 3eae1dc2ea775e03759c2e54a6d0784559c6147f /oox | |
| parent | 5aba83e7c1bc177270b585253ef27e6995f41f23 (diff) | |
tdf#157740 FILESAVE PPTX: fix explosion of the number of master slides
- Export correctly the "supported" master slides with the actual slides names.
- Set SlideLayout property at ODF import as well for MasterSlides layout type.
- When we copy a slide with the master slide also copy the SlideLayout property
value as well.
Change-Id: Idb6b88ebe87a83818d8eb27a1fa087652a002c0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160290
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index cd42ef6bcdb6..a4225f95cd43 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -105,6 +105,7 @@ sal_Int16 SlidePersist::getLayoutFromValueToken() const case XML_titleOnly: nLayout = 19; break; case XML_twoObj: case XML_twoColTx: nLayout = 3; break; + case XML_twoObjAndObj: case XML_twoObjAndTx: nLayout = 15; break; case XML_twoObjOverTx: nLayout = 16; break; case XML_tx: nLayout = 1; break; @@ -112,19 +113,18 @@ sal_Int16 SlidePersist::getLayoutFromValueToken() const case XML_txAndClipArt: nLayout = 6; break; case XML_txAndMedia: nLayout = 6; break; case XML_txAndObj: nLayout = 10; break; + case XML_objAndTwoObj: case XML_txAndTwoObj: nLayout = 12; break; case XML_txOverObj: nLayout = 17; break; case XML_vertTitleAndTx: nLayout = 22; break; case XML_vertTitleAndTxOverChart: nLayout = 21; break; case XML_vertTx: nLayout = 23; break; + case XML_objOnly: nLayout = 32; break; case XML_twoTxTwoObj: - case XML_twoObjAndObj: case XML_objTx: case XML_picTx: case XML_secHead: - case XML_objOnly: - case XML_objAndTwoObj: case XML_mediaAndTx: case XML_dgm: case XML_cust: |