sd/source/filter/eppt/pptx-epptooxml.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 3dbc0bf907fb2872238746776532f2e2602bfbfd Author: Mark Hung <[email protected]> Date: Wed Jun 22 01:40:08 2016 +0800 tdf92852 correct layout type mapping for 'Title, 6 Content'. While creating slideLayouts, a number of layouts are iterated and master pages are created temporarily. The layout property of the slide is set based on the mapped value. Old value (33) seems to be typo, and is not accessible by users via UI. The layout contains a graphical object and hence generates unexpected image in the exported PPTX document. Change-Id: I53af11058994a48ed6239f57f9b2b95484c76411 Reviewed-on: https://gerrit.libreoffice.org/26559 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 3589abf..8236a99 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -153,7 +153,7 @@ static const PPTXLayoutInfo aLayoutInfo[LAYOUT_SIZE] = { { 16, "Title, 2 Content over Content", "twoObjOverTx" }, // not exactly, but close { 14, "Title, Content over Content", "objOverTx" }, // not exactly, but close { 18, "Title, 4 Content", "fourObj" }, - { 33, "Title, 6 Content", "blank" } // not defined => blank + { 34, "Title, 6 Content", "blank" } // not defined => blank }; int PowerPointExport::GetPPTXLayoutId( int nOffset ) @@ -193,7 +193,7 @@ int PowerPointExport::GetPPTXLayoutId( int nOffset ) case 32: nId = LAYOUT_CENTERED_TEXT; break; - case 33: + case 34: nId = LAYOUT_TITLE_6CONTENT; break; case 20:
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
