include/tools/json_writer.hxx | 2 +- sd/source/filter/xml/sdxmlwrp.cxx | 21 ++++++--------------- tools/source/misc/json_writer.cxx | 2 +- vcl/inc/pdf/objectcopier.hxx | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-)
New commits: commit 94eb4f9b19b13f3548a232ec0a1f4b50bcb55d94 Author: Miklos Vajna <[email protected]> AuthorDate: Thu Jun 18 21:03:45 2020 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Jun 19 09:06:54 2020 +0200 sd: remove dead OOo1.0 file format export This is unused code since commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7 (Remove OOo1.0 file formats from Save As., 2013-11-10). Reorder the array so the OOoXML && export case is at the end, then remove the unused entries. Change-Id: I3ac13280e025370a10bf9bf9aab380812e6e385c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96628 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index c129d35d0974..3980efc1cd52 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -106,16 +106,6 @@ char const sXML_import_draw_content_oasis_service[] = "com.sun.star.comp.Draw.XM char const sXML_import_draw_settings_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisSettingsImporter"; // OOo -char const sXML_export_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaExporter"; -char const sXML_export_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesExporter"; -char const sXML_export_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentExporter"; -char const sXML_export_impress_settings_ooo_service[] = "com.sun.star.comp.Impress.XMLSettingsExporter"; - -char const sXML_export_draw_meta_ooo_service[] = "com.sun.star.comp.Draw.XMLMetaExporter"; -char const sXML_export_draw_styles_ooo_service[] = "com.sun.star.comp.Draw.XMLStylesExporter"; -char const sXML_export_draw_content_ooo_service[] = "com.sun.star.comp.Draw.XMLContentExporter"; -char const sXML_export_draw_settings_ooo_service[] = "com.sun.star.comp.Draw.XMLSettingsExporter"; - char const sXML_import_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaImporter"; char const sXML_import_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesImporter"; char const sXML_import_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentImporter"; @@ -146,20 +136,21 @@ struct XML_SERVICES static XML_SERVICES const * getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) { + // Expect that export always sets nStoreVer to SOFFICE_FILEFORMAT_8. + assert(bImport || nStoreVer != SOFFICE_FILEFORMAT_60); + static XML_SERVICES const gServices[] = { - { sXML_export_impress_meta_oasis_service, sXML_export_impress_styles_oasis_service, sXML_export_impress_content_oasis_service, sXML_export_impress_settings_oasis_service }, - { sXML_export_draw_meta_oasis_service, sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service, sXML_export_draw_settings_oasis_service }, { sXML_import_impress_meta_oasis_service, sXML_import_impress_styles_oasis_service, sXML_import_impress_content_oasis_service, sXML_import_impress_settings_oasis_service }, { sXML_import_draw_meta_oasis_service, sXML_import_draw_styles_oasis_service, sXML_import_draw_content_oasis_service, sXML_import_draw_settings_oasis_service }, + { sXML_export_impress_meta_oasis_service, sXML_export_impress_styles_oasis_service, sXML_export_impress_content_oasis_service, sXML_export_impress_settings_oasis_service }, + { sXML_export_draw_meta_oasis_service, sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service, sXML_export_draw_settings_oasis_service }, - { sXML_export_impress_meta_ooo_service, sXML_export_impress_styles_ooo_service, sXML_export_impress_content_ooo_service, sXML_export_impress_settings_ooo_service }, - { sXML_export_draw_meta_ooo_service, sXML_export_draw_styles_ooo_service, sXML_export_draw_content_ooo_service, sXML_export_draw_settings_ooo_service }, { sXML_import_impress_meta_ooo_service, sXML_import_impress_styles_ooo_service, sXML_import_impress_content_ooo_service, sXML_import_impress_settings_ooo_service }, { sXML_import_draw_meta_ooo_service, sXML_import_draw_styles_ooo_service, sXML_import_draw_content_ooo_service, sXML_import_draw_settings_ooo_service }, }; - return &gServices[ (bImport ? 2 : 0) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ]; + return &gServices[ (bImport ? 0 : 2) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ]; } commit 1c07dbe96600d99f55f2d14d79880d1cd24ef017 Author: Andrea Gelmini <[email protected]> AuthorDate: Thu Jun 18 22:48:42 2020 +0200 Commit: Julien Nabet <[email protected]> CommitDate: Fri Jun 19 09:06:38 2020 +0200 Fix typos Change-Id: I887a86506b700a21b56bbc66d8b3b2e1bcec0da5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96651 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx index 95a567ea505c..c1438783de78 100644 --- a/include/tools/json_writer.hxx +++ b/include/tools/json_writer.hxx @@ -44,7 +44,7 @@ public: void put(const char* pPropName, const char* pPropVal); void put(const char*, int); - /** Hands ownership of the the underlying storage buffer to the caller, + /** Hands ownership of the underlying storage buffer to the caller, * after this no more document modifications may be written. */ char* extractData(); diff --git a/tools/source/misc/json_writer.cxx b/tools/source/misc/json_writer.cxx index 12ff5eb37641..81b22e92a2d1 100644 --- a/tools/source/misc/json_writer.cxx +++ b/tools/source/misc/json_writer.cxx @@ -234,7 +234,7 @@ void JsonWriter::addCommaBeforeField() } } -/** Hands ownership of the the underlying storage buffer to the caller, +/** Hands ownership of the underlying storage buffer to the caller, * after this no more document modifications may be written. */ char* JsonWriter::extractData() { diff --git a/vcl/inc/pdf/objectcopier.hxx b/vcl/inc/pdf/objectcopier.hxx index b99fbb4886b3..5372019a6fe9 100644 --- a/vcl/inc/pdf/objectcopier.hxx +++ b/vcl/inc/pdf/objectcopier.hxx @@ -25,7 +25,7 @@ namespace filter class PDFObjectElement; } -/// Copies objects from one PDF file into an other one. +/// Copies objects from one PDF file into another one. class VCL_DLLPUBLIC PDFObjectCopier { PDFObjectContainer& m_rContainer; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
