diff options
89 files changed, 97 insertions, 144 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index c53a748a41e8..c1c37f6a17f4 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -102,15 +102,12 @@ /** @short names of filter flags, sorted in alphabetical order */ #define FLAGNAME_3RDPARTYFILTER "3RDPARTYFILTER" #define FLAGNAME_ALIEN "ALIEN" -#define FLAGNAME_ASYNCHRON "ASYNCHRON" -#define FLAGNAME_BROWSERPREFERRED "BROWSERPREFERRED" #define FLAGNAME_CONSULTSERVICE "CONSULTSERVICE" #define FLAGNAME_DEFAULT "DEFAULT" #define FLAGNAME_ENCRYPTION "ENCRYPTION" #define FLAGNAME_EXPORT "EXPORT" #define FLAGNAME_IMPORT "IMPORT" #define FLAGNAME_INTERNAL "INTERNAL" -#define FLAGNAME_NOTINCHOOSER "NOTINCHOOSER" #define FLAGNAME_NOTINFILEDIALOG "NOTINFILEDIALOG" #define FLAGNAME_NOTINSTALLED "NOTINSTALLED" #define FLAGNAME_OWN "OWN" @@ -122,7 +119,6 @@ #define FLAGNAME_SUPPORTSSELECTION "SUPPORTSSELECTION" #define FLAGNAME_TEMPLATE "TEMPLATE" #define FLAGNAME_TEMPLATEPATH "TEMPLATEPATH" -#define FLAGNAME_USESOPTIONS "USESOPTIONS" #define FLAGNAME_COMBINED "COMBINED" /** @short some uno service names. diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 8e44fc5f8470..d279481a804d 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1917,15 +1917,12 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(SfxF if (nFlags & SfxFilterFlags::STARONEFILTER ) lFlagNames.push_back(FLAGNAME_3RDPARTYFILTER ); if (nFlags & SfxFilterFlags::ALIEN ) lFlagNames.push_back(FLAGNAME_ALIEN ); - if (nFlags & SfxFilterFlags::ASYNCHRON ) lFlagNames.push_back(FLAGNAME_ASYNCHRON ); - if (nFlags & SfxFilterFlags::BROWSERPREFERRED ) lFlagNames.push_back(FLAGNAME_BROWSERPREFERRED ); if (nFlags & SfxFilterFlags::CONSULTSERVICE ) lFlagNames.push_back(FLAGNAME_CONSULTSERVICE ); if (nFlags & SfxFilterFlags::DEFAULT ) lFlagNames.push_back(FLAGNAME_DEFAULT ); if (nFlags & SfxFilterFlags::ENCRYPTION ) lFlagNames.push_back(FLAGNAME_ENCRYPTION ); if (nFlags & SfxFilterFlags::EXPORT ) lFlagNames.push_back(FLAGNAME_EXPORT ); if (nFlags & SfxFilterFlags::IMPORT ) lFlagNames.push_back(FLAGNAME_IMPORT ); if (nFlags & SfxFilterFlags::INTERNAL ) lFlagNames.push_back(FLAGNAME_INTERNAL ); - if (nFlags & SfxFilterFlags::NOTINCHOOSER ) lFlagNames.push_back(FLAGNAME_NOTINCHOOSER ); if (nFlags & SfxFilterFlags::NOTINFILEDLG ) lFlagNames.push_back(FLAGNAME_NOTINFILEDIALOG ); if (nFlags & SfxFilterFlags::MUSTINSTALL ) lFlagNames.push_back(FLAGNAME_NOTINSTALLED ); if (nFlags & SfxFilterFlags::OWN ) lFlagNames.push_back(FLAGNAME_OWN ); @@ -1937,7 +1934,6 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(SfxF if (nFlags & SfxFilterFlags::SUPPORTSSELECTION) lFlagNames.push_back(FLAGNAME_SUPPORTSSELECTION); if (nFlags & SfxFilterFlags::TEMPLATE ) lFlagNames.push_back(FLAGNAME_TEMPLATE ); if (nFlags & SfxFilterFlags::TEMPLATEPATH ) lFlagNames.push_back(FLAGNAME_TEMPLATEPATH ); - if (nFlags & SfxFilterFlags::USESOPTIONS ) lFlagNames.push_back(FLAGNAME_USESOPTIONS ); if (nFlags & SfxFilterFlags::COMBINED ) lFlagNames.push_back(FLAGNAME_COMBINED ); return comphelper::containerToSequence(lFlagNames); @@ -1964,16 +1960,6 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ nField |= SfxFilterFlags::ALIEN; continue; } - if (pNames[i] == FLAGNAME_ASYNCHRON) - { - nField |= SfxFilterFlags::ASYNCHRON; - continue; - } - if (pNames[i] == FLAGNAME_BROWSERPREFERRED) - { - nField |= SfxFilterFlags::BROWSERPREFERRED; - continue; - } if (pNames[i] == FLAGNAME_CONSULTSERVICE) { nField |= SfxFilterFlags::CONSULTSERVICE; @@ -2004,11 +1990,6 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ nField |= SfxFilterFlags::INTERNAL; continue; } - if (pNames[i] == FLAGNAME_NOTINCHOOSER) - { - nField |= SfxFilterFlags::NOTINCHOOSER; - continue; - } if (pNames[i] == FLAGNAME_NOTINFILEDIALOG) { nField |= SfxFilterFlags::NOTINFILEDLG; @@ -2064,11 +2045,6 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ nField |= SfxFilterFlags::TEMPLATEPATH; continue; } - if (pNames[i] == FLAGNAME_USESOPTIONS) - { - nField |= SfxFilterFlags::USESOPTIONS; - continue; - } if (pNames[i] == FLAGNAME_COMBINED) { nField |= SfxFilterFlags::COMBINED; diff --git a/filter/source/config/fragments/filters/AbiWord.xcu b/filter/source/config/fragments/filters/AbiWord.xcu index 32e95beef8f4..115febd8aafe 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 USESOPTIONS 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</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/AppleKeynote.xcu b/filter/source/config/fragments/filters/AppleKeynote.xcu index 0870b562098d..d55c204bb283 100644 --- a/filter/source/config/fragments/filters/AppleKeynote.xcu +++ b/filter/source/config/fragments/filters/AppleKeynote.xcu @@ -9,7 +9,7 @@ <node oor:name="Apple Keynote" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Impress.KeynoteImportFilter</value> diff --git a/filter/source/config/fragments/filters/AppleNumbers.xcu b/filter/source/config/fragments/filters/AppleNumbers.xcu index eced344241f6..a789aec70dc5 100644 --- a/filter/source/config/fragments/filters/AppleNumbers.xcu +++ b/filter/source/config/fragments/filters/AppleNumbers.xcu @@ -9,7 +9,7 @@ <node oor:name="Apple Numbers" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Calc.NumbersImportFilter</value> diff --git a/filter/source/config/fragments/filters/ApplePages.xcu b/filter/source/config/fragments/filters/ApplePages.xcu index 4b772774f6e3..e7fd4d732e10 100644 --- a/filter/source/config/fragments/filters/ApplePages.xcu +++ b/filter/source/config/fragments/filters/ApplePages.xcu @@ -9,7 +9,7 @@ <node oor:name="Apple Pages" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.PagesImportFilter</value> diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu b/filter/source/config/fragments/filters/Beagle_Works.xcu index a0cd6bc3f4a7..02c3bd15cecd 100644 --- a/filter/source/config/fragments/filters/Beagle_Works.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works.xcu @@ -9,7 +9,7 @@ <node oor:name="Beagle_Works" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu index 4471531b20ea..a5af0c1c672d 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu @@ -9,7 +9,7 @@ <node oor:name="Beagle_Works_Calc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu index 0dad311bc0ae..1cec0bb1c0e7 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu @@ -9,7 +9,7 @@ <node oor:name="Beagle_Works_Draw" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> diff --git a/filter/source/config/fragments/filters/BroadBand_eBook.xcu b/filter/source/config/fragments/filters/BroadBand_eBook.xcu index 8dabcfc66bbf..3a54aed07d92 100644 --- a/filter/source/config/fragments/filters/BroadBand_eBook.xcu +++ b/filter/source/config/fragments/filters/BroadBand_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="BroadBand eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/ClarisDraw.xcu b/filter/source/config/fragments/filters/ClarisDraw.xcu index 353c43df9841..deb250cb0e63 100644 --- a/filter/source/config/fragments/filters/ClarisDraw.xcu +++ b/filter/source/config/fragments/filters/ClarisDraw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisDraw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu b/filter/source/config/fragments/filters/ClarisWorks.xcu index f429d0020833..8288c34ff66f 100644 --- a/filter/source/config/fragments/filters/ClarisWorks.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu index aa6edbb78b35..a6f817dc26ae 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu index d97162b431e3..e69354c3ffc2 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu index 67e5750295c1..9318c5d95376 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Impress" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu index 1db9dcc506eb..17b80242229b 100644 --- a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu +++ b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Claris_Resolve_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 1eed8355c65f..14b6e2806ca3 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Draw Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CDRImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu index 91811d103afa..0a402d2ea633 100644 --- a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu +++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Presentation Exchange" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CMXImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DIF.xcu b/filter/source/config/fragments/filters/DIF.xcu index 7c0c7fe5466c..c075ff97797c 100644 --- a/filter/source/config/fragments/filters/DIF.xcu +++ b/filter/source/config/fragments/filters/DIF.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DIF" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN USESOPTIONS</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DocMaker.xcu b/filter/source/config/fragments/filters/DocMaker.xcu index ccee3b930244..df0812479fb4 100644 --- a/filter/source/config/fragments/filters/DocMaker.xcu +++ b/filter/source/config/fragments/filters/DocMaker.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DocMaker" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/FictionBook_2.xcu b/filter/source/config/fragments/filters/FictionBook_2.xcu index 14021d3ff652..68e4c1c34841 100644 --- a/filter/source/config/fragments/filters/FictionBook_2.xcu +++ b/filter/source/config/fragments/filters/FictionBook_2.xcu @@ -9,7 +9,7 @@ <node oor:name="FictionBook 2" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/FreehandDocument.xcu b/filter/source/config/fragments/filters/FreehandDocument.xcu index 9bcea4bbf0db..4502ac0ce697 100644 --- a/filter/source/config/fragments/filters/FreehandDocument.xcu +++ b/filter/source/config/fragments/filters/FreehandDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="Freehand Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.FreehandImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/FullWrite_Professional.xcu b/filter/source/config/fragments/filters/FullWrite_Professional.xcu index bf915e7d84cd..caf41eb35911 100644 --- a/filter/source/config/fragments/filters/FullWrite_Professional.xcu +++ b/filter/source/config/fragments/filters/FullWrite_Professional.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="FullWrite_Professional" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Great_Works.xcu b/filter/source/config/fragments/filters/Great_Works.xcu index 8ca633b6f388..f291d392bcd3 100644 --- a/filter/source/config/fragments/filters/Great_Works.xcu +++ b/filter/source/config/fragments/filters/Great_Works.xcu @@ -9,7 +9,7 @@ <node oor:name="Great_Works" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/Great_Works_Calc.xcu b/filter/source/config/fragments/filters/Great_Works_Calc.xcu index 8d5206a550b0..6e5d76554481 100644 --- a/filter/source/config/fragments/filters/Great_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Great_Works_Calc.xcu @@ -9,7 +9,7 @@ <node oor:name="Great_Works_Calc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> diff --git a/filter/source/config/fragments/filters/Great_Works_Draw.xcu b/filter/source/config/fragments/filters/Great_Works_Draw.xcu index 1f7055e57102..27ebf0ec86e1 100644 --- a/filter/source/config/fragments/filters/Great_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/Great_Works_Draw.xcu @@ -9,7 +9,7 @@ <node oor:name="Great_Works_Draw" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> diff --git a/filter/source/config/fragments/filters/HTML.xcu b/filter/source/config/fragments/filters/HTML.xcu index 79647f33c184..68a64cb018dd 100644 --- a/filter/source/config/fragments/filters/HTML.xcu +++ b/filter/source/config/fragments/filters/HTML.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="HTML" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ASYNCHRON PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>HTML</value></prop> diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu index 9be3d8cfd3ae..1316b1d4f372 100644 --- a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu +++ b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">HTML Document (Master Document)</value> </prop> - <prop oor:name="Flags"><value>EXPORT INTERNAL NOTINFILEDIALOG NOTINCHOOSER</value></prop> + <prop oor:name="Flags"><value>EXPORT INTERNAL NOTINFILEDIALOG</value></prop> </node> diff --git a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu index e60154b43a3d..3a9d6834773d 100644 --- a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu +++ b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="HTML (StarWriter)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN ASYNCHRON</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>HTML</value></prop> diff --git a/filter/source/config/fragments/filters/HanMac_Word_J.xcu b/filter/source/config/fragments/filters/HanMac_Word_J.xcu index d8cb57c85eba..f19292a4a9f8 100644 --- a/filter/source/config/fragments/filters/HanMac_Word_J.xcu +++ b/filter/source/config/fragments/filters/HanMac_Word_J.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="HanMac_Word_J" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/HanMac_Word_K.xcu b/filter/source/config/fragments/filters/HanMac_Word_K.xcu index 82dd8b8616cc..b373e7be8e0a 100644 --- a/filter/source/config/fragments/filters/HanMac_Word_K.xcu +++ b/filter/source/config/fragments/filters/HanMac_Word_K.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="HanMac_Word_K" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/LightWayText.xcu b/filter/source/config/fragments/filters/LightWayText.xcu index 9d0056330f04..65b1ef641ac3 100644 --- a/filter/source/config/fragments/filters/LightWayText.xcu +++ b/filter/source/config/fragments/filters/LightWayText.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="LightWayText" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Lotus.xcu b/filter/source/config/fragments/filters/Lotus.xcu index 80592de4618c..44bf3a89c548 100644 --- a/filter/source/config/fragments/filters/Lotus.xcu +++ b/filter/source/config/fragments/filters/Lotus.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Lotus" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/LotusWordPro.xcu b/filter/source/config/fragments/filters/LotusWordPro.xcu index 787a6fed26d9..8b065b0c2fd2 100644 --- a/filter/source/config/fragments/filters/LotusWordPro.xcu +++ b/filter/source/config/fragments/filters/LotusWordPro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="LotusWordPro" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.LotusWordProImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/MS_Works.xcu b/filter/source/config/fragments/filters/MS_Works.xcu index 95b40d5a550b..7a6377b8c82e 100644 --- a/filter/source/config/fragments/filters/MS_Works.xcu +++ b/filter/source/config/fragments/filters/MS_Works.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MS_Works" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MSWorksImportFilter</value></prop> <prop oor:name="UserData"><value>WPS</value></prop> diff --git a/filter/source/config/fragments/filters/MS_Works_Calc.xcu b/filter/source/config/fragments/filters/MS_Works_Calc.xcu index a8222a76e340..f563469a53fd 100644 --- a/filter/source/config/fragments/filters/MS_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/MS_Works_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MS_Works_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacDoc.xcu b/filter/source/config/fragments/filters/MacDoc.xcu index 3427695a691a..035437bdc124 100644 --- a/filter/source/config/fragments/filters/MacDoc.xcu +++ b/filter/source/config/fragments/filters/MacDoc.xcu @@ -9,7 +9,7 @@ <node oor:name="MacDoc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/MacDraft.xcu b/filter/source/config/fragments/filters/MacDraft.xcu index 0a48deb350d4..7a704985cec3 100644 --- a/filter/source/config/fragments/filters/MacDraft.xcu +++ b/filter/source/config/fragments/filters/MacDraft.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacDraft" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu index 3c9db451240e..633e6c04b016 100644 --- a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu +++ b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacDrawPro_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacDraw_Draw.xcu b/filter/source/config/fragments/filters/MacDraw_Draw.xcu index c7c48d0bb378..6b2af4cc8f86 100644 --- a/filter/source/config/fragments/filters/MacDraw_Draw.xcu +++ b/filter/source/config/fragments/filters/MacDraw_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacDraw_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacPaint_Draw.xcu b/filter/source/config/fragments/filters/MacPaint_Draw.xcu index 80f8021e5490..dea46694db63 100644 --- a/filter/source/config/fragments/filters/MacPaint_Draw.xcu +++ b/filter/source/config/fragments/filters/MacPaint_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacPaint_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacWrite.xcu b/filter/source/config/fragments/filters/MacWrite.xcu index 4a0309cac749..79a297f336b2 100644 --- a/filter/source/config/fragments/filters/MacWrite.xcu +++ b/filter/source/config/fragments/filters/MacWrite.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacWrite" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MacWritePro.xcu b/filter/source/config/fragments/filters/MacWritePro.xcu index 32a05ecf2a97..dabedac18d37 100644 --- a/filter/source/config/fragments/filters/MacWritePro.xcu +++ b/filter/source/config/fragments/filters/MacWritePro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacWritePro" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Acta.xcu b/filter/source/config/fragments/filters/Mac_Acta.xcu index 25862bac4f47..dc5a115a9933 100644 --- a/filter/source/config/fragments/filters/Mac_Acta.xcu +++ b/filter/source/config/fragments/filters/Mac_Acta.xcu @@ -9,7 +9,7 @@ <node oor:name="Mac_Acta" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/Mac_More.xcu b/filter/source/config/fragments/filters/Mac_More.xcu index 56431c56bc09..a7149c6af1dc 100644 --- a/filter/source/config/fragments/filters/Mac_More.xcu +++ b/filter/source/config/fragments/filters/Mac_More.xcu @@ -9,7 +9,7 @@ <node oor:name="Mac_More" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/Mac_RagTime.xcu b/filter/source/config/fragments/filters/Mac_RagTime.xcu index 66be2a3051c4..69a23b267538 100644 --- a/filter/source/config/fragments/filters/Mac_RagTime.xcu +++ b/filter/source/config/fragments/filters/Mac_RagTime.xcu @@ -9,7 +9,7 @@ <node oor:name="Mac_RagTime" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MWAWImportFilter</value> diff --git a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu b/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu index e908c7e57900..790dceacaa3f 100644 --- a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu +++ b/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Wingz_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Word.xcu b/filter/source/config/fragments/filters/Mac_Word.xcu index b88bd1a31563..64d2edb2b7ae 100644 --- a/filter/source/config/fragments/filters/Mac_Word.xcu +++ b/filter/source/config/fragments/filters/Mac_Word.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Word" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works.xcu b/filter/source/config/fragments/filters/Mac_Works.xcu index 455ef15fde96..beb2eadea3cb 100644 --- a/filter/source/config/fragments/filters/Mac_Works.xcu +++ b/filter/source/config/fragments/filters/Mac_Works.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu index 579ee3caf0b1..ec3b959d227d 100644 --- a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu index 7b4b50f20a46..792c89d6e74c 100644 --- a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mariner_Write.xcu b/filter/source/config/fragments/filters/Mariner_Write.xcu index 479aa55c1b1c..df6689ccca4a 100644 --- a/filter/source/config/fragments/filters/Mariner_Write.xcu +++ b/filter/source/config/fragments/filters/Mariner_Write.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mariner_Write" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/MathType_3_x.xcu b/filter/source/config/fragments/filters/MathType_3_x.xcu index a6927228dddf..b93bf39c4757 100644 --- a/filter/source/config/fragments/filters/MathType_3_x.xcu +++ b/filter/source/config/fragments/filters/MathType_3_x.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MathType 3.x" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN NOTINFILEDIALOG NOTINCHOOSER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN NOTINFILEDIALOG</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/MindWrite.xcu b/filter/source/config/fragments/filters/MindWrite.xcu index cdd9d26c0426..4d7395ef6921 100644 --- a/filter/source/config/fragments/filters/MindWrite.xcu +++ b/filter/source/config/fragments/filters/MindWrite.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MindWrite" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Nisus_Writer.xcu b/filter/source/config/fragments/filters/Nisus_Writer.xcu index 0337f6a3dd1c..f7b0746c173f 100644 --- a/filter/source/config/fragments/filters/Nisus_Writer.xcu +++ b/filter/source/config/fragments/filters/Nisus_Writer.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Nisus_Writer" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PageMakerDocument.xcu b/filter/source/config/fragments/filters/PageMakerDocument.xcu index 72f3994bf419..ad45de75b559 100644 --- a/filter/source/config/fragments/filters/PageMakerDocument.xcu +++ b/filter/source/config/fragments/filters/PageMakerDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="PageMaker Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.PageMakerImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PalmDoc.xcu b/filter/source/config/fragments/filters/PalmDoc.xcu index 74412fd187a4..8e612f693f01 100644 --- a/filter/source/config/fragments/filters/PalmDoc.xcu +++ b/filter/source/config/fragments/filters/PalmDoc.xcu @@ -9,7 +9,7 @@ <node oor:name="PalmDoc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/Plucker_eBook.xcu b/filter/source/config/fragments/filters/Plucker_eBook.xcu index cfb2d02d46d6..b5942780db75 100644 --- a/filter/source/config/fragments/filters/Plucker_eBook.xcu +++ b/filter/source/config/fragments/filters/Plucker_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="Plucker eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/PublisherDocument.xcu b/filter/source/config/fragments/filters/PublisherDocument.xcu index 1710f3e798da..5dcc167e8118 100644 --- a/filter/source/config/fragments/filters/PublisherDocument.xcu +++ b/filter/source/config/fragments/filters/PublisherDocument.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Publisher Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MSPUBImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu index 163d2767da40..b6d816ea4620 100644 --- a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu +++ b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="SVG - Scalable Vector Graphics" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.SVGFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarBaseReport.xcu b/filter/source/config/fragments/filters/StarBaseReport.xcu index c46133db69c8..797d490f9aa1 100644 --- a/filter/source/config/fragments/filters/StarBaseReport.xcu +++ b/filter/source/config/fragments/filters/StarBaseReport.xcu @@ -17,7 +17,7 @@ --> <node oor:name="StarOffice XML (Base) Report" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG NOTINCHOOSER</value> + <value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG</value> </prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> diff --git a/filter/source/config/fragments/filters/StarBaseReportChart.xcu b/filter/source/config/fragments/filters/StarBaseReportChart.xcu index 867e4175e173..86233ac14622 100644 --- a/filter/source/config/fragments/filters/StarBaseReportChart.xcu +++ b/filter/source/config/fragments/filters/StarBaseReportChart.xcu @@ -17,7 +17,7 @@ --> <node oor:name="StarOffice XML (Base) Report Chart" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value> + <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG</value> </prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu index 605671c87cff..3ad0cb8c0965 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="StarOffice XML (Chart)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.chart2.XMLFilter</value></prop> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/SuperPaint_Draw.xcu b/filter/source/config/fragments/filters/SuperPaint_Draw.xcu index ccac8639685f..aa4f5afea9a7 100644 --- a/filter/source/config/fragments/filters/SuperPaint_Draw.xcu +++ b/filter/source/config/fragments/filters/SuperPaint_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="SuperPaint_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/T602Document.xcu b/filter/source/config/fragments/filters/T602Document.xcu index 1d3a8877a7c7..436d7c8ea2b6 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 USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</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/TeachText.xcu b/filter/source/config/fragments/filters/TeachText.xcu index 971b98c59502..0e978e78a999 100644 --- a/filter/source/config/fragments/filters/TeachText.xcu +++ b/filter/source/config/fragments/filters/TeachText.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="TeachText" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/TealDoc.xcu b/filter/source/config/fragments/filters/TealDoc.xcu index dfc378d9fcf2..e74c154a7a17 100644 --- a/filter/source/config/fragments/filters/TealDoc.xcu +++ b/filter/source/config/fragments/filters/TealDoc.xcu @@ -9,7 +9,7 @@ <node oor:name="TealDoc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/TexEdit.xcu b/filter/source/config/fragments/filters/TexEdit.xcu index 84e524d06c8c..844c47b62095 100644 --- a/filter/source/config/fragments/filters/TexEdit.xcu +++ b/filter/source/config/fragments/filters/TexEdit.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="TexEdit" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu index eab74691c82b..886552c7ec92 100644 --- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Text - txt - csv (StarCalc)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN USESOPTIONS</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/VisioDocument.xcu b/filter/source/config/fragments/filters/VisioDocument.xcu index c18b16ca1734..3b43b24db4b8 100644 --- a/filter/source/config/fragments/filters/VisioDocument.xcu +++ b/filter/source/config/fragments/filters/VisioDocument.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Visio Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.VisioImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu index 721e68f92533..1d141826c229 100644 --- a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_Lotus_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu index 77c7b45d5f32..f32b11820d82 100644 --- a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_QPro_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfect.xcu b/filter/source/config/fragments/filters/WordPerfect.xcu index 7dfaa7ec8a69..d26c30369df2 100644 --- a/filter/source/config/fragments/filters/WordPerfect.xcu +++ b/filter/source/config/fragments/filters/WordPerfect.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WordPerfectImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu index 12e11f5dd7c4..54f4f43db7d1 100644 --- a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu +++ b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect Graphics" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.WPGImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WriteNow.xcu b/filter/source/config/fragments/filters/WriteNow.xcu index 6874c1c4c8c5..600e5d61713c 100644 --- a/filter/source/config/fragments/filters/WriteNow.xcu +++ b/filter/source/config/fragments/filters/WriteNow.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WriteNow" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WriterPlus.xcu b/filter/source/config/fragments/filters/WriterPlus.xcu index bd42602b8e6f..65599ec63f15 100644 --- a/filter/source/config/fragments/filters/WriterPlus.xcu +++ b/filter/source/config/fragments/filters/WriterPlus.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WriterPlus" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ZWrite.xcu b/filter/source/config/fragments/filters/ZWrite.xcu index 021876017f5a..c91d5578e78a 100644 --- a/filter/source/config/fragments/filters/ZWrite.xcu +++ b/filter/source/config/fragments/filters/ZWrite.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ZWrite" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData" /> diff --git a/filter/source/config/fragments/filters/dBase.xcu b/filter/source/config/fragments/filters/dBase.xcu index 7ae60ba4745a..59aaf31a9a3e 100644 --- a/filter/source/config/fragments/filters/dBase.xcu +++ b/filter/source/config/fragments/filters/dBase.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="dBase" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN USESOPTIONS</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/eDoc_Document.xcu b/filter/source/config/fragments/filters/eDoc_Document.xcu index 9f68d76bb5c7..bdc320946dc4 100644 --- a/filter/source/config/fragments/filters/eDoc_Document.xcu +++ b/filter/source/config/fragments/filters/eDoc_Document.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="eDoc_Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/eReader_eBook.xcu b/filter/source/config/fragments/filters/eReader_eBook.xcu index 258b2690b7a2..efc86ba327c3 100644 --- a/filter/source/config/fragments/filters/eReader_eBook.xcu +++ b/filter/source/config/fragments/filters/eReader_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="eReader eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/writer_web_HTML_help.xcu b/filter/source/config/fragments/filters/writer_web_HTML_help.xcu index 245be8ed0fad..4e3cb6a6cbf8 100644 --- a/filter/source/config/fragments/filters/writer_web_HTML_help.xcu +++ b/filter/source/config/fragments/filters/writer_web_HTML_help.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="writer_web_HTML_help" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT INTERNAL NOTINFILEDIALOG NOTINCHOOSER ASYNCHRON READONLY</value></prop> + <prop oor:name="Flags"><value>IMPORT INTERNAL NOTINFILEDIALOG READONLY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>HTML_HELP</value></prop> diff --git a/filter/source/config/fragments/filters/writerglobal8_HTML.xcu b/filter/source/config/fragments/filters/writerglobal8_HTML.xcu index 56155735f86d..1e8534a86871 100644 --- a/filter/source/config/fragments/filters/writerglobal8_HTML.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_HTML.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="writerglobal8_HTML" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT ALIEN ASYNCHRON NOTINCHOOSER</value></prop> + <prop oor:name="Flags"><value>EXPORT ALIEN</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>HTML</value></prop> diff --git a/filter/source/config/fragments/filters/zTXT.xcu b/filter/source/config/fragments/filters/zTXT.xcu index 5ca6b88cf0f8..6e5de945d71f 100644 --- a/filter/source/config/fragments/filters/zTXT.xcu +++ b/filter/source/config/fragments/filters/zTXT.xcu @@ -9,7 +9,7 @@ <node oor:name="zTXT" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx index 9dbbc764c89b..6e5fb1e26f84 100644 --- a/include/comphelper/documentconstants.hxx +++ b/include/comphelper/documentconstants.hxx @@ -69,16 +69,11 @@ // filter flags // TODO/LATER: The flags should be part of the UNO specification - -// Note that these flag bits have parallel names in -// filter/source/config/cache/constant.hxx. Some of the bits are -// missing from there, and some have different names. But the meaning -// is presumably the same, and the values are the same. - +// // http://www.mail-archive.com/dev@openoffice.org/msg05047.html says: - +// // I can just sum up what comes into my mind, hope I don't miss one: - +// // Import - should be self explaining // Export - should be self explaining // Template - deprecated @@ -86,20 +81,14 @@ // Own - one of the OOo file formats // Alien - no zip container based format // Preferred - preferred filter for a particular type -// Asynchron - deprecated, only HTML-filter isn't synchron // 3rdPartyFilter - implemented as a UNO component // Default - default filter for this document type -// NotInFileDialog - should be self explaining -// NotInChooser - as above - +// // (The 3rdPartyFilter flag is here called StarONE) - -// At some point (4.0?) we should drop the duplicate set of names over -// in filter, and rename the obscure ones to describe their meaning -// using terms that are understandable. - +// enum class SfxFilterFlags { + NONE = 0, IMPORT = 0x00000001L, EXPORT = 0x00000002L, TEMPLATE = 0x00000004L, @@ -107,34 +96,26 @@ enum class SfxFilterFlags TEMPLATEPATH = 0x00000010L, OWN = 0x00000020L, ALIEN = 0x00000040L, - USESOPTIONS = 0x00000080L, DEFAULT = 0x00000100L, - EXECUTABLE = 0x00000200L, SUPPORTSSELECTION = 0x00000400L, NOTINFILEDLG = 0x00001000L, - NOTINCHOOSER = 0x00002000L, - ASYNCHRON = 0x00004000L, + OPENREADONLY = 0x00010000L, MUSTINSTALL = 0x00020000L, CONSULTSERVICE = 0x00040000L, STARONEFILTER = 0x00080000L, - PACKED = 0x00100000L, - BROWSERPREFERRED = 0x00400000L, COMBINED = 0x00800000L, ENCRYPTION = 0x01000000L, PASSWORDTOMODIFY = 0x02000000L, - PREFERED = 0x10000000L, STARTPRESENTATION = 0x20000000L, - - NONE = 0 }; namespace o3tl { - template<> struct typed_flags<SfxFilterFlags> : is_typed_flags<SfxFilterFlags, 0x33df77ffL> {}; + template<> struct typed_flags<SfxFilterFlags> : is_typed_flags<SfxFilterFlags, 0x339f157fL> {}; } #define SFX_FILTER_NOTINSTALLED (SfxFilterFlags::MUSTINSTALL | SfxFilterFlags::CONSULTSERVICE) diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index b95331c44efd..17934f6a5441 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -43,10 +43,10 @@ #define ODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::TEMPLATE | SfxFilterFlags::OWN | SfxFilterFlags::DEFAULT | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY) #define XLS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY | SfxFilterFlags::PREFERED) #define XLSX_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED) -#define LOTUS123_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS | SfxFilterFlags::PREFERED) -#define CSV_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) -#define HTML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) -#define DIF_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) +#define LOTUS123_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::PREFERED) +#define CSV_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) +#define HTML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) +#define DIF_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) #define XLS_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN) #define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 213365d60168..8260105e62c6 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -262,7 +262,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) SfxMedium* pMedium = new SfxMedium( aFile, StreamMode::READ | StreamMode::NOCREATE ); const SfxFilter* pFilter = NULL; - SfxGetpApp()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED | SfxFilterFlags::EXECUTABLE ); + SfxGetpApp()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED ); bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); bool bInserted = false; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 1bfe74cec694..bf55d9439357 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -449,7 +449,7 @@ IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void) { const SfxFilter* pFoundFilter = NULL; SfxMedium aSfxMedium( aCurrentDropFile, StreamMode::READ | StreamMode::SHARE_DENYNONE ); - ErrCode nErr = SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED | SfxFilterFlags::EXECUTABLE ); + ErrCode nErr = SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED ); if( pFoundFilter && !nErr ) { diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu index e4001c5c3a04..d454d6f19ddb 100644 --- a/sdext/source/pdfimport/config/pdf_import_filter.xcu +++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu @@ -116,7 +116,7 @@ <value>org.libreoffice.comp.documents.HybridPDFImport</value> </prop> <prop oor:name="Flags" oor:type="oor:string-list"> - <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG NOTINCHOOSER</value> + <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG</value> </prop> <prop oor:name="TemplateName" oor:type="xs:string"> <value/> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 30ff3f4aefeb..3bb8ff0273fe 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1490,7 +1490,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte const SfxFilter* pSfxFilter = NULL; SfxMedium aSfxMedium( aURL, referer_, StreamMode::READ | StreamMode::SHARE_DENYNONE ); - SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED | SfxFilterFlags::EXECUTABLE ); + SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED ); if( !pSfxFilter ) { |