Merge branch 'master' into feature/gnumake4

Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk

21 files changed, 9 insertions, 43 deletions

diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java b/sfx2/qa/complex/sfx2/DocumentInfo.java
index ca7ae8b1dda0..ca7ae8b1dda0 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentInfo.java
+++ b/sfx2/qa/complex/sfx2/DocumentInfo.java
diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index d145b9028473..8f7071048fc3 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -127,10 +127,6 @@ public class DocumentMetadataAccess
     XRepositorySupplier xRS;
     XDocumentMetadataAccess xDMA;
 
-//    public String[] getTestMethodNames ()
-//    {
-//        return new String[] { "check", "checkRDFa" };
-//    }
     /**
      * The test parameters
      */
@@ -522,11 +518,6 @@ public class DocumentMetadataAccess
             PropertyValue file = new PropertyValue();
             file.Name = "URL";
             file.Value = tempDir + "TESTDMA.odt";
-            /*
-            PropertyValue baseURL = new PropertyValue();
-            baseURL.Name = "DocumentBaseURL";
-            baseURL.Value = tempDir + "TMP.odt";
-            */
             PropertyValue mimetype = new PropertyValue();
             mimetype.Name = "MediaType";
             mimetype.Value = "application/vnd.oasis.opendocument.text";
@@ -960,39 +951,14 @@ public class DocumentMetadataAccess
         return blank != null;
     }
 
-/*
-    static class Statement implements XStatement
-    {
-        XResource m_Subject;
-        XResource m_Predicate;
-        XNode m_Object;
-        XURI m_Graph;
-
-        Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object,
-            XURI i_Graph)
-        {
-            m_Subject = i_Subject;
-            m_Predicate = i_Predicate;
-            m_Object = i_Object;
-            m_Graph = i_Graph;
-        }
-
-        public XResource getSubject() { return m_Subject; }
-        public XResource getPredicate() { return m_Predicate; }
-        public XNode getObject() { return m_Object; }
-        public XURI getGraph() { return m_Graph; }
-    }
-*/
 
     static Statement[] toSeq(XEnumeration i_Enum) throws Exception
     {
         java.util.Collection c = new java.util.Vector();
         while (i_Enum.hasMoreElements()) {
             Statement s = (Statement) i_Enum.nextElement();
-//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
             c.add(s);
         }
-//        return (Statement[]) c.toArray();
         // java sucks
         Object[] arr = c.toArray();
         Statement[] ret = new Statement[arr.length];
@@ -1009,7 +975,6 @@ public class DocumentMetadataAccess
             XNode[] s = (XNode[]) i_Enum.nextElement();
             c.add(s);
         }
-//        return (XNode[][]) c.toArray();
         Object[] arr = c.toArray();
         XNode[][] ret = new XNode[arr.length][];
         for (int i = 0; i < arr.length; ++i) {
diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java
index 01ccaa21619b..01ccaa21619b 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentProperties.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
index 41bd66ccb5b9..41bd66ccb5b9 100644..100755
--- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
+++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
diff --git a/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
index 1e9cbb1f4738..1e9cbb1f4738 100644..100755
--- a/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
+++ b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index f37530aba726..c64cd7022e25 100755
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -781,6 +781,7 @@ public class UndoManager
         m_currentTestCase.doSingleModification();
         assertEquals( "when the Undo manager is locked, no implicit additions should happen",
             0, m_undoListener.getUndoActionsAdded() );
+        assertTrue( "Undo manager gets unlocked as a side effect of performing a simple operation", i_undoManager.isLocked() );
         i_undoManager.unlock();
         assertEquals( "unlock is not expected to add collected actions - they should be discarded",
             0, m_undoListener.getUndoActionsAdded() );
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
index d255f3d16822..d255f3d16822 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
index bf54bb4ca90b..bf54bb4ca90b 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
index a650ce9bb2e4..a650ce9bb2e4 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
diff --git a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
index af62bab39dfa..af62bab39dfa 100644..100755
--- a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
+++ b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
diff --git a/sfx2/qa/complex/sfx2/tools/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java
index e67e65f218db..e67e65f218db 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/DialogThread.java
+++ b/sfx2/qa/complex/sfx2/tools/DialogThread.java
diff --git a/sfx2/qa/complex/sfx2/tools/TestDocument.java b/sfx2/qa/complex/sfx2/tools/TestDocument.java
index 8f2108df358e..8f2108df358e 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/TestDocument.java
+++ b/sfx2/qa/complex/sfx2/tools/TestDocument.java
diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
index 4767028572bb..b604bd010d65 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java
+++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
@@ -194,8 +194,6 @@ public class WriterHelper {
 
         xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
-        //at.printAccessibleTree(new PrintWriter(System.out),xRoot);
-
         XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName));
 
         try {
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 9930d61acf20..4a94890f21df 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,12 +108,12 @@ void MetadatableTest::test()
     MockMetadatable m4(*pReg);
     MockMetadatable m5(*pReg);
     ::rtl::OUString empty;
-    ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
-    ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
-    ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
-    ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
-    ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
-    ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
+    ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
+    ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
+    ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
+    ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
+    ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
+    ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
     beans::StringPair id1(content, sid1);
     beans::StringPair id2(content, sid2);
     beans::StringPair id3(content, sid3);
@@ -272,3 +273,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(MetadatableTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/qa/cppunit/version.map b/sfx2/qa/cppunit/version.map
index 3308588ef6f8..3308588ef6f8 100644..100755
--- a/sfx2/qa/cppunit/version.map
+++ b/sfx2/qa/cppunit/version.map
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java
index c1231c975a2b..c1231c975a2b 100644..100755
--- a/sfx2/qa/unoapi/Test.java
+++ b/sfx2/qa/unoapi/Test.java
diff --git a/sfx2/qa/unoapi/knownissues.xcl b/sfx2/qa/unoapi/knownissues.xcl
index 1d87f84c96d2..1d87f84c96d2 100644..100755
--- a/sfx2/qa/unoapi/knownissues.xcl
+++ b/sfx2/qa/unoapi/knownissues.xcl
diff --git a/sfx2/qa/unoapi/sfx.sce b/sfx2/qa/unoapi/sfx.sce
index ce72c463ee55..ce72c463ee55 100644..100755
--- a/sfx2/qa/unoapi/sfx.sce
+++ b/sfx2/qa/unoapi/sfx.sce
diff --git a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
index c4b5672f9624..c4b5672f9624 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
+++ b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
diff --git a/sfx2/qa/unoapi/testdocuments/report.stw b/sfx2/qa/unoapi/testdocuments/report.stw
index 5b8efafa159b..5b8efafa159b 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report.stw
+++ b/sfx2/qa/unoapi/testdocuments/report.stw
diff --git a/sfx2/qa/unoapi/testdocuments/report2.stw b/sfx2/qa/unoapi/testdocuments/report2.stw
index 9ee0a7ee0ee0..9ee0a7ee0ee0 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report2.stw
+++ b/sfx2/qa/unoapi/testdocuments/report2.stw