sc/qa/unit/scshapetest.cxx | 8 -------
sc/qa/unit/uicalc/uicalc.cxx | 4 ---
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 13 ++++++++++++
3 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 1d2830b936d02ed0882d9cc1234ddafb3bb7e8dd
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Mon May 22 15:57:38 2023 +0200
Commit: Regina Henschel <rb.hensc...@t-online.de>
CommitDate: Mon May 22 19:40:45 2023 +0200
tdf#155271 add drawooo:display to libreoffice-schema
Commit 33ef17ed had introduced attribute drawooo:display at 2010-03-02.
The entry in libreoffice-schema.rng was missing and therefore
validation in unit tests fails, when this attribute occures.
The attribute is written in case an object in Calc is hidden by hiding
the cell to which it is anchored, for example. The attribute belongs to
properties 'Visibile' and 'Printable' in 'Shape Service' in API.
Change-Id: Id3d2e7984aed146fca9e2819eb183d7d7bfaf701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152119
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index b658e44f03d5..b5083544f114 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -890,10 +890,6 @@ CPPUNIT_TEST_FIXTURE(ScShapeTest, testTdf115655_HideDetail)
pViewShell->GetViewData().GetDispatcher().Execute(SID_OUTLINE_HIDE);
CPPUNIT_ASSERT_MESSAGE("Collapse: Image should not be visible",
!pObj->IsVisible());
- // FIXME: validation fails with
- // Error: unexpected attribute "drawooo:display"
- skipValidation();
-
// Save and reload
saveAndReload("calc8");
@@ -1191,10 +1187,6 @@ CPPUNIT_TEST_FIXTURE(ScShapeTest,
testTdf154821_shape_in_group)
pViewShell->GetViewData().SetCurY(1);
pViewShell->GetViewData().GetDispatcher().Execute(SID_OUTLINE_HIDE);
- // Save and reload
- // FIXME: validation fails with
- // Error: unexpected attribute "drawooo:display"
- skipValidation();
saveAndReload("calc8");
// Expand the lower group
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index fae0b389584e..daccc08c2600 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -904,10 +904,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf144244)
CPPUNIT_ASSERT_EQUAL(OUString("x"), pDoc->GetString(ScAddress(0, 0, 0)));
- // FIXME: validation fails with
- // Error: unexpected attribute "drawooo:display"
- skipValidation();
-
// Without the fix in place, this test would have crashed
saveAndReload("calc8");
pModelObj = comphelper::getFromUnoTunnel<ScModelObj>(mxComponent);
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 0436448644bb..2466b797933c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3620,4 +3620,17 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:element>
</rng:define>
+ <!-- TODO no proposal, belongs to commit 33ef17ed, 2010-03-02 -->
+ <rng:define name="common-draw-shape-with-styles-attlist"
combine="interleave">
+ <rng:optional>
+ <rng:attribute name="drawooo:display">
+ <rng:choice>
+ <rng:value>always</rng:value>
+ <rng:value>screen</rng:value>
+ <rng:value>printer</rng:value>
+ <rng:value>none</rng:value>
+ </rng:choice>
+ </rng:attribute>
+ </rng:optional>
+ </rng:define>
</rng:grammar>
