Revert "svx: split into direct implementation getFactories"

Also reverts "These services are in fact implemented in svxcore library."
This reverts commit 090674dcb085cd41f4628e4f07c9a2268a18e862
and commit 4a969ac35174520f1ffeb4f919f5d7bb6d99a628.

This is embarrassing; needs more work.

2 files changed, 2 insertions, 40 deletions

diff --git a/include/osl/detail/component-declarations.h b/include/osl/detail/component-declarations.h
index aeb906909508..b8fb658d2822 100644
--- a/include/osl/detail/component-declarations.h
+++ b/include/osl/detail/component-declarations.h
@@ -109,24 +109,6 @@ void * com_sun_star_comp_stoc_SimpleRegistry( void * , void * );
 void * com_sun_star_extensions_xml_sax_Writer( void * , void * );
 void * com_sun_star_security_comp_stoc_AccessController( void * , void * );
 void * com_sun_star_security_comp_stoc_FilePolicy( void * , void * );
-void * com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory( void * , void * );
-void * com_sun_star_comp_svx_RecoveryUI_implementation_getFactory( void * , void * );
-void * com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory( void * , void * );
-void * com_sun_star_drawing_SvxShapeCollection_implementation_getFactory( void * , void * );
-void * com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_DownSearchToolboxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_FindTextToolboxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_FindAllToolboxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_UpSearchToolboxController_implementation_getFactory( void * , void * );
-void * com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory( void * , void * );
-void * org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory( void * , void * );
 
 #ifdef __cplusplus
 }
diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
index 776f37119707..b32d41b5c8a8 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -69,6 +69,7 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "libspelllo.a", spell_component_getFactory }, \
     { "libsvllo.a", svl_component_getFactory }, \
     { "libsvtlo.a", svt_component_getFactory }, \
+    { "libsvxlo.a", svx_component_getFactory }, \
     { "libtklo.a", tk_component_getFactory }, \
     { "libucb1.a", ucb_component_getFactory }, \
     { "libucpexpand1lo.a", ucpexpand1_component_getFactory }, \
@@ -134,11 +135,8 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "libwpftwriterlo.a", wpftwriter_component_getFactory }, \
 
 #define NON_APP_SPECIFIC_CONSTRUCTOR_MAP \
-    /* expwrap.component */ \
     { "com_sun_star_comp_extensions_xml_sax_ParserExpat", com_sun_star_comp_extensions_xml_sax_ParserExpat }, \
     { "com_sun_star_comp_extensions_xml_sax_FastParser", com_sun_star_comp_extensions_xml_sax_FastParser }, \
-    { "com_sun_star_extensions_xml_sax_Writer", com_sun_star_extensions_xml_sax_Writer }, \
-    /* bootstrap.component */ \
     { "com_sun_star_comp_stoc_DLLComponentLoader", com_sun_star_comp_stoc_DLLComponentLoader }, \
     { "com_sun_star_comp_stoc_ImplementationRegistration", com_sun_star_comp_stoc_ImplementationRegistration }, \
     { "com_sun_star_comp_stoc_NestedRegistry", com_sun_star_comp_stoc_NestedRegistry }, \
@@ -146,27 +144,9 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "com_sun_star_comp_stoc_OServiceManager", com_sun_star_comp_stoc_OServiceManager }, \
     { "com_sun_star_comp_stoc_OServiceManagerWrapper", com_sun_star_comp_stoc_OServiceManagerWrapper }, \
     { "com_sun_star_comp_stoc_SimpleRegistry", com_sun_star_comp_stoc_SimpleRegistry }, \
+    { "com_sun_star_extensions_xml_sax_Writer", com_sun_star_extensions_xml_sax_Writer }, \
     { "com_sun_star_security_comp_stoc_AccessController", com_sun_star_security_comp_stoc_AccessController }, \
     { "com_sun_star_security_comp_stoc_FilePolicy", com_sun_star_security_comp_stoc_FilePolicy }, \
-    /* svx.component */ \
-    { "com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory", com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory }, \
-    { "com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory", com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory }, \
-    { "com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory", com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory }, \
-    { "com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory", com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory }, \
-    { "com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory", com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory }, \
-    { "com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory", com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory }, \
-    { "com_sun_star_comp_svx_RecoveryUI_implementation_getFactory", com_sun_star_comp_svx_RecoveryUI_implementation_getFactory }, \
-    { "com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory", com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory }, \
-    { "com_sun_star_drawing_SvxShapeCollection_implementation_getFactory", com_sun_star_drawing_SvxShapeCollection_implementation_getFactory }, \
-    { "com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory", com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory }, \
-    { "com_sun_star_svx_DownSearchToolboxController_implementation_getFactory", com_sun_star_svx_DownSearchToolboxController_implementation_getFactory }, \
-    { "com_sun_star_svx_FindTextToolboxController_implementation_getFactory", com_sun_star_svx_FindTextToolboxController_implementation_getFactory }, \
-    { "com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory", com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory }, \
-    { "com_sun_star_svx_FindAllToolboxController_implementation_getFactory", com_sun_star_svx_FindAllToolboxController_implementation_getFactory }, \
-    { "com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory", com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory }, \
-    { "com_sun_star_svx_UpSearchToolboxController_implementation_getFactory", com_sun_star_svx_UpSearchToolboxController_implementation_getFactory }, \
-    { "com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory", com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory }, \
-    { "org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory", org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory }, \
 
 #endif /* DISABLE_DYNLOADING */