oox/source/core/xmlfilterbase.cxx | 1 - oox/source/token/namespaces-strict.txt | 5 ----- oox/source/token/namespaces.hxx.tail | 1 - oox/source/token/namespaces.txt | 4 ---- oox/source/token/tokens.txt | 1 - 5 files changed, 12 deletions(-)
New commits: commit 0bae59ec74062d6035e1d79ddee5c70e23d52564 Author: Kurt Nordback <[email protected]> AuthorDate: Thu Jan 22 12:30:09 2026 -0700 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jan 27 06:52:20 2026 +0100 Revert "tdf#165742 Step 1: Introduce chartex namespace in parser and export" This reverts commit 93f9298be0c0ad10f8a8bbe7d18645c8faf5f913. Change-Id: I9daef619c26925e5d4a750f288b29f051fe6d8fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197908 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index a1ffc777aff6..4c3acd89545e 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -157,7 +157,6 @@ const Sequence< beans::Pair< OUString, sal_Int32 > >& NamespaceIds() NMSP_xr16}, {u"http://schemas.microsoft.com/office/drawing/2017/decorative"_ustr, NMSP_adec}, {u"http://schemas.microsoft.com/office/drawing/2016/SVG/main"_ustr, NMSP_asvg}, - {u"http://schemas.microsoft.com/office/drawing/2014/chartex"_ustr, NMSP_chartex}, {u"http://schemas.microsoft.com/office/spreadsheetml/2019/namedsheetviews"_ustr, NMSP_xnsv}, }; return SINGLETON; diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index ba13a5f5f13b..53f69146975a 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -55,7 +55,6 @@ dmlPicture http://purl.oclc.org/ooxml/drawingml/picture dmlSpreadDr http://purl.oclc.org/ooxml/drawingml/spreadsheetDrawing dmlWordDr http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing - # VML ------------------------------------------------------------------------- vml urn:schemas-microsoft-com:vml @@ -94,10 +93,6 @@ x15 http://schemas.microsoft.com/office/spreadsheetml/2010/1 xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/revision2 xr16 http://schemas.microsoft.com/office/spreadsheetml/2017/revision16 -# MSO 2014 extensions --------------------------------------------------------- - -chartex http://schemas.microsoft.com/office/drawing/2014/chartex - # extlst namespaces adec http://schemas.microsoft.com/office/drawing/2017/decorative diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index f35cc20b36d3..52e7ae8a1d04 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -66,7 +66,6 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } #define XR2_TOKEN(token) OOX_TOKEN(xr2, token) #define XR16_TOKEN(token) OOX_TOKEN(xr16, token) #define WPC_TOKEN(token) OOX_TOKEN(wpc, token) -#define CHARTEX_TOKEN(token) OOX_TOKEN(chartex, token) #define XNSV_TOKEN(token) OOX_TOKEN(xnsv, token) diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index aa3681ebfc08..68f3809ad128 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -93,10 +93,6 @@ c15 http://schemas.microsoft.com/office/drawing/2012/chart xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/revision2 xr16 http://schemas.microsoft.com/office/spreadsheetml/2017/revision16 -# MSO 2014 extensions --------------------------------------------------------- - -chartex http://schemas.microsoft.com/office/drawing/2014/chartex - # extlst namespaces adec http://schemas.microsoft.com/office/drawing/2017/decorative diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 72a9986b224f..f352ccd62455 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -1179,7 +1179,6 @@ chartPlus chartSpace chartStar chartX -chartex chartreuse chartsheet checkBox
