filter/source/config/fragments/filters/writer_jpg_Export.xcu | 2 +- filter/source/config/fragments/filters/writer_png_Export.xcu | 2 +- svtools/source/filter/SvFilterOptionsDialog.cxx | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 7c8db524248bacc1dfa22df7bad0ad81e31d63ca Author: Eike Rathke <er...@redhat.com> Date: Tue Sep 19 21:01:45 2017 +0200 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/42498 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/filter/source/config/fragments/filters/writer_jpg_Export.xcu b/filter/source/config/fragments/filters/writer_jpg_Export.xcu index 225c60670cdf..f3b1be92406d 100644 --- a/filter/source/config/fragments/filters/writer_jpg_Export.xcu +++ b/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"> diff --git a/filter/source/config/fragments/filters/writer_png_Export.xcu b/filter/source/config/fragments/filters/writer_png_Export.xcu index 5a436c53f806..a6c8d37ce714 100644 --- a/filter/source/config/fragments/filters/writer_png_Export.xcu +++ b/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"> diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index e5bd7ab7e392..8c3b8e61012e 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/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() ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits