diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-15 04:36:13 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-15 05:25:11 +0200 |
| commit | 52077be6a1053f6c9c0118d6c116780fc27d43b5 (patch) | |
| tree | 49410694101eb4431a7839f647048401aa758037 /oox | |
| parent | 7fde89045f21019c84f461da566369440e1106dd (diff) | |
support iconSets in extLst entries
Change-Id: Iec293ec3541b87b16f5a8097d51b878166814670
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 2 | ||||
| -rw-r--r-- | oox/source/token/namespaces-strict.txt | 4 | ||||
| -rw-r--r-- | oox/source/token/namespaces.hxx.tail | 2 | ||||
| -rw-r--r-- | oox/source/token/namespaces.txt | 4 | ||||
| -rw-r--r-- | oox/source/token/tokens.txt | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 772142b7bf4c..cde386b59944 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -146,7 +146,7 @@ struct NamespaceIds: public rtl::StaticWithInit< NMSP_mce, NMSP_mceTest, NMSP_dsp, - NMSP_xlsExtLst + NMSP_xls14Lst }; Sequence< beans::Pair< OUString, sal_Int32 > > aRet(SAL_N_ELEMENTS(namespaceIds)); diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 39a4fb58324a..9359f8b48094 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -78,5 +78,5 @@ a14 http://schemas.microsoft.com/office/drawingml/2010/main # extlst namespaces -# xlsExtLst for features introduced by excel 2010 -xlsExtLst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main +# xls14Lst for features introduced by excel 2010 +xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index 378b0daf135a..de5cc21d86a6 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -46,7 +46,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } #define VMLX_TOKEN( token ) OOX_TOKEN( vmlExcel, token ) #define XDR_TOKEN( token ) OOX_TOKEN( dmlSpreadDr, token ) #define XLS_TOKEN( token ) OOX_TOKEN( xls, token ) -#define XLS_EXT_TOKEN( token ) OOX_TOKEN( xlsExtLst, token ) +#define XLS14_TOKEN( token ) OOX_TOKEN( xls14Lst, token ) #define XM_TOKEN( token ) OOX_TOKEN( xm, token ) #define XML_TOKEN( token ) OOX_TOKEN( xml, token ) #define VMLPPT_TOKEN( token ) OOX_TOKEN( vmlPowerpoint, token ) diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index 98792d076342..face9d62db10 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -78,5 +78,5 @@ a14 http://schemas.microsoft.com/office/drawing/2010/main # extlst namespaces -# xlsExtLst for features introduced by excel 2010 -xlsExtLst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main +# xls14Lst for features introduced by excel 2010 +xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 8a2dd9b1eb66..c26e957f6d6b 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -1136,6 +1136,7 @@ centerGroup centered certificateBanner cf +cfIcon cfRule cfvo ch |