summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-04-28 18:04:14 +0200
committerJan Holesovsky <kendy@collabora.com>2021-01-07 16:32:54 +0100
commit2f16880998e8b396231b8dc6e41206b93aedc65b (patch)
treef802cceb3290cd96b44f7ac87f7a1c476e5d3e34 /sw
parentd59afaf9762f808333b3819649cd57b3326d45a7 (diff)
officecfg,unotools,cui: add ODF 1.2 Extended / ODF 1.3 versions
... to configuration and UI. The new default is ODF 1.3 Extended, which is now ODFVER_LATEST and stored as value "3" in configuration. Adapt a few places related to DocumentDigitalSignatures etc. to new default. Change-Id: I420da4f7787cc864c6bd88470d61b146b9399aa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93177 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/fodfexport/fodfexport.cxx8
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx b/sw/qa/extras/fodfexport/fodfexport.cxx
index c79d0f35b420..4443bfbb9e2a 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -34,9 +34,9 @@ DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
if (xmlDocPtr pXmlDoc = parseExportedFile())
{
assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
- "draw:image[@loext:mime-type='image/x-vclgraphic']");
+ "draw:image[@draw:mime-type='image/x-vclgraphic']");
assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
- "draw:image[@loext:mime-type='image/png']");
+ "draw:image[@draw:mime-type='image/png']");
}
}
@@ -47,9 +47,9 @@ DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
if (xmlDocPtr pXmlDoc = parseExportedFile())
{
assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
- "draw:image[@loext:mime-type='image/x-vclgraphic']");
+ "draw:image[@draw:mime-type='image/x-vclgraphic']");
assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
- "draw:image[@loext:mime-type='image/png']");
+ "draw:image[@draw:mime-type='image/png']");
}
}
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 5ef2d7cd0b38..fb34e241c145 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2030,7 +2030,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt")
if (xmlDocPtr pXmlDoc = parseExport("content.xml"))
{
// Original image (svg)
- assertXPath(pXmlDoc, "/office:document-content/office:body/office:text/text:p/draw:frame/draw:image[@loext:mime-type='image/svg+xml']");
+ assertXPath(pXmlDoc, "/office:document-content/office:body/office:text/text:p/draw:frame/draw:image[@draw:mime-type='image/svg+xml']");
}
}