dr77: adaptions to new component registration

4 files changed, 27 insertions, 23 deletions

diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 29b31e4672ab..f05524f4d046 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -94,9 +94,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char*
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, spServices );
-}
-
 // ============================================================================
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 26e26daad3ad..7f3a08859302 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -57,7 +57,7 @@ using ::rtl::OUString;
 
 OUString SAL_CALL DocumentPropertiesImport_getImplementationName()
 {
-    return CREATE_OUSTRING( "com.sun.star.comp.oox.docprop.DocumentPropertiesImport" );
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" );
 }
 
 Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames()
diff --git a/oox/source/xls/ooxformulaparser.cxx b/oox/source/xls/ooxformulaparser.cxx
index e88218957f7e..efa69abcb750 100644
--- a/oox/source/xls/ooxformulaparser.cxx
+++ b/oox/source/xls/ooxformulaparser.cxx
@@ -140,7 +140,7 @@ Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames()
 
 OUString OOXMLFormulaParser_getImplementationName()
 {
-    return CREATE_OUSTRING( "com.sun.star.comp.oox.OOXMLFormulaParser" );
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.xls.FormulaParser" );
 }
 
 Reference< XInterface > SAL_CALL OOXMLFormulaParser_createInstance( const Reference< XComponentContext >& ) throw( Exception )
diff --git a/oox/util/oox.component b/oox/util/oox.component
index 686ee6f1728e..f6519d5a8664 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.component
@@ -28,31 +28,40 @@
 
 <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 name="com.sun.star.comp.oox.core.FastTokenHandler">
+    <service name="com.sun.star.xml.sax.FastTokenHandler"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.BiffDetector">
+  <implementation name="com.sun.star.comp.oox.FormatDetector">
     <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 name="com.sun.star.comp.oox.docprop.DocumentPropertiesImporter">
+    <service name="com.sun.star.document.OOXMLDocumentPropertiesImporter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.ExcelFilter">
-    <service name="com.sun.star.comp.oox.ExcelFilter"/>
+  <implementation name="com.sun.star.comp.oox.WordVbaProjectFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.FastTokenHandlerService">
-    <service name="com.sun.star.xml.sax.FastTokenHandler"/>
+  <implementation name="com.sun.star.comp.oox.ppt.PowerPointImport">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.FormatDetector">
+  <implementation name="com.sun.star.comp.oox.ShapeContextHandler">
+    <service name="com.sun.star.xml.sax.FastShapeContextHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.xls.BiffDetector">
     <service name="com.sun.star.frame.ExtendedTypeDetection"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.OOXMLFormulaParser">
-    <service name="com.sun.star.sheet.FilterFormulaParser"/>
+  <implementation name="com.sun.star.comp.oox.xls.ExcelFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.ShapeContextHandler">
-    <service name="com.sun.star.xml.sax.FastShapeContextHandler"/>
+  <implementation name="com.sun.star.comp.oox.xls.ExcelBiffFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.docprop.OOXMLDocumentPropertiesImporter">
-    <service name="com.sun.star.document.OOXMLDocumentPropertiesImporter"/>
+  <implementation name="com.sun.star.comp.oox.xls.ExcelVbaProjectFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.xls.FormulaParser">
+    <service name="com.sun.star.sheet.FilterFormulaParser"/>
   </implementation>
 </component>