diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
| commit | 11c19ba7fb8c78662e64fa31e86f150057df33d9 (patch) | |
| tree | 5793fc5ab7830ea8dba1136e5c17d2fbeb5e97ca /filter | |
| parent | 67948f27546e46818e3b630fcb753c6d8dc8a20a (diff) | |
| parent | fea4f71bcd4727fe0b445990d062fa4bc12dc18d (diff) | |
mib17: rebase to DEV300_m84
Diffstat (limited to 'filter')
45 files changed, 471 insertions, 62 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 827682e09cd9..244a78864228 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -114,13 +114,14 @@ extern rtl::OUString pFilterStrings[]; #define CFGDIRECTKEY_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatVersion" ) #define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooName" ) -/** @short names of filter flags. */ +/** @short names of filter flags, sorted in alphabetical order */ #define FLAGNAME_3RDPARTYFILTER _FILTER_CONFIG_FROM_ASCII_("3RDPARTYFILTER" ) #define FLAGNAME_ALIEN _FILTER_CONFIG_FROM_ASCII_("ALIEN" ) #define FLAGNAME_ASYNCHRON _FILTER_CONFIG_FROM_ASCII_("ASYNCHRON" ) #define FLAGNAME_BROWSERPREFERRED _FILTER_CONFIG_FROM_ASCII_("BROWSERPREFERRED" ) #define FLAGNAME_CONSULTSERVICE _FILTER_CONFIG_FROM_ASCII_("CONSULTSERVICE" ) #define FLAGNAME_DEFAULT _FILTER_CONFIG_FROM_ASCII_("DEFAULT" ) +#define FLAGNAME_ENCRYPTION _FILTER_CONFIG_FROM_ASCII_("ENCRYPTION" ) #define FLAGNAME_EXPORT _FILTER_CONFIG_FROM_ASCII_("EXPORT" ) #define FLAGNAME_IMPORT _FILTER_CONFIG_FROM_ASCII_("IMPORT" ) #define FLAGNAME_INTERNAL _FILTER_CONFIG_FROM_ASCII_("INTERNAL" ) @@ -129,6 +130,7 @@ extern rtl::OUString pFilterStrings[]; #define FLAGNAME_NOTINSTALLED _FILTER_CONFIG_FROM_ASCII_("NOTINSTALLED" ) #define FLAGNAME_OWN _FILTER_CONFIG_FROM_ASCII_("OWN" ) #define FLAGNAME_PACKED _FILTER_CONFIG_FROM_ASCII_("PACKED" ) +#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" ) @@ -138,30 +140,32 @@ extern rtl::OUString pFilterStrings[]; #define FLAGNAME_USESOPTIONS _FILTER_CONFIG_FROM_ASCII_("USESOPTIONS" ) #define FLAGNAME_COMBINED _FILTER_CONFIG_FROM_ASCII_("COMBINED" ) -/** @short values of filter flags */ -#define FLAGVAL_3RDPARTYFILTER 0x00080000 // 524288 -#define FLAGVAL_ALIEN 0x00000040 // 64 -#define FLAGVAL_ALL 0xffffffff // 4294967295 -#define FLAGVAL_ASYNCHRON 0x00004000 // 16384 -#define FLAGVAL_BROWSERPREFERRED 0x00400000 // 4194304 -#define FLAGVAL_CONSULTSERVICE 0x00040000 // 262144 -#define FLAGVAL_DEFAULT 0x00000100 // 256 -#define FLAGVAL_EXPORT 0x00000002 // 2 +/** @short values of filter flags, sorted based on value */ #define FLAGVAL_IMPORT 0x00000001 // 1 +#define FLAGVAL_EXPORT 0x00000002 // 2 +#define FLAGVAL_TEMPLATE 0x00000004 // 4 #define FLAGVAL_INTERNAL 0x00000008 // 8 -#define FLAGVAL_NOTINCHOOSER 0x00002000 // 8192 +#define FLAGVAL_TEMPLATEPATH 0x00000010 // 16 +#define FLAGVAL_OWN 0x00000020 // 32 +#define FLAGVAL_ALIEN 0x00000040 // 64 +#define FLAGVAL_USESOPTIONS 0x00000080 // 128 +#define FLAGVAL_DEFAULT 0x00000100 // 256 +#define FLAGVAL_SUPPORTSSELECTION 0x00000400 // 1024 #define FLAGVAL_NOTINFILEDIALOG 0x00001000 // 4096 +#define FLAGVAL_NOTINCHOOSER 0x00002000 // 8192 +#define FLAGVAL_ASYNCHRON 0x00004000 // 16384 +#define FLAGVAL_READONLY 0x00010000 // 65536 #define FLAGVAL_NOTINSTALLED 0x00020000 // 131072 -#define FLAGVAL_OWN 0x00000020 // 32 +#define FLAGVAL_CONSULTSERVICE 0x00040000 // 262144 +#define FLAGVAL_3RDPARTYFILTER 0x00080000 // 524288 #define FLAGVAL_PACKED 0x00100000 // 1048576 -#define FLAGVAL_PREFERRED 0x10000000 // 268435456 -#define FLAGVAL_READONLY 0x00010000 // 65536 #define FLAGVAL_SILENTEXPORT 0x00200000 // 2097152 -#define FLAGVAL_SUPPORTSSELECTION 0x00000400 // 1024 -#define FLAGVAL_TEMPLATE 0x00000004 // 4 -#define FLAGVAL_TEMPLATEPATH 0x00000010 // 16 -#define FLAGVAL_USESOPTIONS 0x00000080 // 128 +#define FLAGVAL_BROWSERPREFERRED 0x00400000 // 4194304 #define FLAGVAL_COMBINED 0x00800000 // 8388608 +#define FLAGVAL_ENCRYPTION 0x01000000 // 16777216 +#define FLAGVAL_PASSWORDTOMODIFY 0x02000000 // 33554432 +#define FLAGVAL_PREFERRED 0x10000000 // 268435456 +#define FLAGVAL_ALL 0xffffffff // 4294967295 /** @short uno service names of our document services provided by our application modules. diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 43886258abcd..d4435e2182f1 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2098,6 +2098,7 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam if ((nFlags & FLAGVAL_BROWSERPREFERRED ) == FLAGVAL_BROWSERPREFERRED ) lFlagNames.push_back(FLAGNAME_BROWSERPREFERRED ); if ((nFlags & FLAGVAL_CONSULTSERVICE ) == FLAGVAL_CONSULTSERVICE ) lFlagNames.push_back(FLAGNAME_CONSULTSERVICE ); if ((nFlags & FLAGVAL_DEFAULT ) == FLAGVAL_DEFAULT ) lFlagNames.push_back(FLAGNAME_DEFAULT ); + if ((nFlags & FLAGVAL_ENCRYPTION ) == FLAGVAL_ENCRYPTION ) lFlagNames.push_back(FLAGNAME_ENCRYPTION ); if ((nFlags & FLAGVAL_EXPORT ) == FLAGVAL_EXPORT ) lFlagNames.push_back(FLAGNAME_EXPORT ); if ((nFlags & FLAGVAL_IMPORT ) == FLAGVAL_IMPORT ) lFlagNames.push_back(FLAGNAME_IMPORT ); if ((nFlags & FLAGVAL_INTERNAL ) == FLAGVAL_INTERNAL ) lFlagNames.push_back(FLAGNAME_INTERNAL ); @@ -2106,6 +2107,7 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam if ((nFlags & FLAGVAL_NOTINSTALLED ) == FLAGVAL_NOTINSTALLED ) lFlagNames.push_back(FLAGNAME_NOTINSTALLED ); if ((nFlags & FLAGVAL_OWN ) == FLAGVAL_OWN ) lFlagNames.push_back(FLAGNAME_OWN ); if ((nFlags & FLAGVAL_PACKED ) == FLAGVAL_PACKED ) lFlagNames.push_back(FLAGNAME_PACKED ); + 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 ); @@ -2160,6 +2162,11 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< nField |= FLAGVAL_DEFAULT; continue; } + if (pNames[i].equals(FLAGNAME_ENCRYPTION)) + { + nField |= FLAGVAL_ENCRYPTION; + continue; + } if (pNames[i].equals(FLAGNAME_EXPORT)) { nField |= FLAGVAL_EXPORT; @@ -2200,6 +2207,11 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< nField |= FLAGVAL_PACKED; continue; } + if (pNames[i].equals(FLAGNAME_PASSWORDTOMODIFY)) + { + nField |= FLAGVAL_PASSWORDTOMODIFY; + continue; + } if (pNames[i].equals(FLAGNAME_PREFERRED)) { nField |= FLAGVAL_PREFERRED; diff --git a/filter/source/config/fragments/filters/MS_Excel_97.xcu b/filter/source/config/fragments/filters/MS_Excel_97.xcu index 26df5966f821..1baa4341d90d 100644 --- a/filter/source/config/fragments/filters/MS_Excel_97.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_97.xcu @@ -1,5 +1,5 @@ <node oor:name="MS Excel 97" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu index 552b4b7b7ed7..42c997f967f9 100644 --- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="MS Excel 97 Vorlage/Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu index 20c55429e465..7c61f7c14084 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu @@ -1,5 +1,5 @@ <node oor:name="MS PowerPoint 97" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>sdfilt</value></prop> diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu index b0776fda9500..505084d4d39f 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="MS PowerPoint 97 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH ALIEN ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>sdfilt</value></prop> diff --git a/filter/source/config/fragments/filters/MS_Word_97.xcu b/filter/source/config/fragments/filters/MS_Word_97.xcu index 3319c07c5c23..c02a895b82f8 100644 --- a/filter/source/config/fragments/filters/MS_Word_97.xcu +++ b/filter/source/config/fragments/filters/MS_Word_97.xcu @@ -1,5 +1,5 @@ <node oor:name="MS Word 97" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CWW8</value></prop> diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu index 62aee6e4b493..35d694a4832d 100644 --- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu +++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu @@ -1,5 +1,5 @@ <node oor:name="MS Word 97 Vorlage" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH ALIEN ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CWW8</value></prop> diff --git a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu index 7c80e41f6030..b6ab09ac89cd 100644 --- a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu @@ -1,5 +1,5 @@ <node oor:name="MathML XML (Math)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE ENCRYPTION</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/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index 34bc14a39a6c..c9bc143ac3d8 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Base)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu index ad43d312327b..36970e6aadae 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Calc)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION</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/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu index ffc5331e8684..b7e05cb17860 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Chart)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 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/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu index 8ff6e431c970..089cc612d6c6 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Draw)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu index e77c04c5ea1d..5912555177d1 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Impress)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu index 64b73933cf0e..282bff7448ed 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Math)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION</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/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu index d6604a1e872a..c86b1d3deda7 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu @@ -1,5 +1,5 @@ <node oor:name="StarOffice XML (Writer)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/calc8.xcu b/filter/source/config/fragments/filters/calc8.xcu index 1b1e025f176e..1c77a96ad887 100644 --- a/filter/source/config/fragments/filters/calc8.xcu +++ b/filter/source/config/fragments/filters/calc8.xcu @@ -1,5 +1,5 @@ <node oor:name="calc8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT ENCRYPTION PASSWORDTOMODIFY</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/calc8_template.xcu b/filter/source/config/fragments/filters/calc8_template.xcu index f471287cc3d7..5b5c1d5c3d56 100644 --- a/filter/source/config/fragments/filters/calc8_template.xcu +++ b/filter/source/config/fragments/filters/calc8_template.xcu @@ -1,5 +1,5 @@ <node oor:name="calc8_template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY</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/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu index 913cb231fb21..56e132620108 100644 --- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu +++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="calc_StarOffice_XML_Calc_Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION</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/chart8.xcu b/filter/source/config/fragments/filters/chart8.xcu index ed36251542c1..c3700acfeb65 100644 --- a/filter/source/config/fragments/filters/chart8.xcu +++ b/filter/source/config/fragments/filters/chart8.xcu @@ -1,5 +1,5 @@ <node oor:name="chart8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER 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/draw8.xcu b/filter/source/config/fragments/filters/draw8.xcu index 733619f798b8..6a1df34e4af3 100644 --- a/filter/source/config/fragments/filters/draw8.xcu +++ b/filter/source/config/fragments/filters/draw8.xcu @@ -1,5 +1,5 @@ <node oor:name="draw8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/draw8_template.xcu b/filter/source/config/fragments/filters/draw8_template.xcu index b98082ffec29..3f42e65f5853 100644 --- a/filter/source/config/fragments/filters/draw8_template.xcu +++ b/filter/source/config/fragments/filters/draw8_template.xcu @@ -1,5 +1,5 @@ <node oor:name="draw8_template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu index 447b7e976f81..55f1f96a922f 100644 --- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu +++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="draw_StarOffice_XML_Draw_Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/impress8.xcu b/filter/source/config/fragments/filters/impress8.xcu index 04c70d9d2ceb..099bce62d3c5 100644 --- a/filter/source/config/fragments/filters/impress8.xcu +++ b/filter/source/config/fragments/filters/impress8.xcu @@ -1,5 +1,5 @@ <node oor:name="impress8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/impress8_draw.xcu b/filter/source/config/fragments/filters/impress8_draw.xcu index f88bc1bb9c61..5781c2a3e709 100644 --- a/filter/source/config/fragments/filters/impress8_draw.xcu +++ b/filter/source/config/fragments/filters/impress8_draw.xcu @@ -1,5 +1,5 @@ <node oor:name="impress8_draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/impress8_template.xcu b/filter/source/config/fragments/filters/impress8_template.xcu index 3089f09cd037..891f8f86b0c4 100644 --- a/filter/source/config/fragments/filters/impress8_template.xcu +++ b/filter/source/config/fragments/filters/impress8_template.xcu @@ -1,5 +1,5 @@ <node oor:name="impress8_template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu index 284a4a9dbf74..225843c661b7 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu @@ -1,5 +1,5 @@ <node oor:name="impress_StarOffice_XML_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>XML</value></prop> diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu index 090c096cdb42..472dcf16130a 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="impress_StarOffice_XML_Impress_Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/math8.xcu b/filter/source/config/fragments/filters/math8.xcu index 65ab9b04e568..94c86a96cf83 100644 --- a/filter/source/config/fragments/filters/math8.xcu +++ b/filter/source/config/fragments/filters/math8.xcu @@ -1,5 +1,5 @@ <node oor:name="math8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT ENCRYPTION</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/writer8.xcu b/filter/source/config/fragments/filters/writer8.xcu index 8d0ed46fd7ea..bcfd55640e79 100644 --- a/filter/source/config/fragments/filters/writer8.xcu +++ b/filter/source/config/fragments/filters/writer8.xcu @@ -1,5 +1,5 @@ <node oor:name="writer8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writer8_template.xcu b/filter/source/config/fragments/filters/writer8_template.xcu index 0b8c827498ab..34ee8055113c 100644 --- a/filter/source/config/fragments/filters/writer8_template.xcu +++ b/filter/source/config/fragments/filters/writer8_template.xcu @@ -1,5 +1,5 @@ <node oor:name="writer8_template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu index 3f5a9f1e0b4a..9c54cf04e06b 100644 --- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu +++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_StarOffice_XML_Writer_Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLV</value></prop> diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu index a68d2408ceaf..b1210080e631 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_globaldocument_StarOffice_XML_Writer" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN</value></prop> + <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu index 4d842afb8b8f..2dfb7fe0d21e 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu index db05aeb0224a..8e217e6d79a8 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_web_StarOffice_XML_Writer" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN</value></prop> + <prop oor:name="Flags"><value>EXPORT TEMPLATE ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu index b6d40705a892..64b3b8cdfe81 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_web_StarOffice_XML_Writer_Web_Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLVWEB</value></prop> diff --git a/filter/source/config/fragments/filters/writerglobal8.xcu b/filter/source/config/fragments/filters/writerglobal8.xcu index 02ee992f975c..df5fcb7e6d1b 100644 --- a/filter/source/config/fragments/filters/writerglobal8.xcu +++ b/filter/source/config/fragments/filters/writerglobal8.xcu @@ -1,5 +1,5 @@ <node oor:name="writerglobal8" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE OWN PREFERRED ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writerglobal8_writer.xcu b/filter/source/config/fragments/filters/writerglobal8_writer.xcu index f61bbeeea958..ca3794de493b 100644 --- a/filter/source/config/fragments/filters/writerglobal8_writer.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_writer.xcu @@ -1,5 +1,5 @@ <node oor:name="writerglobal8_writer" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE DEFAULT</value></prop> + <prop oor:name="Flags"><value>EXPORT TEMPLATE DEFAULT ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writerweb8_writer.xcu b/filter/source/config/fragments/filters/writerweb8_writer.xcu index 7b9096fa8a60..a3fbc783e92a 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer.xcu @@ -1,5 +1,5 @@ <node oor:name="writerweb8_writer" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT TEMPLATE</value></prop> + <prop oor:name="Flags"><value>EXPORT TEMPLATE ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> diff --git a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu index 9834200c5117..eb383eafaeeb 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu @@ -1,5 +1,5 @@ <node oor:name="writerweb8_writer_template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXMLVWEB</value></prop> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 73868d3a9f55..747306f81677 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5380,7 +5380,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con if ( nInstance == TSS_TYPE_PAGETITLE ) *pPtr = 0xb; else - aSpecMarkerList.Insert( (void*)( pPtr - pBuf | PPT_SPEC_NEWLINE ), LIST_APPEND ); + aSpecMarkerList.Insert( (void*)( (pPtr - pBuf) | PPT_SPEC_NEWLINE ), LIST_APPEND ); } pPtr++; } diff --git a/filter/source/xslt/export/spreadsheetml/formular.xsl b/filter/source/xslt/export/spreadsheetml/formular.xsl index 3acb4f393c42..8134412ec8d9 100644 --- a/filter/source/xslt/export/spreadsheetml/formular.xsl +++ b/filter/source/xslt/export/spreadsheetml/formular.xsl @@ -377,7 +377,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$earlierCandidate" /> - <xsl:variable name="parameterCandidate"> + <xsl:variable name="parameterCandidate2"> <xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" /> <xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" /> <xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" /> @@ -401,8 +401,8 @@ <xsl:call-template name="getParameter"> <xsl:with-param name="closingBracketCount" select="$closingBracketCount" /> <xsl:with-param name="openingBracketCount" select="$openingBracketCount" /> - <xsl:with-param name="parameterCandidate" select="$parameterCandidate" /> - <xsl:with-param name="earlierCandidate" select="$parameterCandidate" /> + <xsl:with-param name="parameterCandidate" select="$parameterCandidate2" /> + <xsl:with-param name="earlierCandidate" select="$parameterCandidate2" /> <xsl:with-param name="expressionSuffix" select="$expressionSuffix" /> </xsl:call-template> </xsl:otherwise> diff --git a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl index 027f732d2f2a..420d06474a3a 100644 --- a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl +++ b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl @@ -141,6 +141,17 @@ <RGB><xsl:value-of select="." /></RGB> </Color> </xsl:for-each> + <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]"> + <xsl:sort select="." /> + <Color> + <Index><xsl:value-of select="56 - position()" /></Index> + <RGB> + <xsl:call-template name="colordecimal2rgb"> + <xsl:with-param name="colordecimal" select="."/> + </xsl:call-template> + </RGB> + </Color> + </xsl:for-each> </Colors> </OfficeDocumentSettings> <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel"> @@ -171,6 +182,160 @@ </Workbook> </xsl:template> + <xsl:template name="colordecimal2rgb"> + <xsl:param name="colordecimal"/> + <xsl:choose> + <xsl:when test="$colordecimal <= 16777215 and $colordecimal >= 65536"> + <xsl:variable name="redValue" select="floor(($colordecimal) div 65536)"/> + <xsl:variable name="greenValue" select="floor(($colordecimal - ($redValue*65536)) div 256)"/> + <xsl:variable name="blueValue" select="$colordecimal - ($redValue*65536) - ($greenValue*256)"/> + <xsl:call-template name="dec_rgb2Hex"> + <xsl:with-param name="decRedValue" select="$redValue"/> + <xsl:with-param name="decGreenValue" select="$greenValue"/> + <xsl:with-param name="decBlueValue" select="$blueValue"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$colordecimal <= 65535 and $colordecimal >= 256"> + <xsl:variable name="redValue" select="0"/> + <xsl:variable name="greenValue" select="$colordecimal div 256"/> + <xsl:variable name="blueValue" select="$colordecimal - ($greenValue*256)"/> + <xsl:call-template name="dec_rgb2Hex"> + <xsl:with-param name="decRedValue" select="$redValue"/> + <xsl:with-param name="decGreenValue" select="$greenValue"/> + <xsl:with-param name="decBlueValue" select="$blueValue"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$colordecimal <= 255 and $colordecimal >= 0"> + <xsl:variable name="redValue" select="0"/> + <xsl:variable name="greenValue" select="0"/> + <xsl:variable name="blueValue" select="$colordecimal"/> + <xsl:call-template name="dec_rgb2Hex"> + <xsl:with-param name="decRedValue" select="$redValue"/> + <xsl:with-param name="decGreenValue" select="$greenValue"/> + <xsl:with-param name="decBlueValue" select="$blueValue"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise/> + </xsl:choose> + </xsl:template> + <xsl:template name="dec_rgb2Hex"> + <xsl:param name="decRedValue"/> + <xsl:param name="decGreenValue"/> + <xsl:param name="decBlueValue"/> + <xsl:variable name="hexRedValue"> + <xsl:variable name="tmpHexRedValue"> + <xsl:call-template name="decimal2hex"> + <xsl:with-param name="dec-number" select="$decRedValue"/> + <xsl:with-param name="last-value" select="'H'"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($tmpHexRedValue) = 1"> + <xsl:value-of select="concat('0',$tmpHexRedValue)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tmpHexRedValue"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="hexGreenValue"> + <xsl:variable name="tmpHexGreenValue"> + <xsl:call-template name="decimal2hex"> + <xsl:with-param name="dec-number" select="$decGreenValue"/> + <xsl:with-param name="last-value" select="'H'"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($tmpHexGreenValue) = 1"> + <xsl:value-of select="concat('0',$tmpHexGreenValue)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tmpHexGreenValue"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="hexBlueValue"> + <xsl:variable name="tmpHexBlueValue"> + <xsl:call-template name="decimal2hex"> + <xsl:with-param name="dec-number" select="$decBlueValue"/> + <xsl:with-param name="last-value" select="'H'"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($tmpHexBlueValue) = 1"> + <xsl:value-of select="concat('0',$tmpHexBlueValue)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tmpHexBlueValue"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:value-of select="concat('#',$hexRedValue,$hexGreenValue,$hexBlueValue)"/> + </xsl:template> + <xsl:template name="decimal2hex"> + <!-- transforms a decimal number to a hex number,only for two-bit hex(less than 256 in decimal) currently --> + <xsl:param name="dec-number"/> + <xsl:param name="last-value"/> + <xsl:variable name="current-value"> + <xsl:call-template name="decNumber2hex"> + <xsl:with-param name="dec-value"> + <xsl:if test="$dec-number > 15"> + <xsl:value-of select="floor($dec-number div 16)"/> + </xsl:if> + <xsl:if test="$dec-number < 16"> + <xsl:value-of select="$dec-number"/> + </xsl:if> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:if test="$dec-number > 15"> + <xsl:call-template name="decimal2hex"> + <xsl:with-param name="dec-number" select="$dec-number mod 16"/> + <xsl:with-param name="last-value" select="concat($last-value,$current-value)"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$dec-number < 16"> + <xsl:value-of select="substring-after(concat($last-value,$current-value),'H')"/> + </xsl:if> + </xsl:template> + + <xsl:template name="decNumber2hex"> + <!-- return a hex number for a decimal character --> + <xsl:param name="dec-value"/> + <xsl:choose> + <xsl:when test="$dec-value = 10"> + <xsl:value-of select="'A'"/> + </xsl:when> + <xsl:when test="$dec-value = 11"> + <xsl:value-of select="'B'"/> + </xsl:when> + <xsl:when test="$dec-value = 12"> + <xsl:value-of select="'C'"/> + </xsl:when> + <xsl:when test="$dec-value = 13"> + <xsl:value-of select="'D'"/> + </xsl:when> + <xsl:when test="$dec-value = 14"> + <xsl:value-of select="'E'"/> + </xsl:when> + <xsl:when test="$dec-value = 15"> + <xsl:value-of select="'F'"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$dec-value"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template name="GetTabColorIndex"> + <xsl:param name="SheetColor"/> + <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]"> + <xsl:sort select="." /> + <xsl:variable name="tmpColor" select="."/> + <xsl:if test=". = $SheetColor" > + <xsl:value-of select="56 - position()"/> + </xsl:if> + </xsl:for-each> + </xsl:template> <xsl:template match="office:body"> <!-- office:body table:table children are spreadsheets --> <xsl:apply-templates /> @@ -183,8 +348,11 @@ <!-- office:body table:table children are spreadsheets --> <xsl:template match="office:spreadsheet/table:table"> <xsl:element name="ss:Worksheet"> - <xsl:attribute name="ss:Name"> + <xsl:variable name="TableName"> <xsl:value-of select="@table:name" /> + </xsl:variable> + <xsl:attribute name="ss:Name"> + <xsl:value-of select="$TableName" /> </xsl:attribute> <xsl:call-template name="table:table" /> <xsl:element name="x:WorksheetOptions"> @@ -200,6 +368,16 @@ <xsl:if test="key('config', 'ShowZeroValues') = 'false'"> <xsl:element name="x:DoNotDisplayZeros" /> </xsl:if> + <xsl:if test="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']"> + <xsl:element name="x:TabColorIndex"> + <xsl:variable name="TabColorIndex"> + <xsl:call-template name="GetTabColorIndex"> + <xsl:with-param name="SheetColor" select="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']"/> + </xsl:call-template> + </xsl:variable> + <xsl:value-of select="$TabColorIndex"/> + </xsl:element> + </xsl:if> </xsl:element> </xsl:element> </xsl:template> diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index 64ac1302b744..71f1baa492d0 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -381,6 +381,16 @@ </xsl:otherwise> </xsl:choose> <xsl:copy-of select="$sharedConfiguration"/> + <xsl:if test="x:WorksheetOptions/x:TabColorIndex"> + <config:config-item config:name="TabColor" config:type="int"> + <xsl:variable name="temp-value"> + <xsl:call-template name="colorindex2decimal"> + <xsl:with-param name="colorindex" select="x:WorksheetOptions/x:TabColorIndex"/> + </xsl:call-template> + </xsl:variable> + <xsl:value-of select="$temp-value"/> + </config:config-item> + </xsl:if> </config:config-item-map-entry> </xsl:for-each> </config:config-item-map-named> @@ -4637,6 +4647,211 @@ </xsl:variable> <xsl:value-of select="concat('#',$R-value,$G-value,$B-value)"/> </xsl:template> + <xsl:template name="colorindex2decimal"> + <xsl:param name="colorindex"/> + <xsl:variable name="colorIndexLookup"> + <xsl:value-of select="$colorindex - 8"/> + </xsl:variable> + <xsl:variable name="tempColorValue"> + <xsl:choose> + <!-- Grab the color from the custom color index if it exists... --> + <xsl:when test="/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup"> + <xsl:value-of select="substring-after(normalize-space(/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:RGB[/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup]), '#')"/> + </xsl:when > + <xsl:otherwise> + <xsl:choose> + <xsl:when test="$colorindex=8"> + <xsl:value-of select="'000000'"/> + </xsl:when> + <xsl:when test="$colorindex=9"> + <xsl:value-of select="'FFFFFF'"/> + </xsl:when> + <xsl:when test="$colorindex=10"> + <xsl:value-of select="'FF0000'"/> + </xsl:when> + <xsl:when test="$colorindex=11"> + <xsl:value-of select="'00FF00'"/> + </xsl:when> + <xsl:when test="$colorindex=12"> + <xsl:value-of select="'0000FF'"/> + </xsl:when> + <xsl:when test="$colorindex=13"> + <xsl:value-of select="'FFFF00'"/> + </xsl:when> + <xsl:when test="$colorindex=14"> + <xsl:value-of select="'FF00FF'"/> + </xsl:when> + <xsl:when test="$colorindex=15"> + <xsl:value-of select="'00FFFF'"/> + </xsl:when> + <xsl:when test="$colorindex=16"> + <xsl:value-of select="'800000'"/> + </xsl:when> + <xsl:when test="$colorindex=17"> + <xsl:value-of select="'008000'"/> + </xsl:when> + <xsl:when test="$colorindex=18"> + <xsl:value-of select="'000080'"/> + </xsl:when> + <xsl:when test="$colorindex=19"> + <xsl:value-of select="'808000'"/> + </xsl:when> + <xsl:when test="$colorindex=20"> + <xsl:value-of select="'800080'"/> + </xsl:when> + <xsl:when test="$colorindex=21"> + <xsl:value-of select="'008080'"/> + </xsl:when> + <xsl:when test="$colorindex=22"> + <xsl:value-of select="'C0C0C0'"/> + </xsl:when> + <xsl:when test="$colorindex=23"> + <xsl:value-of select="'808080'"/> + </xsl:when> + <xsl:when test="$colorindex=24"> + <xsl:value-of select="'9999FF'"/> + </xsl:when> + <xsl:when test="$colorindex=25"> + <xsl:value-of select="'993366'"/> + </xsl:when> + <xsl:when test="$colorindex=26"> + <xsl:value-of select="'FFFFCC'"/> + </xsl:when> + <xsl:when test="$colorindex=27"> + <xsl:value-of select="'CCFFFF'"/> + </xsl:when> + <xsl:when test="$colorindex=28"> + <xsl:value-of select="'660066'"/> + </xsl:when> + <xsl:when test="$colorindex=29"> + <xsl:value-of select="'FF8080'"/> + </xsl:when> + <xsl:when test="$colorindex=30"> + <xsl:value-of select="'0066CC'"/> + </xsl:when> + <xsl:when test="$colorindex=31"> + <xsl:value-of select="'CCCCFF'"/> + </xsl:when> + <xsl:when test="$colorindex=32"> + <xsl:value-of select="'000080'"/> + </xsl:when> + <xsl:when test="$colorindex=33"> + <xsl:value-of select="'FF00FF'"/> + </xsl:when> + <xsl:when test="$colorindex=34"> + <xsl:value-of select="'FFFF00'"/> + </xsl:when> + <xsl:when test="$colorindex=35"> + <xsl:value-of select="'00FFFF'"/> + </xsl:when> + <xsl:when test="$colorindex=36"> + <xsl:value-of select="'800080'"/> + </xsl:when> + <xsl:when test="$colorindex=37"> + <xsl:value-of select="'800000'"/> + </xsl:when> + <xsl:when test="$colorindex=38"> + <xsl:value-of select="'008080'"/> + </xsl:when> + <xsl:when test="$colorindex=39"> + <xsl:value-of select="'0000FF'"/> + </xsl:when> + <xsl:when test="$colorindex=40"> + <xsl:value-of select="'00CCFF'"/> + </xsl:when> + <xsl:when test="$colorindex=41"> + <xsl:value-of select="'CCFFFF'"/> + </xsl:when> + <xsl:when test="$colorindex=42"> + <xsl:value-of select="'CCFFCC'"/> + </xsl:when> + <xsl:when test="$colorindex=43"> + <xsl:value-of select="'FFFF99'"/> + </xsl:when> + <xsl:when test="$colorindex=44"> + <xsl:value-of select="'99CCFF'"/> + </xsl:when> + <xsl:when test="$colorindex=45"> + <xsl:value-of select="'FF99CC'"/> + </xsl:when> + <xsl:when test="$colorindex=46"> + <xsl:value-of select="'CC99FF'"/> + </xsl:when> + <xsl:when test="$colorindex=47"> + <xsl:value-of select="'FFCC99'"/> + </xsl:when> + <xsl:when test="$colorindex=48"> + <xsl:value-of select="'3366FF'"/> + </xsl:when> + <xsl:when test="$colorindex=49"> + <xsl:value-of select="'33CCCC'"/> + </xsl:when> + <xsl:when test="$colorindex=50"> + <xsl:value-of select="'99CC00'"/> + </xsl:when> + <xsl:when test="$colorindex=51"> + <xsl:value-of select="'FFCC00'"/> + </xsl:when> + <xsl:when test="$colorindex=52"> + <xsl:value-of select="'FF9900'"/> + </xsl:when> + <xsl:when test="$colorindex=53"> + <xsl:value-of select="'FF6600'"/> + </xsl:when> + <xsl:when test="$colorindex=54"> + <xsl:value-of select="'666699'"/> + </xsl:when> + <xsl:when test="$colorindex=55"> + <xsl:value-of select="'969696'"/> + </xsl:when> + <xsl:when test="$colorindex=56"> + <xsl:value-of select="'003366'"/> + </xsl:when> + <xsl:when test="$colorindex=57"> + <xsl:value-of select="'339966'"/> + </xsl:when> + <xsl:when test="$colorindex=58"> + <xsl:value-of select="'003300'"/> + </xsl:when> + <xsl:when test="$colorindex=59"> + <xsl:value-of select="'333300'"/> + </xsl:when> + <xsl:when test="$colorindex=60"> + <xsl:value-of select="'993300'"/> + </xsl:when> + <xsl:when test="$colorindex=61"> + <xsl:value-of select="'993366'"/> + </xsl:when> + <xsl:when test="$colorindex=62"> + <xsl:value-of select="'333399'"/> + </xsl:when> + <xsl:when test="$colorindex=63"> + <xsl:value-of select="'333333'"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'NOTFOUND'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="tempColorDecimal"> + <xsl:choose> + <xsl:when test="not($tempColorValue = 'NOTFOUND')"> + <xsl:call-template name="hex2decimal"> + <xsl:with-param name="hex-number" select="$tempColorValue"/> + <xsl:with-param name="index" select="1"/> + <xsl:with-param name="str-length" select="6"/> + <xsl:with-param name="last-value" select="0"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="4294967295"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:value-of select="$tempColorDecimal"/> + </xsl:template> <xsl:template name="hex2decimal"> <!-- transforms a hex number to a decimal number.parses the string from left to right --> <xsl:param name="hex-number"/> diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk index 1a20572d1698..a5e27135e17a 100644 --- a/filter/source/xsltfilter/makefile.mk +++ b/filter/source/xsltfilter/makefile.mk @@ -66,7 +66,7 @@ JARCLASSDIRS = XSLTransformer*.class XSLTFilterOLEExtracter*.class JARTARGET = $(TARGET).jar .IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH+=$(SAXON_JAR) +XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) .ELSE JARFILES += saxon9.jar .ENDIF |