Kaydet (Commit) 57d97807 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst af80ccd5
...@@ -182,7 +182,7 @@ public class CharacterStyle extends TestCase { ...@@ -182,7 +182,7 @@ public class CharacterStyle extends TestCase {
XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); 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)); tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude));
return tEnv; return tEnv;
......
...@@ -176,7 +176,7 @@ public class ConditionalParagraphStyle extends TestCase { ...@@ -176,7 +176,7 @@ public class ConditionalParagraphStyle extends TestCase {
tEnv.addObjRelation("PoolStyle", oStyle); tEnv.addObjRelation("PoolStyle", oStyle);
XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); 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); String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude);
tEnv.addObjRelation("PropertyNames", names); tEnv.addObjRelation("PropertyNames", names);
......
...@@ -176,7 +176,7 @@ public class PageStyle extends TestCase { ...@@ -176,7 +176,7 @@ public class PageStyle extends TestCase {
tEnv.addObjRelation("FollowStyle", "Envelope"); tEnv.addObjRelation("FollowStyle", "Envelope");
XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); 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); String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude);
tEnv.addObjRelation("PropertyNames", names); tEnv.addObjRelation("PropertyNames", names);
......
...@@ -167,7 +167,7 @@ public class ParagraphStyle extends TestCase { ...@@ -167,7 +167,7 @@ public class ParagraphStyle extends TestCase {
tEnv.addObjRelation("PoolStyle", oStyle); tEnv.addObjRelation("PoolStyle", oStyle);
XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); 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); String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude);
tEnv.addObjRelation("PropertyNames", names); tEnv.addObjRelation("PropertyNames", names);
......
...@@ -51,10 +51,6 @@ sw.PageStyle::com::sun::star::style::XStyle ...@@ -51,10 +51,6 @@ sw.PageStyle::com::sun::star::style::XStyle
### i85584 ### ### i85584 ###
sw.CharacterStyle::com::sun::star::style::CharacterPropertiesAsian sw.CharacterStyle::com::sun::star::style::CharacterPropertiesAsian
### i25473 ###
sw.ConditionalParagraphStyle::com::sun::star::beans::XMultiPropertyStates
sw.ParagraphStyle::com::sun::star::beans::XMultiPropertyStates
### i34456 ### ### i34456 ###
sw.SwXTextDocument::com::sun::star::view::XPrintJobBroadcaster sw.SwXTextDocument::com::sun::star::view::XPrintJobBroadcaster
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment