fdo#46808, convert drawing::GraphicExportFilter to new style

Change-Id: Icd456209406ee8f4dc4ea1f966058f71dce08d58

4 files changed, 89 insertions, 50 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0860f7d682d7..45e2766dd321 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/documen
 	XMLOasisBasicImporter \
 ))
 $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
+	GraphicExportFilter \
 	ModuleDispatcher \
 	ShapeCollection \
 	SlideRenderer \
@@ -731,7 +732,6 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/draw
 	GenericDrawPage \
 	GenericDrawingDocument \
 	GradientTable \
-	GraphicExportFilter \
 	GraphicObjectShape \
 	GroupShape \
 	HatchTable \
@@ -2285,6 +2285,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
 	XDrawView \
 	XEnhancedCustomShapeDefaulter \
 	XGluePointsSupplier \
+	XGraphicExportFilter \
 	XLayer \
 	XLayerManager \
 	XLayerSupplier \
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 04d8270bae2b..33899e791287 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -19,9 +19,7 @@
 #ifndef __com_sun_star_drawing_GraphicExportFilter_idl__
 #define __com_sun_star_drawing_GraphicExportFilter_idl__
 
-#include <com/sun/star/document/XFilter.idl>
-#include <com/sun/star/document/XExporter.idl>
-#include <com/sun/star/document/XMimeTypeInfo.idl>
+#include <com/sun/star/drawing/XGraphicExportFilter.idl>
 
 
  module com {  module sun {  module star {  module drawing {
@@ -31,52 +29,7 @@
     groups of shapes from a DrawingDocument to a file in one of the file formats
     supported by the component.
 */
-published service GraphicExportFilter
-{
-    /** calling <method scope=scope="com::sun::star::document">XFilter::filter
-        </method> starts the export of the graphic file. The following properties
-        from the        <type scope="com::sun::star::document">MediaDescriptor
-        </type> are supported:<p>
-
-        <member scope="com::sun::star::document">MediaDescriptor::MediaType
-        </member><b>
-
-        Depending on the export filters supported by this component this is
-        the mime type of the target graphic file. Possible values are<b>
-        image/x-MS-bmp<b>
-        application/dxf<b>
-        application/postscript<b>
-        image/gif<b>
-        image/jpeg<b>
-        image/png<b>
-        image/x-pict<b>
-        image/x-pcx<b>
-        image/x-portable-bitmap<b>
-        image/x-portable-graymap<b>
-        image/x-portable-pixmap<b>
-        image/x-cmu-raster<b>
-        image/targa<b>
-        image/tiff<b>
-        image/x-xbitmap<b>
-        image/x-xpixmap<b>
-        image/svg+xml<p>
-        Ask the interface <type scope="com::sun::star::document">XMimeTypeInfo
-        </type> for all values supported by the component.
-
-        <member scope="com::sun::star::document">MediaDescriptor::URL</member><b>
-        This is the target url of the file that will be created during export.
-    */
-    interface ::com::sun::star::document::XFilter;
-
-    /** sets the source component for this export filter.
-        This could either be a <type>DrawPage</type>, a <type>Shape</type>
-        or a <type>Shapes</type>.
-     */
-    interface ::com::sun::star::document::XExporter;
-
-    /** lets you query the supported mime types by this component */
-    interface ::com::sun::star::document::XMimeTypeInfo;
-};
+published service GraphicExportFilter : XGraphicExportFilter;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/drawing/XGraphicExportFilter.idl b/offapi/com/sun/star/drawing/XGraphicExportFilter.idl
new file mode 100644
index 000000000000..6582def8063f
--- /dev/null
+++ b/offapi/com/sun/star/drawing/XGraphicExportFilter.idl
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_drawing_XGraphicExportFilter_idl__
+#define __com_sun_star_drawing_XGraphicExportFilter_idl__
+
+#include <com/sun/star/document/XFilter.idl>
+#include <com/sun/star/document/XExporter.idl>
+#include <com/sun/star/document/XMimeTypeInfo.idl>
+
+
+ module com {  module sun {  module star {  module drawing {
+
+
+/**
+    @since LibreOffcei 4.1
+*/
+published interface XGraphicExportFilter
+{
+    /** calling <method scope=scope="com::sun::star::document">XFilter::filter
+        </method> starts the export of the graphic file. The following properties
+        from the        <type scope="com::sun::star::document">MediaDescriptor
+        </type> are supported:<p>
+
+        <member scope="com::sun::star::document">MediaDescriptor::MediaType
+        </member><b>
+
+        Depending on the export filters supported by this component this is
+        the mime type of the target graphic file. Possible values are<b>
+        image/x-MS-bmp<b>
+        application/dxf<b>
+        application/postscript<b>
+        image/gif<b>
+        image/jpeg<b>
+        image/png<b>
+        image/x-pict<b>
+        image/x-pcx<b>
+        image/x-portable-bitmap<b>
+        image/x-portable-graymap<b>
+        image/x-portable-pixmap<b>
+        image/x-cmu-raster<b>
+        image/targa<b>
+        image/tiff<b>
+        image/x-xbitmap<b>
+        image/x-xpixmap<b>
+        image/svg+xml<p>
+        Ask the interface <type scope="com::sun::star::document">XMimeTypeInfo
+        </type> for all values supported by the component.
+
+        <member scope="com::sun::star::document">MediaDescriptor::URL</member><b>
+        This is the target url of the file that will be created during export.
+    */
+    interface ::com::sun::star::document::XFilter;
+
+    /** sets the source component for this export filter.
+        This could either be a <type>DrawPage</type>, a <type>Shape</type>
+        or a <type>Shapes</type>.
+     */
+    interface ::com::sun::star::document::XExporter;
+
+    /** lets you query the supported mime types by this component */
+    interface ::com::sun::star::document::XMimeTypeInfo;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index fd52d36ff322..f3483965dc05 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb