Merge commit 'ooo/DEV300_m106' into integration/dev300_m106

Conflicts:
	binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c
	filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
	filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
	filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
	filter/source/graphicfilter/eos2met/eos2met.cxx
	filter/source/msfilter/msvbahelper.cxx
	filter/source/svg/makefile.mk
	filter/source/svg/svgexport.cxx
	filter/source/svg/svgfilter.cxx
	filter/source/svg/svgfilter.hxx
	filter/source/svg/svgfontexport.cxx
	filter/source/svg/svgfontexport.hxx
	filter/source/svg/svgwriter.cxx
	filter/source/svg/svgwriter.hxx
	oox/inc/oox/core/relations.hxx
	oox/inc/oox/core/relationshandler.hxx
	oox/inc/oox/dump/biffdumper.hxx
	oox/inc/oox/dump/dffdumper.hxx
	oox/inc/oox/dump/dumperbase.hxx
	oox/inc/oox/dump/oledumper.hxx
	oox/inc/oox/dump/pptxdumper.hxx
	oox/inc/oox/helper/containerhelper.hxx
	oox/inc/oox/helper/propertyset.hxx
	oox/inc/oox/xls/commentsbuffer.hxx
	oox/inc/oox/xls/sharedformulabuffer.hxx
	oox/source/drawingml/shape.cxx
	oox/source/dump/oledumper.cxx
	oox/source/helper/binaryinputstream.cxx
	oox/source/helper/binaryoutputstream.cxx
	oox/source/helper/binarystreambase.cxx
	oox/source/helper/propertyset.cxx
	oox/source/ole/vbacontrol.cxx
	oox/source/ole/vbaproject.cxx
	oox/source/token/namespaces.hxx.tail
	oox/source/vml/vmlshape.cxx
	oox/source/xls/commentsbuffer.cxx
	oox/source/xls/condformatbuffer.cxx
	oox/source/xls/drawingfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/richstring.cxx
	oox/source/xls/sharedformulabuffer.cxx
	oox/source/xls/sheetdatacontext.cxx
	oox/source/xls/worksheethelper.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx

1 files changed, 9 insertions, 9 deletions

diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index ebf6af691343..494815fdd36a 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -172,14 +172,14 @@ public class RDFRepositoryTest
 
             try {
                 xRep.createGraph(foo);
-                assertFalse("creating duplicate graph was allowed", false);
+                fail("creating duplicate graph was allowed");
             } catch (ElementExistException e) {
                 // ignore
             }
 
             try {
                 xRep.createGraph(null);
-                assertFalse("invalid graph name was allowed", false);
+                fail("invalid graph name was allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
@@ -296,7 +296,7 @@ public class RDFRepositoryTest
             xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param);
             try {
                 xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base);
-                assertFalse("importing existing graph did not fail", false);
+                fail("importing existing graph did not fail");
             } catch (ElementExistException e) {
                 // ignore
             }
@@ -328,28 +328,28 @@ public class RDFRepositoryTest
 
             try {
                 xBazGraph.clear();
-                assertFalse("deleted graph not invalid (clear)", false);
+                fail("deleted graph not invalid (clear)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.addStatement(foo, foo, foo);
-                assertFalse("deleted graph not invalid (add)", false);
+                fail("deleted graph not invalid (add)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.removeStatements(null, null, null);
-                assertFalse("deleted graph not invalid (remove)", false);
+                fail("deleted graph not invalid (remove)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.getStatements(null, null, null);
-                assertFalse("deleted graph not invalid (get)", false);
+                fail("deleted graph not invalid (get)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
@@ -475,14 +475,14 @@ public class RDFRepositoryTest
 
             try {
                 xRep.setStatementRDFa(foo, new XURI[] {}, xM, "", null);
-                assertFalse("RDFa: set: no predicate", false);
+                fail("RDFa: set: no predicate");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
 
             try {
                 xRep.setStatementRDFa(foo, new XURI[] {bar}, null, "", null);
-                assertFalse("RDFa: set: null", false);
+                fail("RDFa: set: null");
             } catch (IllegalArgumentException e) {
                 // ignore
             }