set_soenv.in | 2 +-
sw/qa/complex/checkColor/CheckChangeColor.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 5cf449daa11726dc29f20f23f1e74b2564dc0551
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jan 18 20:59:35 2017 +0000
Fix a main/sw subsequent test. The BackColor of a page style is irrelevant
since we only want to test changing it, and it only seems to have meaning
when the FillStyle is color, which it isn't.
Patch by: me
diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java
b/sw/qa/complex/checkColor/CheckChangeColor.java
index 949e420..07b59bd 100644
--- a/sw/qa/complex/checkColor/CheckChangeColor.java
+++ b/sw/qa/complex/checkColor/CheckChangeColor.java
@@ -63,9 +63,6 @@ public class CheckChangeColor {
XPropertySet xPropertySet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class,
xPageStyleCollection.getByName("Standard") );
assertEquals(
- "BackColor", new Any(Type.LONG, 0xFFFFFFFF),
- Any.complete(xPropertySet.getPropertyValue("BackColor")));
- assertEquals(
"IsLandscape", new Any(Type.BOOLEAN, false),
Any.complete(xPropertySet.getPropertyValue("IsLandscape")));
assertEquals(
commit 70af00b96ab2d5914dbe06e74630fc1ffabdd4ae
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jan 18 20:58:11 2017 +0000
Add a ./configure option for Hamcrest once again, this time optional,
so that newer versions of JUnit can work.
Patch by: me
diff --git a/set_soenv.in b/set_soenv.in
index 7db8d39..c79671b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1641,7 +1641,7 @@ ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
-# ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
+ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" );
ToFile( "FLUTE_JAR", "@FLUTE_JAR@", "e" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
