impress201: rebase m89

4 files changed, 67 insertions, 39 deletions

diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index f20db064d7b2..ff13b324d65c 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -40,3 +40,4 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 
 ..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
+..\%__SRC%\misc\oox.component %_DEST%\xml%_EXT%\oox.component
diff --git a/oox/source/core/facreg.cxx b/oox/source/core/facreg.cxx
index de6212984093..ed54ae81e7e5 100644
--- a/oox/source/core/facreg.cxx
+++ b/oox/source/core/facreg.cxx
@@ -77,45 +77,6 @@ OOX_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Ch
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices )
-{
-    uno::Reference< registry::XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( sal_Unicode( '/' ) ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-#define WRITEINFO(className)\
-    writeInfo( pKey, className##_getImplementationName(), className##_getSupportedServiceNames() )
-
-OOX_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * , void * pRegistryKey )
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-
-            WRITEINFO( ::oox::core::FilterDetect );
-            WRITEINFO( ::oox::ppt::PowerPointImport );
-            WRITEINFO( ::oox::xls::BiffDetector );
-            WRITEINFO( ::oox::xls::ExcelFilter );
-            WRITEINFO( ::oox::xls::ExcelBiffFilter );
-            WRITEINFO( ::oox::shape::ShapeContextHandler );
-            WRITEINFO( ::oox::shape::FastTokenHandlerService );
-            WRITEINFO( ::oox::docprop::OOXMLDocPropImportImpl );
-            WRITEINFO( ::oox::xls::OOXMLFormulaParser );
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_True;
-}
-
 #define SINGLEFACTORY(classname)\
         if( classname##_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )\
         {\
diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
index 8bbf8a3650f2..329ced792164 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -94,3 +94,11 @@ DEFLIB1NAME =$(TARGET)
 .ENDIF # L10N_framework
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/oox.component
+
+$(MISC)/oox.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        oox.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt oox.component
diff --git a/oox/util/oox.component b/oox/util/oox.component
new file mode 100644
index 000000000000..686ee6f1728e
--- /dev/null
+++ b/oox/util/oox.component
@@ -0,0 +1,58 @@
+<?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.Impress.oox.PowerPointImport">
+    <service name="com.sun.star.comp.ooxpptx"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.BiffDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.ExcelBiffFilter">
+    <service name="com.sun.star.comp.oox.ExcelBiffFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.ExcelFilter">
+    <service name="com.sun.star.comp.oox.ExcelFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.FastTokenHandlerService">
+    <service name="com.sun.star.xml.sax.FastTokenHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.OOXMLFormulaParser">
+    <service name="com.sun.star.sheet.FilterFormulaParser"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.ShapeContextHandler">
+    <service name="com.sun.star.xml.sax.FastShapeContextHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.docprop.OOXMLDocumentPropertiesImporter">
+    <service name="com.sun.star.document.OOXMLDocumentPropertiesImporter"/>
+  </implementation>
+</component>