diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-26 22:04:27 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-05-07 16:30:35 +0200 |
commit | 7a8ed362eb163ac15a000ba1cfc74b58315800a1 (patch) | |
tree | 79c1543ac1edd99a7cf3fe7f26573828b4b2be1e /qadevOOo/tests/java/ifc | |
parent | 3e7bea5ece847dcd7234f7e7fd310b1daab0eec1 (diff) |
[API CHANGE] revert and deprecate *BackGraphicURL add *BackGraphic
*BackGraphicURL include the following properties:
- BackGraphicURL
- FooterBackGraphicURL
- HeaderBackGraphicURL
- ParaBackGraphicURL
This were removed, but for backwards compatibility this commit
adds them back again and depreactes them in the UNO API. The
behaviour also changes as internal vnd.sun.star.GraphicObject
scheme URLs aren't supported so this properties can only be set
and only if a external URL is provided. If getting such a property
then a RuntimeException will be thrown.
[ Miklos Vajna: fixed up sw/qa and writerfilter bits. ]
Change-Id: If60011837da96197b576bfe2671ecafccad736c7
Reviewed-on: https://gerrit.libreoffice.org/53511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'qadevOOo/tests/java/ifc')
-rw-r--r-- | qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 697f5d0c7c83..1d169539413d 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -19,8 +19,10 @@ package ifc.beans; import java.util.HashSet; +import java.util.ArrayList; import java.util.Set; import java.util.StringTokenizer; +import java.util.Arrays; import lib.MultiMethodTest; import lib.Status; @@ -132,17 +134,30 @@ public class _XMultiPropertySet extends MultiMethodTest { boolean bResult = true; Property[] properties = propertySetInfo.getProperties(); - String[] allnames = new String[properties.length]; + + ArrayList<String> allFilteredNames = new ArrayList<String>(); + ArrayList<Property> allFilteredProperties = new ArrayList<Property>(); + + String[] skipNames = (String[]) tEnv.getObjRelation("SkipProperties"); + for (int i = 0; i < properties.length; i++) { - allnames[i] = properties[i].Name; + if (skipNames == null || !Arrays.asList(skipNames).contains(properties[i].Name)) + { + allFilteredNames.add(properties[i].Name); + allFilteredProperties.add(properties[i]); + } } - values = oObj.getPropertyValues(allnames); + String[] arrayAllFilteredNames = allFilteredNames.toArray(new String[allFilteredNames.size()]); + + values = oObj.getPropertyValues(arrayAllFilteredNames); bResult &= values!=null; tRes.tested("getPropertyValues()", bResult) ; - getPropsToTest(properties); + Property[] arrayFilteredProperties = allFilteredProperties.toArray(new Property[allFilteredProperties.size()]); + + getPropsToTest(arrayFilteredProperties); } /** @@ -346,5 +361,3 @@ public class _XMultiPropertySet extends MultiMethodTest { disposeEnvironment(); } } - - |