summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/util/utils.java
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-04-26 22:04:27 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-05-07 16:30:35 +0200
commit7a8ed362eb163ac15a000ba1cfc74b58315800a1 (patch)
tree79c1543ac1edd99a7cf3fe7f26573828b4b2be1e /qadevOOo/runner/util/utils.java
parent3e7bea5ece847dcd7234f7e7fd310b1daab0eec1 (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/runner/util/utils.java')
-rw-r--r--qadevOOo/runner/util/utils.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index a0f525ab8339..1e6901fca1d2 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -30,6 +30,7 @@ import java.net.Socket;
import java.net.ServerSocket;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
import com.sun.star.awt.XToolkitExperimental;
import com.sun.star.beans.XPropertySet;
@@ -577,16 +578,19 @@ public class utils {
* @param props The instance of XPropertySet
* @param includePropertyAttribute Properties without these attributes are filtered and will not be returned.
* @param excludePropertyAttribute Properties with these attributes are filtered and will not be returned.
+ * @param array of string names of properties that will be skipped
* @return A String array with all property names.
* @see com.sun.star.beans.XPropertySet
* @see com.sun.star.beans.Property
* @see com.sun.star.beans.PropertyAttribute
*/
public static String[] getFilteredPropertyNames(XPropertySet props, short includePropertyAttribute,
- short excludePropertyAttribute) {
+ short excludePropertyAttribute, String[] skipList) {
Property[] the_props = props.getPropertySetInfo().getProperties();
ArrayList<String> l = new ArrayList<String>();
for (int i = 0; i < the_props.length; i++) {
+ if (Arrays.asList(skipList).contains(the_props[i].Name))
+ continue;
boolean exclude = ((the_props[i].Attributes & excludePropertyAttribute) != 0);
boolean include = (includePropertyAttribute == 0) ||
((the_props[i].Attributes & includePropertyAttribute) != 0);