diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-12-03 23:23:23 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-12-04 00:57:46 +0100 |
commit | 57d97807f704883b1631323da254163e187b2dc5 (patch) | |
tree | 42ed59857233f5acb8280d9518c567ba69d8a03b | |
parent | af80ccd5b6206cfce63cf3f98781f09ed6d79f7f (diff) |
i#25473: this was fixed by previous commit, so enable...
...those tests again. Also there does not appear to be a reason to
exclude MAYBEVOID properties.
Change-Id: Ic73adb8800aee7f65e86394cecfe13b7b24eed13
-rw-r--r-- | qadevOOo/tests/java/mod/_sw/CharacterStyle.java | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sw/PageStyle.java | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sw/ParagraphStyle.java | 2 | ||||
-rw-r--r-- | sw/qa/unoapi/knownissues.xcl | 4 |
5 files changed, 4 insertions, 8 deletions
diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java index da479a855640..9a8e900dc6c5 100644 --- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java +++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java @@ -182,7 +182,7 @@ public class CharacterStyle extends TestCase { XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); - short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; + short exclude = PropertyAttribute.READONLY; tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java index e5d53a4eef6b..5d71f1f7bf17 100644 --- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java @@ -176,7 +176,7 @@ public class ConditionalParagraphStyle extends TestCase { tEnv.addObjRelation("PoolStyle", oStyle); XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); - short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; + short exclude = PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index 9d41a288b57e..2955e03500e0 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -176,7 +176,7 @@ public class PageStyle extends TestCase { tEnv.addObjRelation("FollowStyle", "Envelope"); XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); - short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; + short exclude = PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index d86d5bcb829e..0c9110f521c8 100644 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -167,7 +167,7 @@ public class ParagraphStyle extends TestCase { tEnv.addObjRelation("PoolStyle", oStyle); XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); - short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; + short exclude = PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); diff --git a/sw/qa/unoapi/knownissues.xcl b/sw/qa/unoapi/knownissues.xcl index e3f122db73b4..fef6d56bf102 100644 --- a/sw/qa/unoapi/knownissues.xcl +++ b/sw/qa/unoapi/knownissues.xcl @@ -51,10 +51,6 @@ sw.PageStyle::com::sun::star::style::XStyle ### i85584 ### sw.CharacterStyle::com::sun::star::style::CharacterPropertiesAsian -### i25473 ### -sw.ConditionalParagraphStyle::com::sun::star::beans::XMultiPropertyStates -sw.ParagraphStyle::com::sun::star::beans::XMultiPropertyStates - ### i34456 ### sw.SwXTextDocument::com::sun::star::view::XPrintJobBroadcaster |