Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
binfilter/bf_forms/source/component/forms_Filter.cxx
binfilter/bf_sw/source/core/inc/node2lay.hxx
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
binfilter/inc/bf_sw/swdbtoolsclient.hxx
filter/source/xsltdialog/xmlfileview.cxx
oox/source/ole/axcontrol.cxx
oox/source/vml/vmlformatting.cxx
oox/source/xls/autofiltercontext.cxx
oox/source/xls/externallinkfragment.cxx
oox/source/xls/formulaparser.cxx
oox/source/xls/pivotcachebuffer.cxx
oox/source/xls/pivotcachefragment.cxx
oox/source/xls/sheetdatacontext.cxx
writerfilter/source/dmapper/GraphicImport.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/ooxml/model.xml

7 files changed, 103 insertions, 46 deletions

diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx
index aaa32a837ae7..efe632944c10 100644
--- a/unoxml/source/rdf/librdf_services.cxx
+++ b/unoxml/source/rdf/librdf_services.cxx
@@ -73,13 +73,6 @@ extern "C" void * SAL_CALL component_getFactory(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return ::cppu::component_writeInfoHelper(serviceManager, registryKey,
-        entries);
-}
-
 } // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/rdf/makefile.mk b/unoxml/source/rdf/makefile.mk
index 3f6d7f445297..1dbcffb8b6ac 100644
--- a/unoxml/source/rdf/makefile.mk
+++ b/unoxml/source/rdf/makefile.mk
@@ -82,3 +82,11 @@ SHL1STDLIBS= \
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/unordf.component
+
+$(MISC)/unordf.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        unordf.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt unordf.component
diff --git a/unoxml/source/rdf/unordf.component b/unoxml/source/rdf/unordf.component
new file mode 100644
index 000000000000..a828e7b05d47
--- /dev/null
+++ b/unoxml/source/rdf/unordf.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="CBlankNode">
+    <service name="com.sun.star.rdf.BlankNode"/>
+  </implementation>
+  <implementation name="CLiteral">
+    <service name="com.sun.star.rdf.Literal"/>
+  </implementation>
+  <implementation name="CURI">
+    <service name="com.sun.star.rdf.URI"/>
+  </implementation>
+  <implementation name="librdf_Repository">
+    <service name="com.sun.star.rdf.Repository"/>
+  </implementation>
+</component>
diff --git a/unoxml/source/service/makefile.mk b/unoxml/source/service/makefile.mk
index 93aec0746323..5fbe62f67ec4 100644
--- a/unoxml/source/service/makefile.mk
+++ b/unoxml/source/service/makefile.mk
@@ -76,3 +76,11 @@ SHL1STDLIBS= \
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/unoxml.component
+
+$(MISC)/unoxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        unoxml.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt unoxml.component
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 00cb14c00cc4..38d22b3ace3a 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -61,44 +61,6 @@ component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, u
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL
-component_writeInfo(void * /*pServiceManager*/, void* pRegistryKey )
-{
-    Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey* >(pRegistryKey));
-    Reference< XRegistryKey > xNewKey;
-    OUString aImpl;
-
-    // register DOM service
-    aImpl =  OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += CDocumentBuilder::_getImplementationName();
-    aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey(aImpl);
-    xNewKey->createKey(CDocumentBuilder::_getSupportedServiceNames()[0]);
-
-    // register DOM service
-    aImpl =  OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += CSAXDocumentBuilder::_getImplementationName();
-    aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey(aImpl);
-    xNewKey->createKey(CSAXDocumentBuilder::_getSupportedServiceNames()[0]);
-
-    // register XPath service
-    aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += CXPathAPI::_getImplementationName();
-    aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey(aImpl);
-    xNewKey->createKey(CXPathAPI::_getSupportedServiceNames()[0]);
-
-    // register EventTest service
-    aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += CTestListener::_getImplementationName();
-    aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey(aImpl);
-    xNewKey->createKey(CTestListener::_getSupportedServiceNames()[0]);
-
-    return sal_True;
-}
-
 void* SAL_CALL
 component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
 {
diff --git a/unoxml/source/service/unoxml.component b/unoxml/source/service/unoxml.component
new file mode 100644
index 000000000000..d8c907e6475b
--- /dev/null
+++ b/unoxml/source/service/unoxml.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.xml.dom.DocumentBuilder">
+    <service name="com.sun.star.xml.dom.DocumentBuilder"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xml.dom.SAXDocumentBuilder">
+    <service name="com.sun.star.xml.dom.SAXDocumentBuilder"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xml.dom.events.TestListener">
+    <service name="com.sun.star.comp.xml.dom.events.TestListener"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xml.xpath.XPathAPI">
+    <service name="com.sun.star.xml.xpath.XPathAPI"/>
+  </implementation>
+</component>
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index 67f744950a3f..4bc57a958014 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -70,7 +70,7 @@ namespace XPath
 
     private:
         nsmap_t m_nsmap;
-        const Reference < XMultiServiceFactory > m_aFactory;
+        const Reference< XMultiServiceFactory > m_aFactory;
         extensions_t m_extensions;
 
     public: