[Libreoffice-commits] core.git: filter/Library_storagefd.mk filter/Module_filter.mk filter/source postprocess/Rdb_services.mk Repository.mk solenv/gbuild
Maxim Monastirsky
momonasmon at gmail.com
Thu May 1 10:03:39 PDT 2014
Repository.mk | 1
filter/Library_storagefd.mk | 36 +
filter/Module_filter.mk | 1
filter/source/config/fragments/types/calc8.xcu | 2
filter/source/config/fragments/types/calc8_template.xcu | 2
filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu | 2
filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu | 2
filter/source/config/fragments/types/chart8.xcu | 2
filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu | 2
filter/source/config/fragments/types/draw8.xcu | 2
filter/source/config/fragments/types/draw8_template.xcu | 2
filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu | 2
filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu | 2
filter/source/config/fragments/types/impress8.xcu | 2
filter/source/config/fragments/types/impress8_template.xcu | 2
filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu | 2
filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu | 2
filter/source/config/fragments/types/math8.xcu | 2
filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu | 2
filter/source/config/fragments/types/writer8.xcu | 2
filter/source/config/fragments/types/writer8_template.xcu | 2
filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu | 2
filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu | 2
filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu | 2
filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu | 2
filter/source/config/fragments/types/writerglobal8.xcu | 2
filter/source/config/fragments/types/writerweb8_writer_template.xcu | 2
filter/source/storagefilterdetect/fdcomp.cxx | 36 +
filter/source/storagefilterdetect/filterdetect.cxx | 208 ++++++++++
filter/source/storagefilterdetect/filterdetect.hxx | 72 +++
filter/source/storagefilterdetect/storagefd.component | 15
postprocess/Rdb_services.mk | 1
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1
33 files changed, 395 insertions(+), 24 deletions(-)
New commits:
commit f82f7bf3dd5053049259f6933d1335f6c9e314dd
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Apr 27 15:54:58 2014 +0300
Introduce centralized detection for storage-based files
This will allow us to get rid of the duplicated code,
and simplify the type detectors.
Also this commit fixes fdo#46310 and fdo#74978.
Change-Id: I08e958ab10d05e1036cdc2bed5ce14bf73b6245c
Reviewed-on: https://gerrit.libreoffice.org/9221
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/Repository.mk b/Repository.mk
index 46d2783..a02d3d6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -327,6 +327,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
+ storagefd \
$(if $(DISABLE_SCRIPTING),,stringresource) \
svgio \
svl \
diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk
new file mode 100644
index 0000000..5b05e7e
--- /dev/null
+++ b/filter/Library_storagefd.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,storagefd))
+
+$(eval $(call gb_Library_set_componentfile,storagefd,filter/source/storagefilterdetect/storagefd))
+
+$(eval $(call gb_Library_use_external,storagefd,boost_headers))
+
+$(eval $(call gb_Library_use_sdk_api,storagefd))
+
+$(eval $(call gb_Library_use_libraries,storagefd,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ sfx \
+ tl \
+ utl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,storagefd,\
+ filter/source/storagefilterdetect/fdcomp \
+ filter/source/storagefilterdetect/filterdetect \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 1cb203f..3558f44 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_odfflatxml \
Library_pdffilter \
Library_placeware \
+ Library_storagefd \
Library_svgfilter \
Library_graphicfilter \
Library_t602filter \
diff --git a/filter/source/config/fragments/types/calc8.xcu b/filter/source/config/fragments/types/calc8.xcu
index 40d87cd..1abd38e 100644
--- a/filter/source/config/fragments/types/calc8.xcu
+++ b/filter/source/config/fragments/types/calc8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="calc8" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/scalc*</value></prop>
<prop oor:name="Extensions"><value>ods</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.spreadsheet</value></prop>
diff --git a/filter/source/config/fragments/types/calc8_template.xcu b/filter/source/config/fragments/types/calc8_template.xcu
index d99d45b..293283b 100644
--- a/filter/source/config/fragments/types/calc8_template.xcu
+++ b/filter/source/config/fragments/types/calc8_template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="calc8_template" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>ots</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.spreadsheet-template</value></prop>
diff --git a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu
index 4b998c4..79e57ae 100644
--- a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu
+++ b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="calc_StarOffice_XML_Calc" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxc</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.calc</value></prop>
diff --git a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu
index 0de78f4..df5f737 100644
--- a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu
+++ b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="calc_StarOffice_XML_Calc_Template" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>stc</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.calc.template</value></prop>
diff --git a/filter/source/config/fragments/types/chart8.xcu b/filter/source/config/fragments/types/chart8.xcu
index 59f0d0c..fb4a1f6 100644
--- a/filter/source/config/fragments/types/chart8.xcu
+++ b/filter/source/config/fragments/types/chart8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="chart8" oor:op="replace">
- <prop oor:name="DetectService"/>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/schart*</value></prop>
<prop oor:name="Extensions"><value>odc</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.chart</value></prop>
diff --git a/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu b/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu
index bacd5d3..1292786 100644
--- a/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu
+++ b/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="chart_StarOffice_XML_Chart" oor:op="replace" oor:finalized="true" oor:mandatory="true">
- <prop oor:name="DetectService"/>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxs</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.chart</value></prop>
diff --git a/filter/source/config/fragments/types/draw8.xcu b/filter/source/config/fragments/types/draw8.xcu
index 3637cc9..d06dc3a 100644
--- a/filter/source/config/fragments/types/draw8.xcu
+++ b/filter/source/config/fragments/types/draw8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw8" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/sdraw*</value></prop>
<prop oor:name="Extensions"><value>odg</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.graphics</value></prop>
diff --git a/filter/source/config/fragments/types/draw8_template.xcu b/filter/source/config/fragments/types/draw8_template.xcu
index bf8f58f..b20422a 100644
--- a/filter/source/config/fragments/types/draw8_template.xcu
+++ b/filter/source/config/fragments/types/draw8_template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw8_template" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>otg</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.graphics-template</value></prop>
diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
index 1a34933..d2a4f1f 100644
--- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
+++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw_StarOffice_XML_Draw" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxd</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.draw</value></prop>
diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu
index 2e1b9e7..fcbb470 100644
--- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu
+++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw_StarOffice_XML_Draw_Template" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>std</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.draw.template</value></prop>
diff --git a/filter/source/config/fragments/types/impress8.xcu b/filter/source/config/fragments/types/impress8.xcu
index cd3fb67..6935355 100644
--- a/filter/source/config/fragments/types/impress8.xcu
+++ b/filter/source/config/fragments/types/impress8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="impress8" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/simpress*</value></prop>
<prop oor:name="Extensions"><value>odp</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.presentation</value></prop>
diff --git a/filter/source/config/fragments/types/impress8_template.xcu b/filter/source/config/fragments/types/impress8_template.xcu
index 02e7e59..5c3170a 100644
--- a/filter/source/config/fragments/types/impress8_template.xcu
+++ b/filter/source/config/fragments/types/impress8_template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="impress8_template" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>otp</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.presentation-template</value></prop>
diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
index 4e39cd8..311c43b 100644
--- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
+++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="impress_StarOffice_XML_Impress" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxi</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.impress</value></prop>
diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu
index 4a2f706..2df7dea 100644
--- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu
+++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="impress_StarOffice_XML_Impress_Template" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sti</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.impress.template</value></prop>
diff --git a/filter/source/config/fragments/types/math8.xcu b/filter/source/config/fragments/types/math8.xcu
index 159d49e..8c90554 100644
--- a/filter/source/config/fragments/types/math8.xcu
+++ b/filter/source/config/fragments/types/math8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="math8" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.math.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/smath*</value></prop>
<prop oor:name="Extensions"><value>odf</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.formula</value></prop>
diff --git a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
index 051c381..c1d31ac 100644
--- a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
+++ b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="math_StarOffice_XML_Math" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.math.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxm</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.math</value></prop>
diff --git a/filter/source/config/fragments/types/writer8.xcu b/filter/source/config/fragments/types/writer8.xcu
index 7ba69bb..c5cf5dd 100644
--- a/filter/source/config/fragments/types/writer8.xcu
+++ b/filter/source/config/fragments/types/writer8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer8" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/swriter</value></prop>
<prop oor:name="Extensions"><value>odt</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.text</value></prop>
diff --git a/filter/source/config/fragments/types/writer8_template.xcu b/filter/source/config/fragments/types/writer8_template.xcu
index 055b351e..eeb4b35 100644
--- a/filter/source/config/fragments/types/writer8_template.xcu
+++ b/filter/source/config/fragments/types/writer8_template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer8_template" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>ott</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.text-template</value></prop>
diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
index 34db4e3..e8dd8c2 100644
--- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
+++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer_StarOffice_XML_Writer" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.writer</value></prop>
diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu
index 201d00b..b5b19b5 100644
--- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu
+++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer_StarOffice_XML_Writer_Template" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>stw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.writer.template</value></prop>
diff --git a/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu b/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
index f84fb07..e920809 100644
--- a/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
+++ b/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxg</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.writer.global</value></prop>
diff --git a/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu b/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu
index f7bd563..e81eebb 100644
--- a/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu
+++ b/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>stw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.sun.xml.writer.web</value></prop>
diff --git a/filter/source/config/fragments/types/writerglobal8.xcu b/filter/source/config/fragments/types/writerglobal8.xcu
index 6248bc7..089e316 100644
--- a/filter/source/config/fragments/types/writerglobal8.xcu
+++ b/filter/source/config/fragments/types/writerglobal8.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writerglobal8" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"><value>private:factory/swriter/GlobalDocument*</value></prop>
<prop oor:name="Extensions"><value>odm</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.text-master</value></prop>
diff --git a/filter/source/config/fragments/types/writerweb8_writer_template.xcu b/filter/source/config/fragments/types/writerweb8_writer_template.xcu
index 30aef73..9d1ace8 100644
--- a/filter/source/config/fragments/types/writerweb8_writer_template.xcu
+++ b/filter/source/config/fragments/types/writerweb8_writer_template.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writerweb8_writer_template" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>oth</value></prop>
<prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.text-web</value></prop>
diff --git a/filter/source/storagefilterdetect/fdcomp.cxx b/filter/source/storagefilterdetect/fdcomp.cxx
new file mode 100644
index 0000000..ec2d905
--- /dev/null
+++ b/filter/source/storagefilterdetect/fdcomp.cxx
@@ -0,0 +1,36 @@
+/* -*- 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/.
+ */
+
+#include <sal/config.h>
+
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <sal/types.h>
+
+#include "filterdetect.hxx"
+
+namespace {
+
+static cppu::ImplementationEntry const services[] = {
+ { &StorageFilterDetect_createInstance, &StorageFilterDetect_getImplementationName,
+ &StorageFilterDetect_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0 },
+ { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL storagefd_component_getFactory(
+ char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+ return cppu::component_getFactoryHelper(
+ pImplName, pServiceManager, pRegistryKey, services);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx
new file mode 100644
index 0000000..5917261
--- /dev/null
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -0,0 +1,208 @@
+/* -*- 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 .
+ */
+
+#include "filterdetect.hxx"
+
+#include <comphelper/documentconstants.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <comphelper/types.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <unotools/mediadescriptor.hxx>
+#include <tools/urlobj.hxx>
+#include <sfx2/brokenpackageint.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/packages/zip/ZipIOException.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+
+using namespace ::com::sun::star;
+using utl::MediaDescriptor;
+
+namespace {
+
+OUString getInternalFromMediaType(const OUString& aMediaType)
+{
+ // OpenDocument types
+ if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) return OUString("writer8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) return OUString("writer8_template");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) return OUString("writerweb8_writer_template");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) return OUString("writerglobal8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) return OUString("draw8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) return OUString("draw8_template");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) return OUString("impress8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) return OUString("impress8_template");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) return OUString("calc8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) return OUString("calc8_template");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) return OUString("chart8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) return OUString("math8");
+ else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) return OUString("StarBaseReportChart");
+
+ // OOo legacy types
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_ASCII ) return OUString("writer_StarOffice_XML_Writer");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII ) return OUString("writer_StarOffice_XML_Writer_Template");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) return OUString("writer_web_StarOffice_XML_Writer_Web_Template");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ) return OUString("writer_globaldocument_StarOffice_XML_Writer_GlobalDocument");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_ASCII ) return OUString("draw_StarOffice_XML_Draw");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII ) return OUString("draw_StarOffice_XML_Draw_Template");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) return OUString("impress_StarOffice_XML_Impress");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII ) return OUString("impress_StarOffice_XML_Impress_Template");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_ASCII ) return OUString("calc_StarOffice_XML_Calc");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII ) return OUString("calc_StarOffice_XML_Calc_Template");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_CHART_ASCII ) return OUString("chart_StarOffice_XML_Chart");
+ else if ( aMediaType == MIMETYPE_VND_SUN_XML_MATH_ASCII ) return OUString("math_StarOffice_XML_Math");
+
+ // Unknown type
+ return OUString();
+}
+
+}
+
+StorageFilterDetect::StorageFilterDetect(const uno::Reference<uno::XComponentContext>& xCxt) :
+ mxCxt(xCxt) {}
+
+StorageFilterDetect::~StorageFilterDetect() {}
+
+OUString SAL_CALL StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue>& rDescriptor)
+ throw (uno::RuntimeException, std::exception)
+{
+ MediaDescriptor aMediaDesc( rDescriptor );
+ OUString aTypeName;
+
+ try
+ {
+ uno::Reference< io::XInputStream > xInStream( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
+ if ( !xInStream.is() )
+ return OUString();
+
+ uno::Reference< embed::XStorage > xStorage( ::comphelper::OStorageHelper::GetStorageFromInputStream( xInStream, mxCxt ), uno::UNO_QUERY );
+ if ( !xStorage.is() )
+ return OUString();
+
+ uno::Reference< beans::XPropertySet > xStorageProperties( xStorage, uno::UNO_QUERY );
+ if ( !xStorageProperties.is() )
+ return OUString();
+
+ OUString aMediaType;
+ xStorageProperties->getPropertyValue( "MediaType" ) >>= aMediaType;
+ aTypeName = getInternalFromMediaType( aMediaType );
+ }
+
+ catch( const lang::WrappedTargetException& aWrap )
+ {
+ packages::zip::ZipIOException aZipException;
+ // We don't do any type detection on broken packages (f.e. because it might be impossible),
+ // so for repairing we'll use the requested type, which was detected by the flat detection.
+ OUString aRequestedTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
+ if ( ( aWrap.TargetException >>= aZipException ) && !aRequestedTypeName.isEmpty() )
+ {
+ // The package is a broken one.
+ uno::Reference< task::XInteractionHandler > xInteraction =
+ aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), uno::Reference< task::XInteractionHandler >() );
+
+ if ( xInteraction.is() )
+ {
+ INetURLObject aParser( aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() ) );
+ OUString aDocumentTitle = aParser.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+ bool bRepairPackage = aMediaDesc.getUnpackedValueOrDefault( "RepairPackage", false );
+ // fdo#46310 Don't try to repair if the user rejected it once.
+ bool bRepairAllowed = aMediaDesc.getUnpackedValueOrDefault( "RepairAllowed", true );
+
+ if ( !bRepairPackage && bRepairAllowed )
+ {
+ // Ask the user whether he wants to try to repair.
+ RequestPackageReparation aRequest( aDocumentTitle );
+ xInteraction->handle( aRequest.GetRequest() );
+
+ if ( aRequest.isApproved() )
+ {
+ aTypeName = aRequestedTypeName;
+ aMediaDesc[MediaDescriptor::PROP_DOCUMENTTITLE()] <<= aDocumentTitle;
+ aMediaDesc[MediaDescriptor::PROP_ASTEMPLATE()] <<= true;
+ aMediaDesc["RepairPackage"] <<= true;
+ }
+ else
+ {
+ // Repair either not allowed or not successful.
+ NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+ xInteraction->handle( aNotifyRequest.GetRequest() );
+ aMediaDesc["RepairAllowed"] <<= false;
+ }
+
+ // Write the changes back.
+ aMediaDesc >> rDescriptor;
+ }
+ }
+ }
+ }
+ catch( uno::RuntimeException& )
+ {
+ throw;
+ }
+ catch( uno::Exception& )
+ {}
+
+ return aTypeName;
+}
+
+// XInitialization
+void SAL_CALL StorageFilterDetect::initialize(const uno::Sequence<uno::Any>& /*aArguments*/)
+ throw (uno::Exception, uno::RuntimeException, std::exception) {}
+
+OUString StorageFilterDetect_getImplementationName()
+{
+ return OUString("com.sun.star.comp.filters.StorageFilterDetect");
+}
+
+uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames()
+{
+ uno::Sequence<OUString> aRet(2);
+ OUString* pArray = aRet.getArray();
+ pArray[0] = "com.sun.star.document.ExtendedTypeDetection";
+ pArray[1] = "com.sun.star.comp.filters.StorageFilterDetect";
+ return aRet;
+}
+
+uno::Reference<uno::XInterface> StorageFilterDetect_createInstance(
+ const uno::Reference<uno::XComponentContext> & rCxt)
+{
+ return static_cast<cppu::OWeakObject*>(new StorageFilterDetect(rCxt));
+}
+
+// XServiceInfo
+OUString SAL_CALL StorageFilterDetect::getImplementationName()
+ throw (uno::RuntimeException, std::exception)
+{
+ return StorageFilterDetect_getImplementationName();
+}
+
+sal_Bool SAL_CALL StorageFilterDetect::supportsService(const OUString& rServiceName)
+ throw (uno::RuntimeException, std::exception)
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+uno::Sequence<OUString> SAL_CALL StorageFilterDetect::getSupportedServiceNames()
+ throw (uno::RuntimeException, std::exception)
+{
+ return StorageFilterDetect_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx
new file mode 100644
index 0000000..385d3c0
--- /dev/null
+++ b/filter/source/storagefilterdetect/filterdetect.hxx
@@ -0,0 +1,72 @@
+/* -*- 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 INCLUDED_FILTER_SOURCE_STORAGEFILTERDETECT_FILTERDETECT_HXX
+#define INCLUDED_FILTER_SOURCE_STORAGEFILTERDETECT_FILTERDETECT_HXX
+
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+#include <cppuhelper/implbase3.hxx>
+
+class StorageFilterDetect : public cppu::WeakImplHelper3<
+ com::sun::star::document::XExtendedFilterDetection,
+ com::sun::star::lang::XInitialization,
+ com::sun::star::lang::XServiceInfo>
+{
+ com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> mxCxt;
+
+public:
+
+ StorageFilterDetect (const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xCxt);
+ virtual ~StorageFilterDetect();
+
+ // XExtendedFilterDetection
+ virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDescriptor)
+ throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ // XInitialization
+ virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments)
+ throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+};
+
+OUString StorageFilterDetect_getImplementationName();
+
+sal_Bool StorageFilterDetect_supportsService(const OUString& ServiceName);
+
+com::sun::star::uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames();
+
+com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
+StorageFilterDetect_createInstance(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rCxt);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/storagefilterdetect/storagefd.component b/filter/source/storagefilterdetect/storagefd.component
new file mode 100644
index 0000000..9f85bfa
--- /dev/null
+++ b/filter/source/storagefilterdetect/storagefd.component
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ prefix="storagefd" xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.filters.StorageFilterDetect">
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+</component>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5a4b104..15ca776 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Rdb_add_components,services,\
filter/source/odfflatxml/odfflatxml \
filter/source/pdf/pdffilter \
filter/source/placeware/placeware \
+ filter/source/storagefilterdetect/storagefd \
filter/source/svg/svgfilter \
filter/source/t602/t602filter \
filter/source/textfilterdetect/textfd \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 18acb82..88e7e55 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -82,6 +82,7 @@ gb_EXTRAMERGEDLIBS := \
$(if $(filter-out ANDROID IOS,$(OS)),scn) \
sd \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
+ storagefd \
spell \
svgfilter \
swd \
More information about the Libreoffice-commits
mailing list