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 insertions(+)
New commits:
commit a0dd9ce966ca0b027262bdd077198973314efcf0
Author: knordback <kurt.nordb...@collabora.com>
AuthorDate: Wed Mar 5 06:55:07 2025 -0700
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Apr 2 06:25:07 2025 +0200
tdf#165742 Step 1: Introduce chartex namespace in parser and export
This is a subtask of tdf#165742: Chartex charts are lost on input from
OOXML and re-export.
Add the chartex namespace to the list of supported schemas
Change-Id: Ie98d316c6c8b15053ae58c474d7552352af1b0d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183457
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Jenkins
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 8cb7c5213514..63048c654fcd 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -154,6 +154,7 @@ 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},
};
return SINGLETON;
};
diff --git a/oox/source/token/namespaces-strict.txt
b/oox/source/token/namespaces-strict.txt
index 9d9d311f6ce8..36261d0707eb 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -55,6 +55,7 @@ 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
@@ -92,6 +93,10 @@ 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/namespaces.hxx.tail
b/oox/source/token/namespaces.hxx.tail
index 1e96938c5217..7d7012c9690e 100644
--- a/oox/source/token/namespaces.hxx.tail
+++ b/oox/source/token/namespaces.hxx.tail
@@ -65,6 +65,7 @@ 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)
} // namespace oox
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index fe0aa9ce9482..32c5ffdead1b 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -92,6 +92,10 @@ 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 a6a656b161b6..333dc269dfd8 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -1179,6 +1179,7 @@ chartPlus
chartSpace
chartStar
chartX
+chartex
chartreuse
chartsheet
checkBox
