oox/source/export/drawingml.cxx | 5 +++++
oox/source/export/shapes.cxx | 1 +
sd/qa/unit/data/odp/tdf53970.odp |binary
3 files changed, 6 insertions(+)
New commits:
commit bc72514f90d90e1ab3fed8167663e835edf03508
Author: Tünde Tóth <toth.tu...@nisz.hu>
AuthorDate: Thu Mar 24 16:54:01 2022 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Tue Mar 29 12:59:55 2022 +0200
tdf#53970 PPTX: fix export of embedded media files
Embedded media files lost in documents created
with Impress after PPTX export.
Change-Id: I453b58f9cfa6a33653e9216fb82b66970a9ec31b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132095
Tested-by: Jenkins
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 912f3921d406..ff092b44641c 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1428,6 +1428,11 @@ void DrawingML::WriteMediaNonVisualProperties(const
css::uno::Reference<css::dra
aMimeType = "audio/mp4";
eMediaType = Relationship::AUDIO;
}
+ else if (aExtension.equalsIgnoreAsciiCase(".mp3"))
+ {
+ aMimeType = "audio/mp3";
+ eMediaType = Relationship::AUDIO;
+ }
}
OUString aVideoFileRelId;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 0b6b22031497..ea0e21f457d8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1662,6 +1662,7 @@ static const NameToConvertMapType& lcl_GetConverters()
{ "com.sun.star.drawing.EllipseShape" ,
&ShapeExport::WriteEllipseShape },
{ "com.sun.star.drawing.GraphicObjectShape" ,
&ShapeExport::WriteGraphicObjectShape },
{ "com.sun.star.drawing.LineShape" ,
&ShapeExport::WriteLineShape },
+ { "com.sun.star.drawing.MediaShape" ,
&ShapeExport::WriteGraphicObjectShape },
{ "com.sun.star.drawing.OpenBezierShape" ,
&ShapeExport::WriteOpenPolyPolygonShape },
{ "com.sun.star.drawing.PolyPolygonShape" ,
&ShapeExport::WriteClosedPolyPolygonShape },
{ "com.sun.star.drawing.PolyLineShape" ,
&ShapeExport::WriteOpenPolyPolygonShape },
diff --git a/sd/qa/unit/data/odp/tdf53970.odp b/sd/qa/unit/data/odp/tdf53970.odp
new file mode 100644
index 000000000000..0d48cf5d6601
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf53970.odp differ
