diff options
Diffstat (limited to 'filter')
43 files changed, 69 insertions, 55 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 244a78864228..36ea008f5414 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -133,7 +133,6 @@ extern rtl::OUString pFilterStrings[]; #define FLAGNAME_PASSWORDTOMODIFY _FILTER_CONFIG_FROM_ASCII_("PASSWORDTOMODIFY" ) #define FLAGNAME_PREFERRED _FILTER_CONFIG_FROM_ASCII_("PREFERRED" ) #define FLAGNAME_READONLY _FILTER_CONFIG_FROM_ASCII_("READONLY" ) -#define FLAGNAME_SILENTEXPORT _FILTER_CONFIG_FROM_ASCII_("SILENTEXPORT" ) #define FLAGNAME_SUPPORTSSELECTION _FILTER_CONFIG_FROM_ASCII_("SUPPORTSSELECTION") #define FLAGNAME_TEMPLATE _FILTER_CONFIG_FROM_ASCII_("TEMPLATE" ) #define FLAGNAME_TEMPLATEPATH _FILTER_CONFIG_FROM_ASCII_("TEMPLATEPATH" ) @@ -159,7 +158,6 @@ extern rtl::OUString pFilterStrings[]; #define FLAGVAL_CONSULTSERVICE 0x00040000 // 262144 #define FLAGVAL_3RDPARTYFILTER 0x00080000 // 524288 #define FLAGVAL_PACKED 0x00100000 // 1048576 -#define FLAGVAL_SILENTEXPORT 0x00200000 // 2097152 #define FLAGVAL_BROWSERPREFERRED 0x00400000 // 4194304 #define FLAGVAL_COMBINED 0x00800000 // 8388608 #define FLAGVAL_ENCRYPTION 0x01000000 // 16777216 diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index d4435e2182f1..bae26e2c2d91 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2110,7 +2110,6 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam if ((nFlags & FLAGVAL_PASSWORDTOMODIFY ) == FLAGVAL_PASSWORDTOMODIFY ) lFlagNames.push_back(FLAGNAME_PASSWORDTOMODIFY ); if ((nFlags & FLAGVAL_PREFERRED ) == FLAGVAL_PREFERRED ) lFlagNames.push_back(FLAGNAME_PREFERRED ); if ((nFlags & FLAGVAL_READONLY ) == FLAGVAL_READONLY ) lFlagNames.push_back(FLAGNAME_READONLY ); - if ((nFlags & FLAGVAL_SILENTEXPORT ) == FLAGVAL_SILENTEXPORT ) lFlagNames.push_back(FLAGNAME_SILENTEXPORT ); if ((nFlags & FLAGVAL_SUPPORTSSELECTION) == FLAGVAL_SUPPORTSSELECTION) lFlagNames.push_back(FLAGNAME_SUPPORTSSELECTION); if ((nFlags & FLAGVAL_TEMPLATE ) == FLAGVAL_TEMPLATE ) lFlagNames.push_back(FLAGNAME_TEMPLATE ); if ((nFlags & FLAGVAL_TEMPLATEPATH ) == FLAGVAL_TEMPLATEPATH ) lFlagNames.push_back(FLAGNAME_TEMPLATEPATH ); @@ -2222,11 +2221,6 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< nField |= FLAGVAL_READONLY; continue; } - if (pNames[i].equals(FLAGNAME_SILENTEXPORT)) - { - nField |= FLAGVAL_SILENTEXPORT; - continue; - } if (pNames[i].equals(FLAGNAME_SUPPORTSSELECTION)) { nField |= FLAGVAL_SUPPORTSSELECTION; diff --git a/filter/source/config/fragments/filters/StarCalc_3_0.xcu b/filter/source/config/fragments/filters/StarCalc_3_0.xcu index fc96b7d6cd99..59d1682d5e91 100644 --- a/filter/source/config/fragments/filters/StarCalc_3_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_3_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 3.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu index 1dce482b0fdf..d71f4625baa8 100644 --- a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 3.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarCalc_4_0.xcu b/filter/source/config/fragments/filters/StarCalc_4_0.xcu index c12d34b3ee8e..8ce6a5224426 100644 --- a/filter/source/config/fragments/filters/StarCalc_4_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_4_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 4.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu index b27b0cd4fcc1..caa58a176d00 100644 --- a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 4.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarCalc_5_0.xcu b/filter/source/config/fragments/filters/StarCalc_5_0.xcu index 7378d4d7a405..4f9838bb5e95 100644 --- a/filter/source/config/fragments/filters/StarCalc_5_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu index edefd738acfa..ad43c3b0e1c9 100644 --- a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarCalc 5.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarChart_3_0.xcu b/filter/source/config/fragments/filters/StarChart_3_0.xcu index ca7c4ab13867..fa756883f332 100644 --- a/filter/source/config/fragments/filters/StarChart_3_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_3_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarChart 3.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER SILENTEXPORT</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarChart_4_0.xcu b/filter/source/config/fragments/filters/StarChart_4_0.xcu index d6b909ed2537..ed5e69c88ade 100644 --- a/filter/source/config/fragments/filters/StarChart_4_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_4_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarChart 4.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER SILENTEXPORT</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarChart_5_0.xcu b/filter/source/config/fragments/filters/StarChart_5_0.xcu index 8f095aef9c79..43326bd6e82a 100644 --- a/filter/source/config/fragments/filters/StarChart_5_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarChart 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER SILENTEXPORT</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_3_0.xcu b/filter/source/config/fragments/filters/StarDraw_3_0.xcu index e4c22be3a3ee..3f9ca691236d 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 3.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu index ab1dd6f0ad23..ce8eda7943b0 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 3.0 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu index f255fb901937..f44f7da0dac8 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 3.0 Vorlage (StarImpress)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu index b0ce586e9ee9..1dcce8b34680 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 3.0 (StarImpress)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_5_0.xcu b/filter/source/config/fragments/filters/StarDraw_5_0.xcu index da5376827a41..ef5075ef066e 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu index 298ab1215761..7168ce984f8f 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 5.0 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu index 8261bc648b93..2956522f2e67 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 5.0 Vorlage (StarImpress)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu index a76ebfc3f3c2..67d03c77af17 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarDraw 5.0 (StarImpress)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarImpress_4_0.xcu b/filter/source/config/fragments/filters/StarImpress_4_0.xcu index b8bd8c51bbb0..ef28390774b5 100644 --- a/filter/source/config/fragments/filters/StarImpress_4_0.xcu +++ b/filter/source/config/fragments/filters/StarImpress_4_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarImpress 4.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu index 68ad61d1270e..b4d73953bd00 100644 --- a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="StarImpress 4.0 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarImpress_5_0.xcu b/filter/source/config/fragments/filters/StarImpress_5_0.xcu index 544b9187d1f2..1c1377cf3ab7 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarImpress 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu index c73995cca8c6..9da35f9745e4 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="StarImpress 5.0 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/StarMath_5_0.xcu b/filter/source/config/fragments/filters/StarMath_5_0.xcu index e583d4bf32ec..6d52188d81dd 100644 --- a/filter/source/config/fragments/filters/StarMath_5_0.xcu +++ b/filter/source/config/fragments/filters/StarMath_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarMath 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>0</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_3_0.xcu b/filter/source/config/fragments/filters/StarWriter_3_0.xcu index 6942622a7a14..30d52dde4fa8 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 3.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW3</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu index 7902ef2181b8..af6c79baaf6c 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 3.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW3V</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu index 4c5b0aa89af8..aedeb92e6a51 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 3.0 (StarWriter/GlobalDocument)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW3</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu index a68affbce5ea..fd33dc7a4cf0 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 3.0 (StarWriter/Web)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW3</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_4_0.xcu b/filter/source/config/fragments/filters/StarWriter_4_0.xcu index 5c23ef96809c..a5ba428c58ad 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 4.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu index 3992a973d896..9c0058b832d7 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 4.0/GlobalDocument" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu index 16feb8df0b3d..70efeb98a308 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 4.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4V</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu index 9eff3b736f14..437a26106391 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 4.0 (StarWriter/GlobalDocument)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu index 04f97b796b6c..1a44d99564d0 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 4.0 (StarWriter/Web)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_5_0.xcu b/filter/source/config/fragments/filters/StarWriter_5_0.xcu index 4556fc72d8c8..cdd8241af507 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 5.0" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu index 3604d7c828b8..1149f621b878 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 5.0/GlobalDocument" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu index c33a323126cc..b249680af26b 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 5.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5V</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu index c5bef5aead6e..fb99f014220e 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 5.0 (StarWriter/GlobalDocument)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu index 35cf7c56746d..076f95990b7a 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter 5.0 (StarWriter/Web)" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>TEMPLATE ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu index 51367423c493..33a0a82f44eb 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter/Web 4.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW4VWEB</value></prop> diff --git a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu index 2f696b08defa..efdc14034980 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="StarWriter/Web 5.0 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop> <prop oor:name="UserData"><value>CSW5VWEB</value></prop> diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 38b97a025b16..3f9cd0abfe30 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -338,6 +338,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -360,6 +363,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -387,6 +393,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -407,6 +416,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -440,6 +452,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -457,6 +472,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -483,6 +501,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -500,6 +521,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -528,6 +552,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } @@ -548,6 +575,9 @@ BOOL TGAReader::ImplReadBody() nXCount = 0; nY += nYAdd; nYCount++; + + if( nYCount >= mpFileHeader->nImageHeight ) + return false; // invalid picture } } } diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx index d17af3b2681b..498349320025 100644 --- a/filter/source/msfilter/svxmsbas.cxx +++ b/filter/source/msfilter/svxmsbas.cxx @@ -114,7 +114,6 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName, return false; bool bRet = true; - SFX_APP()->EnterBasicCall(); try { Reference<XMultiServiceFactory> xSF(comphelper::getProcessServiceFactory()); @@ -192,7 +191,6 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName, DBG_ERRORFILE( "SvxImportMSVBasic::ImportForms_Impl - any exception caught" ); //bRet = false; } - SFX_APP()->LeaveBasicCall(); return bRet; } @@ -248,7 +246,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, VBA_Impl aVBA( *xRoot, bAsComment ); if( aVBA.Open(rStorageName,rSubStorageName) ) { - SFX_APP()->EnterBasicCall(); Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer(); DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" ); @@ -492,7 +489,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, } bRet = true; } - SFX_APP()->LeaveBasicCall(); } return bRet; } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 382dd12eeb83..a7f8fdb2b569 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -819,7 +819,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue pPDFExtOutDevData->SetIsReduceImageResolution( mbReduceImageResolution ); pPDFExtOutDevData->SetIsExportNamedDestinations( mbExportBmkToDest ); - Sequence< PropertyValue > aRenderOptions( 5 ); + Sequence< PropertyValue > aRenderOptions( 6 ); aRenderOptions[ 0 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ); aRenderOptions[ 0 ].Value <<= Reference< awt::XDevice >( pXDevice ); aRenderOptions[ 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ); @@ -831,12 +831,8 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue aRenderOptions[ 3 ].Value <<= sal_False; aRenderOptions[ 4 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages" ) ); aRenderOptions[ 4 ].Value <<= mbSkipEmptyPages; - #if 0 - // #i113919# writer has to begun "PageRange" for itself changing its renderer count - // we should unify this behavior but not for OOo 3.3 aRenderOptions[ 5 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ); aRenderOptions[ 5 ].Value <<= aPageRange; - #endif if( aPageRange.getLength() || !aSelection.hasValue() ) { |