Allow HTML (WebDocument) to be exported as PNG or JPEG

Change-Id: Id6b70a88ea479b402e680c7c216a20be3d6e116e

5 files changed, 46 insertions, 1 deletions

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 579dc8062c47..38c67feab1a4 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -416,6 +416,8 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_web_filters.xc
 	writer_web_StarOffice_XML_Writer \
 	writer_web_StarOffice_XML_Writer_Web_Template \
 	writer_web_pdf_Export\
+	writer_web_png_Export\
+	writer_web_jpg_Export\
 	writerweb8_writer_template\
 	writerweb8_writer \
 ))
diff --git a/filter/source/config/fragments/filters/writer_web_jpg_Export.xcu b/filter/source/config/fragments/filters/writer_web_jpg_Export.xcu
new file mode 100644
index 000000000000..584283fcce48
--- /dev/null
+++ b/filter/source/config/fragments/filters/writer_web_jpg_Export.xcu
@@ -0,0 +1,21 @@
+<!--
+ * 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/.
+ *
+-->
+    <node oor:name="writer_web_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="FilterService"><value>com.sun.star.comp.GraphicExportFilter</value></prop>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">JPEG - Joint Photographic Experts Group</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>jpg_JPEG</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/writer_web_png_Export.xcu b/filter/source/config/fragments/filters/writer_web_png_Export.xcu
new file mode 100644
index 000000000000..74087733746f
--- /dev/null
+++ b/filter/source/config/fragments/filters/writer_web_png_Export.xcu
@@ -0,0 +1,21 @@
+<!--
+ * 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/.
+ *
+-->
+    <node oor:name="writer_web_png_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="FilterService"><value>com.sun.star.comp.GraphicExportFilter</value></prop>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">PNG - Portable Network Graphic</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>png_Portable_Network_Graphic</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+    </node>
diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx
index f2d9a8282bda..d9d0a0d6f260 100644
--- a/filter/source/graphic/GraphicExportDialog.cxx
+++ b/filter/source/graphic/GraphicExportDialog.cxx
@@ -135,7 +135,7 @@ void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocum
         {
             aConfigPath = "Office.Draw/Layout/Other/MeasureUnit";
         }
-        else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") )
+        else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") || xServiceInfo->supportsService("com.sun.star.text.WebDocument") )
         {
             aConfigPath = "Office.Writer/Layout/Other/MeasureUnit";
         }
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index 86f0d4932f5a..b4141f474f78 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -47,6 +47,7 @@ void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProp
             aInternalFilterName = aInternalFilterName.replaceFirst("impress_", "");
             aInternalFilterName = aInternalFilterName.replaceFirst("calc_", "");
             aInternalFilterName = aInternalFilterName.replaceFirst("writer_", "");
+            aInternalFilterName = aInternalFilterName.replaceFirst("web_", "");
         }
         else if ( aProperty.Name == "FilterData" )
         {