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, 29 insertions, 47 deletions

diff --git a/svx/util/svx.component b/svx/util/svx.component
index 848b28e433cf..e5054eb0130c 100644
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -18,62 +18,62 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"
-      constructor="com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory">
+    prefix="svx" xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Draw.GraphicExporter">
+    <service name="com.sun.star.drawing.GraphicExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Svx.GraphicExportHelper">
+    <service name="com.sun.star.document.BinaryStreamResolver"/>
+    <service name="com.sun.star.document.GraphicObjectResolver"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Svx.GraphicImportHelper">
+    <service name="com.sun.star.document.BinaryStreamResolver"/>
+    <service name="com.sun.star.document.GraphicObjectResolver"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider">
     <service name="com.sun.star.gallery.GalleryThemeProvider"/>
   </implementation>
-  <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"
-      constructor="com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory">
+  <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D">
+    <service name="com.sun.star.graphic.PrimitiveFactory2D"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher">
     <service name="com.sun.star.comp.svx.FindbarDispatcher"/>
     <service name="com.sun.star.frame.ProtocolHandler"/>
   </implementation>
-  <implementation name="com.sun.star.comp.svx.RecoveryUI"
-      constructor="com_sun_star_comp_svx_RecoveryUI_implementation_getFactory">
+  <implementation name="com.sun.star.comp.svx.RecoveryUI">
     <service name="com.sun.star.dialog.RecoveryUI"/>
   </implementation>
-  <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"
-      constructor="com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory">
+  <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine">
     <service name="com.sun.star.drawing.CustomShapeEngine"/>
   </implementation>
-  <implementation name="com.sun.star.drawing.SvxShapeCollection"
-      constructor="com_sun_star_drawing_SvxShapeCollection_implementation_getFactory">
+  <implementation name="com.sun.star.drawing.SvxShapeCollection">
     <service name="com.sun.star.drawing.ShapeCollection"/>
   </implementation>
-  <implementation name="com.sun.star.drawing.SvxUnoColorTable"
-      constructor="com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory">
+  <implementation name="com.sun.star.drawing.SvxUnoColorTable">
     <service name="com.sun.star.drawing.ColorTable"/>
   </implementation>
-  <implementation name="com.sun.star.svx.DownSearchToolboxController"
-      constructor="com_sun_star_svx_DownSearchToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.DownSearchToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.FindTextToolboxController"
-      constructor="com_sun_star_svx_FindTextToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.FindTextToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.MatchCaseToolboxController"
-      constructor="com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.MatchCaseToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.FindAllToolboxController"
-      constructor="com_sun_star_svx_FindAllToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.FindAllToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.FontHeightToolBoxController"
-      constructor="com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.FontHeightToolBoxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.UpSearchToolboxController"
-      constructor="com_sun_star_svx_UpSearchToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.UpSearchToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.svx.ExitFindbarToolboxController"
-      constructor="com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory">
+  <implementation name="com.sun.star.svx.ExitFindbarToolboxController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="org.apache.openoffice.comp.svx.sidebar.PanelFactory"
-      constructor="org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory">
+  <implementation name="org.apache.openoffice.comp.svx.sidebar.PanelFactory">
     <service name="com.sun.star.ui.UIElementFactory"/>
   </implementation>
 </component>
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 46a18526ce3e..3a9d43c229f9 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -18,24 +18,6 @@
  -->
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     prefix="svxcore" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.Draw.GraphicExporter"
-      constructor="com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory">
-    <service name="com.sun.star.drawing.GraphicExportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"
-      constructor="com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory">
-    <service name="com.sun.star.document.BinaryStreamResolver"/>
-    <service name="com.sun.star.document.GraphicObjectResolver"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"
-      constructor="com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory">
-    <service name="com.sun.star.document.BinaryStreamResolver"/>
-    <service name="com.sun.star.document.GraphicObjectResolver"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"
-      constructor="com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory">
-    <service name="com.sun.star.graphic.PrimitiveFactory2D"/>
-  </implementation>
   <implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>