Writer export to PNG,JPG: switch to proper SvFilterOptionsDialog

With all bells and whistles, instead of the crude size/dpi JPG dialog
even for PNG.

Change-Id: I695a78643e07900822ec9253ac818efd52339cc0
Reviewed-on: https://gerrit.libreoffice.org/42498Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

filter/source/config/fragments/filters/writer_jpg_Export.xcu

@@ -17,7 +17,7 @@
 -->
     <node oor:name="writer_jpg_Export" oor:op="replace">
         <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
-        <prop oor:name="UIComponent"><value>com.sun.star.comp.GraphicExportDialog</value></prop>
+        <prop oor:name="UIComponent"><value>com.sun.star.svtools.SvFilterOptionsDialog</value></prop>
         <prop oor:name="FilterService"><value>com.sun.star.comp.GraphicExportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">

filter/source/config/fragments/filters/writer_png_Export.xcu

@@ -17,7 +17,7 @@
 -->
     <node oor:name="writer_png_Export" oor:op="replace">
         <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER SUPPORTSSELECTION</value></prop>
-        <prop oor:name="UIComponent"><value>com.sun.star.comp.GraphicExportDialog</value></prop>
+        <prop oor:name="UIComponent"><value>com.sun.star.svtools.SvFilterOptionsDialog</value></prop>
         <prop oor:name="FilterService"><value>com.sun.star.comp.GraphicExportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">

svtools/source/filter/SvFilterOptionsDialog.cxx

@@ -203,6 +203,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
             aInternalFilterName = aInternalFilterName.replaceFirst( "draw_", "" );
             aInternalFilterName = aInternalFilterName.replaceFirst( "impress_", "" );
             aInternalFilterName = aInternalFilterName.replaceFirst( "calc_", "" );
+            aInternalFilterName = aInternalFilterName.replaceFirst( "writer_", "" );
             break;
        }
         else if ( rName == "Graphic" )
@@ -259,6 +260,8 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
             mbGraphicsSource = false;
             if ( xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument") )
                 aConfigPath = "Office.Calc/Layout/Other/MeasureUnit";
+            else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") )
+                aConfigPath = "Office.Writer/Layout/Other/MeasureUnit";
         }
         if ( !aConfigPath.isEmpty() )
         {