diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2022-03-26 01:33:29 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-04-12 08:22:47 +0200 |
| commit | 10cfe5955d8d2e7d5adfdd16c1c0404f363fb116 (patch) | |
| tree | 5deda8f976de74e2a37899ba56ab5b8ccc15f7c9 /oox | |
| parent | 21abacc7b43922b62129b425a865923229de35d1 (diff) | |
sc: add support for xr2 namespace and read uid of sparkline group
Change-Id: I470819a89338f4fb1d9b2486ffb4d93f8eb42844
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132504
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 1d25d32b4dcfbc750b8344cd79279aad0d621edf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132843
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 2 | ||||
| -rw-r--r-- | oox/source/token/namespaces-strict.txt | 1 | ||||
| -rw-r--r-- | oox/source/token/namespaces.hxx.tail | 1 | ||||
| -rw-r--r-- | oox/source/token/namespaces.txt | 1 | ||||
| -rw-r--r-- | oox/source/token/tokens.txt | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index daea0ad49962..877e8d52eda3 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -146,6 +146,8 @@ const Sequence< beans::Pair< OUString, sal_Int32 > >& NamespaceIds() NMSP_x12ac}, {"http://schemas.microsoft.com/office/drawing/2012/chart", NMSP_c15}, + {"http://schemas.microsoft.com/office/spreadsheetml/2015/revision2", + NMSP_xr2}, }; return SINGLETON; }; diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 5024249bfacc..7449dca99a33 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -88,6 +88,7 @@ w15 http://schemas.microsoft.com/office/word/2012/wordml p15 http://schemas.microsoft.com/office/powerpoint/2012/main x12ac http://schemas.microsoft.com/office/spreadsheetml/2011/1/ac c15 http://schemas.microsoft.com/office/drawing/2012/chart +xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/revision2 # extlst namespaces diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index fdea5b96f1b4..382955683d7d 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -62,6 +62,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } #define W_TOKEN( token ) OOX_TOKEN( doc, token ) #define LOEXT_TOKEN( token ) OOX_TOKEN( loext, token ) #define M_TOKEN(token) OOX_TOKEN(officeMath, token) +#define XR2_TOKEN(token) OOX_TOKEN(xr2, token) diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index f18e0833f31d..849caa547695 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -88,6 +88,7 @@ w15 http://schemas.microsoft.com/office/word/2012/wordml p15 http://schemas.microsoft.com/office/powerpoint/2012/main x12ac http://schemas.microsoft.com/office/spreadsheetml/2011/1/ac c15 http://schemas.microsoft.com/office/drawing/2012/chart +xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/revision2 # extlst namespaces diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 593ef0b23a5d..d1a40140add9 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -5848,6 +5848,7 @@ xmlDataType xmlPr xmlns xpath +xr2 xrange xsc xscale |