[Libreoffice-commits] core.git: svx/source

[Michael Stahl (via logerrit)]

 svx/source/xml/xmlgrhlp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d407019a69773156b0bb9ef0b4a775f67830949e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed May 20 15:06:44 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri May 22 11:18:10 2020 +0200

    tdf#41995: sxx: ODF export: save SVG to ODF 1.2 as well
    
    ... and SVM into ODF 1.2 Extended (compatibility mode).
    
    Change-Id: I2056ddac40570fdf69178349ff546cd313709b25
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94575
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 18595a164d8d..f9839c38b8ed 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -657,7 +657,8 @@ OUString SvXMLGraphicHelper::implSaveGraphic(css::uno::Reference<css::graphic::X
                     // into an svm. slight catch22 here, since strict ODF
                     // conformance _recommends_ svg - then again, most old
                     // ODF consumers are believed to be OOo
-                    if (SvtSaveOptions().GetODFSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012)
+                    if (SvtSaveOptions().GetODFSaneDefaultVersion() < SvtSaveOptions::ODFSVER_012
+                        || SvtSaveOptions().GetODFSaneDefaultVersion() == SvtSaveOptions::ODFSVER_012_EXT_COMPAT)
                     {
                         bUseGfxLink = false;
                         aExtension = ".svm";