schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 10 ++++++++++
sw/qa/extras/inc/swmodeltestbase.hxx | 10 ++++++++--
sw/qa/extras/odfexport/odfexport.cxx | 12 ++----------
3 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 720d53ee663edf26b3e5bb29560c89bcc42aed3a
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu Jun 28 16:05:30 2018 +0200
schema,sw: enable ODF validation in all sw tests
Validate every ODT file that is exported via "reload" or "save".
Change-Id: I010965191159605924b89fe21b0b3d47123c13bd
Reviewed-on: https://gerrit.libreoffice.org/56607
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 49cff237cd1b..0154bc001dda 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -2263,6 +2263,16 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
+ <!-- TODO no proposal -->
+ <rng:define name="draw-custom-shape-attlist" combine="interleave">
+ <rng:ref name="common-draw-rel-size-attlist"/>
+ </rng:define>
+
+ <!-- TODO no proposal -->
+ <rng:define name="style-page-layout-properties-attlist" combine="interleave">
+ <rng:ref name="style-graphic-fill-properties-attlist"/>
+ </rng:define>
+
<!-- just a test-case for user-defined attributes, move along, nothing to
see here... -->
<rng:define name="style-table-cell-properties-attlist" combine="interleave">
<rng:optional>
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 40a77a8e8024..ea3ce849a623 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -796,7 +796,8 @@ protected:
{
CPPUNIT_ASSERT_MESSAGE("Password set but not requested",
xInteractionHandler->wasPasswordRequested());
}
- if (mustValidate(filename))
+ if (mustValidate(filename) || aFilterName == "writer8"
+ || aFilterName == "OpenDocument Text Flat XML")
{
if(aFilterName == "Office Open XML Text")
{
@@ -806,7 +807,6 @@ protected:
else if(aFilterName == "writer8"
|| aFilterName == "OpenDocument Text Flat XML")
{
- // still a few validation errors
validate(maTempFile.GetFileName(), test::ODF);
}
else if(aFilterName == "MS Word 97")
@@ -838,6 +838,12 @@ protected:
if (!maFilterOptions.isEmpty())
aMediaDescriptor["FilterOptions"] <<= maFilterOptions;
xStorable->storeToURL(rTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+ // TODO: for now, validate only ODF here
+ if (aFilterName == "writer8"
+ || aFilterName == "OpenDocument Text Flat XML")
+ {
+ validate(rTempFile.GetFileName(), test::ODF);
+ }
}
void finish()
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index e6f544da51c2..48ac63b27271 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -52,17 +52,9 @@ public:
return OString(filename).endsWith(".odt");
}
- bool mustValidate(const char* filename) const override
+ bool mustValidate(const char* /*filename*/) const override
{
- std::vector<const char*> aBlacklist = {
- // These are known problems, they should be fixed one by one.
- "fdo86963.odt",
- "shape-relsize.odt",
- "fdo60769.odt",
- "fdo38244.odt"
- };
-
- return std::find(aBlacklist.begin(), aBlacklist.end(), filename) ==
aBlacklist.end();
+ return true;
}
virtual std::unique_ptr<Resetter> preTest(const char* pFilename) override
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
