sd/qa/unit/sdmodeltestbase.hxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ec4c4cbc3d761c51375136db561f44ae7c5157b0
Author: Mark Hung <mark...@gmail.com>
AuthorDate: Sat Jul 28 13:13:32 2018 +0800
Commit: Mark Hung <mark...@gmail.com>
CommitDate: Tue Jul 31 13:44:10 2018 +0200
sd/qa: fix saveAndReload with PPT format.
UIName instead of Type were used as TypeName to initialize SfxFilter,
and caused problems in DrawDocShell::ConvertTo() when saving PPT format.
Change-Id: Iaffe7025a163c7520442c96921e8540903284ebf
Reviewed-on: https://gerrit.libreoffice.org/58208
Tested-by: Jenkins
Reviewed-by: Mark Hung <mark...@gmail.com>
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 526d1d79edff..5c90c0a6b95f 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -66,19 +66,19 @@ struct FileFormat
Taken from filter/source/config/fragments/filters/ too:
pName: The file extension.
pFilterName: <node oor:Name="...">
-pTypeName: <prop oor:Name="UIName">...</prop>
+pTypeName: <prop oor:Name="Type">...</prop>
nFormatType: <prop oor:name="Flags">...</prop>
*/
FileFormat aFileFormats[] =
{
{ "odp", "impress8", "impress8", "", ODP_FORMAT_TYPE },
- { "ppt", "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003",
"sdfilt", PPT_FORMAT_TYPE },
+ { "ppt", "MS PowerPoint 97", "impress_MS_PowerPoint_97", "sdfilt",
PPT_FORMAT_TYPE },
{ "pptx", "Impress Office Open XML", "Office Open XML Presentation", "",
PPTX_FORMAT_TYPE },
{ "html", "graphic_HTML", "graphic_HTML", "", HTML_FORMAT_TYPE },
{ "pdf", "draw_pdf_import", "pdf_Portable_Document_Format", "",
PDF_FORMAT_TYPE },
- { "fodg", "OpenDocument Drawing Flat XML", "Flat XML ODF Drawing", "",
FODG_FORMAT_TYPE },
- { "fodp", "OpenDocument Presentation Flat XML", "Flat XML ODF
Presentation", "", FODP_FORMAT_TYPE },
- { "sxi", "StarOffice XML (Impress)", "OpenOffice.org 1.0 Presentation",
"", SXI_FORMAT_TYPE },
+ { "fodg", "OpenDocument Drawing Flat XML", "draw_ODG_FlatXML", "",
FODG_FORMAT_TYPE },
+ { "fodp", "OpenDocument Presentation Flat XML", "impress_ODP_FlatXML", "",
FODP_FORMAT_TYPE },
+ { "sxi", "StarOffice XML (Impress)", "impress_StarOffice_XML_Impress",
"", SXI_FORMAT_TYPE },
{ "odg", "draw8", "draw8", "", ODP_FORMAT_TYPE },
{ "pptm", "Impress MS PowerPoint 2007 XML VBA", "MS PowerPoint 2007 XML
VBA", "", PPTM_FORMAT_TYPE },
{ nullptr, nullptr, nullptr, nullptr, SfxFilterFlags::NONE }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
