summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-02-25 15:07:19 +0000
committerAndras Timar <andras.timar@collabora.com>2018-03-27 12:23:01 +0200
commit9554b95413c82ee4e18e08a69fb7a6477b0c9e22 (patch)
tree9b713b8b2dac21709af81639ee68baa7a982dfd6 /filter
parentfdc21b3f40b66efeb98ca81b8caee5cd3e76673e (diff)
First cut at annotating 'exotic' filters.
The idea being that we can improve security by warning for these. Change-Id: I7d993417bfb6a8fe868bc3e07ccbcfe71bf285ff Reviewed-on: https://gerrit.libreoffice.org/50387 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 25e4b59b2e9805ebd3c38c40e5591125a05ed5b0)
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/constant.hxx1
-rw-r--r--filter/source/config/cache/filtercache.cxx6
-rw-r--r--filter/source/config/fragments/filters/AbiWord.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Bitmap.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Database.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Drawing.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Presentation.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu2
-rw-r--r--filter/source/config/fragments/filters/MWAW_Text_Document.xcu2
-rw-r--r--filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu2
-rw-r--r--filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu2
-rw-r--r--filter/source/config/fragments/filters/T602Document.xcu2
-rw-r--r--filter/source/config/fragments/filters/XPM.xcu2
-rw-r--r--filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu2
14 files changed, 19 insertions, 12 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index c8a45889ee0e..2a5da1529de3 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -121,6 +121,7 @@
#define FLAGNAME_TEMPLATEPATH "TEMPLATEPATH"
#define FLAGNAME_COMBINED "COMBINED"
#define FLAGNAME_SUPPORTSSIGNING "SUPPORTSSIGNING"
+#define FLAGNAME_EXOTIC "EXOTIC"
/** @short some uno service names.
*/
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 92759e063ef9..5b3ff866cdb4 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1864,6 +1864,7 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(SfxF
if (nFlags & SfxFilterFlags::COMBINED ) lFlagNames.emplace_back(FLAGNAME_COMBINED );
if (nFlags & SfxFilterFlags::SUPPORTSSIGNING) lFlagNames.emplace_back(FLAGNAME_SUPPORTSSIGNING);
if (nFlags & SfxFilterFlags::GPGENCRYPTION) lFlagNames.emplace_back(FLAGNAME_GPGENCRYPTION);
+ if (nFlags & SfxFilterFlags::EXOTIC) lFlagNames.emplace_back(FLAGNAME_EXOTIC);
return comphelper::containerToSequence(lFlagNames);
}
@@ -1904,6 +1905,11 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ
nField |= SfxFilterFlags::ENCRYPTION;
continue;
}
+ if (pNames[i] == FLAGNAME_EXOTIC)
+ {
+ nField |= SfxFilterFlags::EXOTIC;
+ continue;
+ }
if (pNames[i] == FLAGNAME_EXPORT)
{
nField |= SfxFilterFlags::EXPORT;
diff --git a/filter/source/config/fragments/filters/AbiWord.xcu b/filter/source/config/fragments/filters/AbiWord.xcu
index 115febd8aafe..a309ac87d379 100644
--- a/filter/source/config/fragments/filters/AbiWord.xcu
+++ b/filter/source/config/fragments/filters/AbiWord.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="AbiWord" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop>
+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.AbiWordImportFilter</value></prop>
<prop oor:name="UserData"><value>ABW</value></prop>
diff --git a/filter/source/config/fragments/filters/MWAW_Bitmap.xcu b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu
index 034b72132219..3e70cc62f972 100644
--- a/filter/source/config/fragments/filters/MWAW_Bitmap.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Bitmap" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
diff --git a/filter/source/config/fragments/filters/MWAW_Database.xcu b/filter/source/config/fragments/filters/MWAW_Database.xcu
index 3ff4182ef6c6..075f3ed9e13e 100644
--- a/filter/source/config/fragments/filters/MWAW_Database.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Database.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Database" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value>
diff --git a/filter/source/config/fragments/filters/MWAW_Drawing.xcu b/filter/source/config/fragments/filters/MWAW_Drawing.xcu
index b92f378497dd..1b9ec56d27ee 100644
--- a/filter/source/config/fragments/filters/MWAW_Drawing.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Drawing.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Drawing" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
diff --git a/filter/source/config/fragments/filters/MWAW_Presentation.xcu b/filter/source/config/fragments/filters/MWAW_Presentation.xcu
index 8cfa9445621d..aae6598b27c0 100644
--- a/filter/source/config/fragments/filters/MWAW_Presentation.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Presentation.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Presentation" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value>
diff --git a/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
index db388c55fe44..5461b7fe20ba 100644
--- a/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Spreadsheet" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value>
diff --git a/filter/source/config/fragments/filters/MWAW_Text_Document.xcu b/filter/source/config/fragments/filters/MWAW_Text_Document.xcu
index f030fb71b198..cfbd5556f29a 100644
--- a/filter/source/config/fragments/filters/MWAW_Text_Document.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Text_Document.xcu
@@ -9,7 +9,7 @@
<node oor:name="MWAW_Text_Document" oor:op="replace">
<prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value>
</prop>
<prop oor:name="FilterService">
<value>com.sun.star.comp.Writer.MWAWImportFilter</value>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
index 4c33a806fd9d..344843043b7c 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="StarOffice XML (Base)" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION</value></prop>
+ <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"/>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
index ee3638bc0cc8..ba7db694d6ca 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="StarOffice XML (Writer)" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop>
+ <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>CXML</value></prop>
diff --git a/filter/source/config/fragments/filters/T602Document.xcu b/filter/source/config/fragments/filters/T602Document.xcu
index 436d7c8ea2b6..bf8a68fa691a 100644
--- a/filter/source/config/fragments/filters/T602Document.xcu
+++ b/filter/source/config/fragments/filters/T602Document.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="T602Document" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.T602ImportFilter</value></prop>
<prop oor:name="UserData"><value>602</value></prop>
diff --git a/filter/source/config/fragments/filters/XPM.xcu b/filter/source/config/fragments/filters/XPM.xcu
index 83c1e32c599b..8a67b710f1a2 100644
--- a/filter/source/config/fragments/filters/XPM.xcu
+++ b/filter/source/config/fragments/filters/XPM.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="XPM" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN</value></prop>
+ <prop oor:name="Flags"><value>IMPORT ALIEN EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
diff --git a/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu b/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
index 1eba0ffbbd3c..2b717c8cb944 100644
--- a/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
+++ b/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="writer_MIZI_Hwp_97" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop>
+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.comp.hwpimport.HwpImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>