2 files changed, 10 insertions, 8 deletions
diff --git a/svx/util/svx.component b/svx/util/svx.component
index f087dcb833df..b8f043c8631c 100644
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -22,14 +22,6 @@
   <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>
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 3a9d43c229f9..8d4e1498fef0 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -36,4 +36,14 @@
   <implementation name="com.sun.star.comp.svx.FontworkCharacterSpacingController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </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>
 </component>