core.git: include/svx svx/source

[Dr. David Alan Gilbert (via logerrit)]

 include/svx/EnhancedCustomShapeGeometry.hxx             |    3 
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |  376 ++++++++--------
 svx/source/svdraw/svdoashp.cxx                          |   18 
 3 files changed, 198 insertions(+), 199 deletions(-)

New commits:
commit abdb93ce28febd7c4b4e5dad164ee8a394b499b9
Author:     Dr. David Alan Gilbert <d...@treblig.org>
AuthorDate: Mon Jul 3 15:42:09 2023 +0100
Commit:     Hossein <hoss...@libreoffice.org>
CommitDate: Sat Dec 9 00:51:23 2023 +0100

    tdf#147021 Use std::span to avoid SAL_N_ELEMENTS in CustomShape
    
    as for previous set, this time for TextRectangles
    
    Again the data is mechanically search/replaced.
    
    Change-Id: I836a0c8384d08da6d8c05cfc6ef9f55c1c90fc12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153885
    Tested-by: Jenkins
    Reviewed-by: Hossein <hoss...@libreoffice.org>

diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx 
b/include/svx/EnhancedCustomShapeGeometry.hxx
index c776daff606a..b95501c288c3 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -75,8 +75,7 @@ struct mso_CustomShape
     sal_uInt32                              nElements;
     std::span<const SvxMSDffCalculationData> pCalculation;
     sal_Int32*                              pDefData;
-    SvxMSDffTextRectangles*                 pTextRect;
-    sal_uInt32                              nTextRect;
+    std::span<const SvxMSDffTextRectangles> pTextRect;
     sal_Int32                               nCoordWidth;
     sal_Int32                               nCoordHeight;
     sal_Int32                               nXRef;
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 31085c48b9a2..a70b25292e33 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -131,7 +131,7 @@ const mso_CustomShape msoArc =
     const_cast<sal_uInt16*>(mso_sptArcSegm), sizeof( mso_sptArcSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptArcCalc),
     const_cast<sal_Int32*>(mso_sptArcDefault),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -148,7 +148,7 @@ const mso_CustomShape msoTextSimple =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -165,7 +165,7 @@ const mso_CustomShape msoRectangle =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -210,7 +210,7 @@ const mso_CustomShape msoRoundRectangle =
     const_cast<sal_uInt16*>(mso_sptRoundRectangleSegm), sizeof( 
mso_sptRoundRectangleSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptRoundRectangleCalc),
     const_cast<sal_Int32*>(mso_sptDefault3600),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRoundRectangleTextRect), 
SAL_N_ELEMENTS( mso_sptRoundRectangleTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRoundRectangleTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -235,7 +235,7 @@ const mso_CustomShape msoRightTriangle =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRightTriangleTextRect), 
SAL_N_ELEMENTS( mso_sptRightTriangleTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRightTriangleTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptRightTriangleGluePoints),
@@ -264,7 +264,7 @@ const mso_CustomShape msoEllipse =
     const_cast<sal_uInt16*>(mso_sptEllipseSegm), sizeof( mso_sptEllipseSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseTextRect), 
SAL_N_ELEMENTS( mso_sptEllipseTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -315,7 +315,7 @@ const mso_CustomShape msoParallelogram =
     const_cast<sal_uInt16*>(mso_sptParallelogramSegm), sizeof( 
mso_sptParallelogramSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptParallelogramCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptParallelogramTextRect), 
SAL_N_ELEMENTS( mso_sptParallelogramTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptParallelogramTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptParallelogramGluePoints),
@@ -336,7 +336,7 @@ const mso_CustomShape msoDiamond =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDiamondTextRect), 
SAL_N_ELEMENTS( mso_sptDiamondTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDiamondTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -380,7 +380,7 @@ const mso_CustomShape msoTrapezoid =
     const_cast<sal_uInt16*>(mso_sptTrapezoidSegm), sizeof( 
mso_sptTrapezoidSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTrapezoidCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptTrapezoidTextRect), 
SAL_N_ELEMENTS( mso_sptTrapezoidTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptTrapezoidTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptTrapezoidGluePoints),
@@ -471,7 +471,7 @@ const mso_CustomShape msoOctagon =
     const_cast<sal_uInt16*>(mso_sptOctagonSegm), sizeof( mso_sptOctagonSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptOctagonCalc),
     const_cast<sal_Int32*>(mso_sptOctagonDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptOctagonTextRect), 
SAL_N_ELEMENTS( mso_sptOctagonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptOctagonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -517,7 +517,7 @@ const mso_CustomShape msoIsocelesTriangle =
     const_cast<sal_uInt16*>(mso_sptIsocelesTriangleSegm), sizeof( 
mso_sptIsocelesTriangleSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptIsocelesTriangleCalc),
     const_cast<sal_Int32*>(mso_sptDefault10800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptIsocelesTriangleTextRect), 
SAL_N_ELEMENTS( mso_sptIsocelesTriangleTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptIsocelesTriangleTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptIsocelesTriangleGluePoints),
@@ -556,7 +556,7 @@ const mso_CustomShape msoHexagon =
     const_cast<sal_uInt16*>(mso_sptHexagonSegm), sizeof( mso_sptHexagonSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptHexagonCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptHexagonTextRect), 
SAL_N_ELEMENTS( mso_sptHexagonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptHexagonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -583,7 +583,7 @@ const mso_CustomShape msoPentagon =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptPentagonTextRect), 
SAL_N_ELEMENTS( mso_sptPentagonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptPentagonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptPentagonGluePoints),
@@ -618,7 +618,7 @@ const mso_CustomShape msoPlus =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptPlusCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptPlusTextRect), SAL_N_ELEMENTS( 
mso_sptPlusTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptPlusTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -675,7 +675,7 @@ const mso_CustomShape msoCan =
     const_cast<sal_uInt16*>(mso_sptCanSegm), sizeof( mso_sptCanSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCanCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCanTextRect), SAL_N_ELEMENTS( 
mso_sptCanTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCanTextRect),
     88, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptCanGluePoints),
@@ -717,7 +717,7 @@ const mso_CustomShape msoArrow =
     const_cast<sal_uInt16*>(mso_sptArrowSegm), sizeof( mso_sptArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptArrowCalc),
     const_cast<sal_Int32*>(mso_sptDefault16200and5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptArrowTextRect), SAL_N_ELEMENTS( 
mso_sptArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -752,7 +752,7 @@ const mso_CustomShape msoLeftArrow =
     const_cast<sal_uInt16*>(mso_sptLeftArrowSegm), sizeof( 
mso_sptLeftArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptArrowCalc),
     const_cast<sal_Int32*>(mso_sptLeftArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftArrowTextRect), 
SAL_N_ELEMENTS( mso_sptLeftArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -783,7 +783,7 @@ const mso_CustomShape msoDownArrow =
     const_cast<sal_uInt16*>(mso_sptDownArrowSegm), sizeof( 
mso_sptDownArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptArrowCalc),
     const_cast<sal_Int32*>(mso_sptDefault16200and5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDownArrowTextRect), 
SAL_N_ELEMENTS( mso_sptDownArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDownArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -818,7 +818,7 @@ const mso_CustomShape msoUpArrow =
     const_cast<sal_uInt16*>(mso_sptUpArrowSegm), sizeof( mso_sptUpArrowSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptArrowCalc),
     const_cast<sal_Int32*>(mso_sptUpArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptUpArrowTextRect), 
SAL_N_ELEMENTS( mso_sptUpArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptUpArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -867,7 +867,7 @@ const mso_CustomShape msoLeftRightArrow =
     const_cast<sal_uInt16*>(mso_sptLeftRightArrowSegm), sizeof( 
mso_sptLeftRightArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDoubleArrowCalc),
     const_cast<sal_Int32*>(mso_sptLeftRightArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightArrowTextRect), 
SAL_N_ELEMENTS( mso_sptLeftRightArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftRightArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -903,7 +903,7 @@ const mso_CustomShape msoUpDownArrow =
     const_cast<sal_uInt16*>(mso_sptUpDownArrowSegm), sizeof( 
mso_sptUpDownArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDoubleArrowCalc),
     const_cast<sal_Int32*>(mso_sptUpDownArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptUpDownArrowTextRect), 
SAL_N_ELEMENTS( mso_sptUpDownArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptUpDownArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -953,7 +953,7 @@ const mso_CustomShape msoQuadArrow =
     const_cast<sal_uInt16*>(mso_sptQuadArrowSegm), sizeof( 
mso_sptQuadArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptQuadArrowCalc),
     const_cast<sal_Int32*>(mso_sptQuadArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptQuadArrowTextRect), 
SAL_N_ELEMENTS( mso_sptQuadArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptQuadArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1002,7 +1002,7 @@ const mso_CustomShape msoLeftRightUpArrow =
     const_cast<sal_uInt16*>(mso_sptLeftRightUpArrowSegm), sizeof( 
mso_sptLeftRightUpArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptLeftRightUpArrowCalc),
     const_cast<sal_Int32*>(mso_sptLeftRightUpArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightUpArrowTextRect), 
SAL_N_ELEMENTS( mso_sptLeftRightUpArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftRightUpArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1046,7 +1046,7 @@ const mso_CustomShape msoBentArrow =
     const_cast<sal_uInt16*>(mso_sptBentArrowSegm), sizeof( 
mso_sptBentArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBentArrowCalc),
     const_cast<sal_Int32*>(mso_sptBentArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBentArrowTextRect), 
SAL_N_ELEMENTS( mso_sptBentArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBentArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1077,7 +1077,7 @@ const mso_CustomShape msoUturnArrow =
     const_cast<sal_uInt16*>(mso_sptUturnArrowSegm), sizeof( 
mso_sptUturnArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptUturnArrowTextRect), 
SAL_N_ELEMENTS( mso_sptUturnArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptUturnArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1129,7 +1129,7 @@ const mso_CustomShape msoLeftUpArrow =
     const_cast<sal_uInt16*>(mso_sptLeftUpArrowSegm), sizeof( 
mso_sptLeftUpArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptLeftUpArrowCalc),
     const_cast<sal_Int32*>(mso_sptLeftUpArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftUpArrowTextRect), 
SAL_N_ELEMENTS( mso_sptLeftUpArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftUpArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1182,7 +1182,7 @@ const mso_CustomShape msoBentUpArrow =
     const_cast<sal_uInt16*>(mso_sptBentUpArrowSegm), sizeof( 
mso_sptBentUpArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBentUpArrowCalc),
     const_cast<sal_Int32*>(mso_sptBentUpArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBentUpArrowTextRect), 
SAL_N_ELEMENTS( mso_sptBentUpArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBentUpArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1291,7 +1291,7 @@ const mso_CustomShape msoCurvedRightArrow =
     const_cast<sal_uInt16*>(mso_sptCurvedRightSegm), sizeof( 
mso_sptCurvedRightSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCurvedRightCalc),
     const_cast<sal_Int32*>(mso_sptCurvedRightDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCurvedRightTextRect), 
SAL_N_ELEMENTS( mso_sptCurvedRightTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCurvedRightTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptCurvedRightGluePoints),
@@ -1347,7 +1347,7 @@ const mso_CustomShape msoCurvedDownArrow =
    const_cast<sal_uInt16*>(mso_sptCurvedDownSegm), sizeof( 
mso_sptCurvedDownSegm ) >> 1,
    std::span<const SvxMSDffCalculationData>(mso_sptCurvedRightCalc),
    const_cast<sal_Int32*>(mso_sptCurvedRightDefault),
-   const_cast<SvxMSDffTextRectangles*>(mso_sptCurvedDownTextRect), 
SAL_N_ELEMENTS( mso_sptCurvedDownTextRect ),
+   std::span<const SvxMSDffTextRectangles>(mso_sptCurvedDownTextRect),
    21600, 21600,
    MIN_INT32, MIN_INT32,
    std::span<const SvxMSDffVertPair>(mso_sptCurvedDownGluePoints),
@@ -1454,7 +1454,7 @@ const mso_CustomShape msoCurvedUpArrow =
    const_cast<sal_uInt16*>(mso_sptCurvedUpSegm), sizeof( mso_sptCurvedUpSegm ) 
>> 1,
    std::span<const SvxMSDffCalculationData>(mso_sptCurvedUpCalc),
    const_cast<sal_Int32*>(mso_sptCurvedUpDefault),
-   const_cast<SvxMSDffTextRectangles*>(mso_sptCurvedUpTextRect), 
SAL_N_ELEMENTS( mso_sptCurvedUpTextRect ),
+   std::span<const SvxMSDffTextRectangles>(mso_sptCurvedUpTextRect),
    21600, 21600,
    MIN_INT32, MIN_INT32,
    std::span<const SvxMSDffVertPair>(mso_sptCurvedUpGluePoints),
@@ -1508,7 +1508,7 @@ const mso_CustomShape msoCurvedLeftArrow =
     const_cast<sal_uInt16*>(mso_sptCurvedLeftSegm), sizeof( 
mso_sptCurvedLeftSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCurvedUpCalc),
     const_cast<sal_Int32*>(mso_sptCurvedUpDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCurvedLeftTextRect), 
SAL_N_ELEMENTS( mso_sptCurvedLeftTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCurvedLeftTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptCurvedLeftGluePoints),
@@ -1552,7 +1552,7 @@ const mso_CustomShape msoStripedRightArrow =
     const_cast<sal_uInt16*>(mso_sptStripedRightArrowSegm), sizeof( 
mso_sptStripedRightArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptStripedRightArrowCalc),
     const_cast<sal_Int32*>(mso_sptDefault16200and5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptStripedRightArrowTextRect), 
SAL_N_ELEMENTS( mso_sptStripedRightArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptStripedRightArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1589,7 +1589,7 @@ const mso_CustomShape msoNotchedRightArrow =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptNotchedRightArrowCalc),
     const_cast<sal_Int32*>(mso_sptDefault16200and5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptNotchedRightArrowTextRect), 
SAL_N_ELEMENTS( mso_sptNotchedRightArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptNotchedRightArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1628,7 +1628,7 @@ const mso_CustomShape msoHomePlate =
     const_cast<sal_uInt16*>(mso_sptHomePlateSegm), sizeof( 
mso_sptHomePlateSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptHomePlateCalc),
     const_cast<sal_Int32*>(mso_sptHomePlateDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptHomePlateTextRect), 
SAL_N_ELEMENTS( mso_sptHomePlateTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptHomePlateTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1668,7 +1668,7 @@ const mso_CustomShape msoChevron =
     const_cast<sal_uInt16*>(mso_sptChevronSegm), sizeof( mso_sptChevronSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptChevronCalc),
     const_cast<sal_Int32*>(mso_sptChevronDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptChevronTextRect), 
SAL_N_ELEMENTS( mso_sptChevronTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptChevronTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1717,7 +1717,7 @@ const mso_CustomShape msoRightArrowCallout =
     const_cast<sal_uInt16*>(mso_sptRightArrowCalloutSegm), sizeof( 
mso_sptRightArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptRightArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptRightArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRightArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptRightArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRightArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1766,7 +1766,7 @@ const mso_CustomShape msoLeftArrowCallout =
     const_cast<sal_uInt16*>(mso_sptLeftArrowCalloutSegm), sizeof( 
mso_sptLeftArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptLeftArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptLeftArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptLeftArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1815,7 +1815,7 @@ const mso_CustomShape msoUpArrowCallout =
     const_cast<sal_uInt16*>(mso_sptUpArrowCalloutSegm), sizeof( 
mso_sptUpArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptUpArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptUpArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptUpArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptUpArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptUpArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1864,7 +1864,7 @@ const mso_CustomShape msoDownArrowCallout =
     const_cast<sal_uInt16*>(mso_sptDownArrowCalloutSegm), sizeof( 
mso_sptDownArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDownArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptDownArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDownArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptDownArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDownArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1917,7 +1917,7 @@ const mso_CustomShape msoLeftRightArrowCallout =
     const_cast<sal_uInt16*>(mso_sptLeftRightArrowCalloutSegm), sizeof( 
mso_sptLeftRightArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptLeftRightArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptLeftRightArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptLeftRightArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -1970,7 +1970,7 @@ const mso_CustomShape msoUpDownArrowCallout =
     const_cast<sal_uInt16*>(mso_sptUpDownArrowCalloutSegm), sizeof( 
mso_sptUpDownArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptUpDownArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptUpDownArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptUpDownArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptUpDownArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -2026,7 +2026,7 @@ const mso_CustomShape msoQuadArrowCallout =
     const_cast<sal_uInt16*>(mso_sptQuadArrowCalloutSegm), sizeof( 
mso_sptQuadArrowCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptQuadArrowCalloutCalc),
     const_cast<sal_Int32*>(mso_sptQuadArrowCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptQuadArrowCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptQuadArrowCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptQuadArrowCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -2122,7 +2122,7 @@ const mso_CustomShape msoCircularArrow =
     const_cast<sal_uInt16*>(mso_sptCircularArrowSegm), sizeof( 
mso_sptCircularArrowSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCircularArrowCalc),
     const_cast<sal_Int32*>(mso_sptCircularArrowDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCircularArrowTextRect), 
SAL_N_ELEMENTS( mso_sptCircularArrowTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCircularArrowTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -2176,7 +2176,7 @@ const mso_CustomShape msoCube =
     const_cast<sal_uInt16*>(mso_sptCubeSegm), sizeof( mso_sptCubeSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCubeCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCubeTextRect), SAL_N_ELEMENTS( 
mso_sptCubeTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCubeTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(mso_sptCubeGluePoints),
@@ -2221,7 +2221,7 @@ const mso_CustomShape msoBevel =
     const_cast<sal_uInt16*>(mso_sptBevelSegm), sizeof( mso_sptBevelSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBevelCalc),
     const_cast<sal_Int32*>(mso_sptDefault2700),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBevelTextRect), SAL_N_ELEMENTS( 
mso_sptBevelTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBevelTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2273,7 +2273,7 @@ const mso_CustomShape msoFoldedCorner =
     const_cast<sal_uInt16*>(mso_sptFoldedCornerSegm), sizeof( 
mso_sptFoldedCornerSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptFoldedCornerCalc),
     const_cast<sal_Int32*>(mso_sptFoldedCornerDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFoldedCornerTextRect), 
SAL_N_ELEMENTS( mso_sptFoldedCornerTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFoldedCornerTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -2317,7 +2317,7 @@ const mso_CustomShape msoActionButtonBlank =
     const_cast<sal_uInt16*>(mso_sptActionButtonBlankSegm), sizeof( 
mso_sptActionButtonBlankSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonBlankCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonBlankTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonBlankTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonBlankTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2405,7 +2405,7 @@ const mso_CustomShape msoActionButtonHome =
     const_cast<sal_uInt16*>(mso_sptActionButtonHomeSegm), sizeof( 
mso_sptActionButtonHomeSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonHomeCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2515,7 +2515,7 @@ const mso_CustomShape msoActionButtonHelp =
     const_cast<sal_uInt16*>(mso_sptActionButtonHelpSegm), sizeof( 
mso_sptActionButtonHelpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonHelpCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2603,7 +2603,7 @@ const mso_CustomShape msoActionButtonInformation =
     const_cast<sal_uInt16*>(mso_sptActionButtonInformationSegm), sizeof( 
mso_sptActionButtonInformationSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptActionButtonInformationCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2656,7 +2656,7 @@ const mso_CustomShape msoActionButtonBackPrevious =
     const_cast<sal_uInt16*>(mso_sptActionButtonForwardBackSegm), sizeof( 
mso_sptActionButtonForwardBackSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptActionButtonForwardBackCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2679,7 +2679,7 @@ const mso_CustomShape msoActionButtonForwardNext =
     const_cast<sal_uInt16*>(mso_sptActionButtonForwardBackSegm), sizeof( 
mso_sptActionButtonForwardBackSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptActionButtonForwardBackCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2746,7 +2746,7 @@ const mso_CustomShape msoActionButtonBeginning =
     const_cast<sal_uInt16*>(mso_sptActionButtonBeginningEndSegm), sizeof( 
mso_sptActionButtonBeginningEndSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptActionButtonBeginningEndCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2771,7 +2771,7 @@ const mso_CustomShape msoActionButtonEnd =
     const_cast<sal_uInt16*>(mso_sptActionButtonBeginningEndSegm), sizeof( 
mso_sptActionButtonBeginningEndSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptActionButtonBeginningEndCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2860,7 +2860,7 @@ const mso_CustomShape msoActionButtonReturn =
     const_cast<sal_uInt16*>(mso_sptActionButtonReturnSegm), sizeof( 
mso_sptActionButtonReturnSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonReturnCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2920,7 +2920,7 @@ const mso_CustomShape msoActionButtonDocument =
     const_cast<sal_uInt16*>(mso_sptActionButtonDocumentSegm), sizeof( 
mso_sptActionButtonDocumentSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonDocumentCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -2996,7 +2996,7 @@ const mso_CustomShape msoActionButtonSound =
     const_cast<sal_uInt16*>(mso_sptActionButtonSoundSegm), sizeof( 
mso_sptActionButtonSoundSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonSoundCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -3081,7 +3081,7 @@ const mso_CustomShape msoActionButtonMovie =
     const_cast<sal_uInt16*>(mso_sptActionButtonMovieSegm), sizeof( 
mso_sptActionButtonMovieSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptActionButtonMovieCalc),
     const_cast<sal_Int32*>(mso_sptDefault1400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), 
SAL_N_ELEMENTS( mso_sptActionButtonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptActionButtonTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -3124,7 +3124,7 @@ const mso_CustomShape msoSmileyFace =
     const_cast<sal_uInt16*>(mso_sptSmileyFaceSegm), sizeof( 
mso_sptSmileyFaceSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptSmileyFaceCalc),
     const_cast<sal_Int32*>(mso_sptSmileyFaceDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseTextRect), 
SAL_N_ELEMENTS( mso_sptEllipseTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -3156,7 +3156,7 @@ const mso_CustomShape msoDonut =
     const_cast<sal_uInt16*>(mso_sptDonutSegm), sizeof( mso_sptDonutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDonutCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseTextRect), 
SAL_N_ELEMENTS( mso_sptEllipseTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -3205,7 +3205,7 @@ const mso_CustomShape msoNoSmoking =
     const_cast<sal_uInt16*>(mso_sptNoSmokingSegm), sizeof( 
mso_sptNoSmokingSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptNoSmokingCalc),
     const_cast<sal_Int32*>(mso_sptDefault2700),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseTextRect), 
SAL_N_ELEMENTS( mso_sptEllipseTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -3248,7 +3248,7 @@ const mso_CustomShape msoBlockArc =
     const_cast<sal_uInt16*>(mso_sptBlockArcSegm), sizeof( mso_sptBlockArcSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBlockArcCalc),
     const_cast<sal_Int32*>(mso_sptBlockArcDefault),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -3312,7 +3312,7 @@ const mso_CustomShape msoHeart =
     const_cast<sal_uInt16*>(mso_sptHeartSegm), sizeof( mso_sptHeartSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptHeartTextRect), SAL_N_ELEMENTS( 
mso_sptHeartTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptHeartTextRect),
     21615, 21602,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptHeartGluePoints),
@@ -3340,7 +3340,7 @@ const mso_CustomShape msoLightningBold =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLightningBoldTextRect), 
SAL_N_ELEMENTS( mso_sptLightningBoldTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLightningBoldTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptLightningBoldGluePoints),
@@ -3444,7 +3444,7 @@ const mso_CustomShape msoSun =
     const_cast<sal_uInt16*>(mso_sptSunSegm), sizeof( mso_sptSunSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptSunCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSunTextRect), SAL_N_ELEMENTS( 
mso_sptSunTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSunTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -3496,7 +3496,7 @@ const mso_CustomShape msoMoon =
     const_cast<sal_uInt16*>(mso_sptMoonSegm), sizeof( mso_sptMoonSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptMoonCalc),
     const_cast<sal_Int32*>(mso_sptDefault10800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptMoonTextRect), SAL_N_ELEMENTS( 
mso_sptMoonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptMoonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptMoonGluePoints),
@@ -3555,7 +3555,7 @@ const mso_CustomShape msoBracketPair =
     const_cast<sal_uInt16*>(mso_sptBracketPairSegm), sizeof( 
mso_sptBracketPairSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBracketPairCalc),
     const_cast<sal_Int32*>(mso_sptDefault3700),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBracketPairTextRect), 
SAL_N_ELEMENTS( mso_sptBracketPairTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBracketPairTextRect),
     21600, 21600,
     10800, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -3581,7 +3581,7 @@ const mso_CustomShape msoPlaque =
     const_cast<sal_uInt16*>(mso_sptPlaqueSegm), sizeof( mso_sptPlaqueSegm ) >> 
1,
     std::span<const SvxMSDffCalculationData>(mso_sptBracketPairCalc),
     const_cast<sal_Int32*>(mso_sptDefault3600),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptPlaqueTextRect), 
SAL_N_ELEMENTS( mso_sptPlaqueTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptPlaqueTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -3639,7 +3639,7 @@ const mso_CustomShape msoBracePair =
     const_cast<sal_uInt16*>(mso_sptBracePairSegm), sizeof( 
mso_sptBracePairSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBracePairCalc),
     const_cast<sal_Int32*>(mso_sptDefault1800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBracePairTextRect), 
SAL_N_ELEMENTS( mso_sptBracePairTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBracePairTextRect),
     21600, 21600,
     10800, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -3682,7 +3682,7 @@ const mso_CustomShape msoLeftBracket =
     const_cast<sal_uInt16*>(mso_sptBracketSegm), sizeof( mso_sptBracketSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBracketCalc),
     const_cast<sal_Int32*>(mso_sptDefault1800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftBracketTextRect), 
SAL_N_ELEMENTS( mso_sptLeftBracketTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftBracketTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptLeftBracketGluePoints),
@@ -3712,7 +3712,7 @@ const mso_CustomShape msoRightBracket =
     const_cast<sal_uInt16*>(mso_sptBracketSegm), sizeof( mso_sptBracketSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBracketCalc),
     const_cast<sal_Int32*>(mso_sptDefault1800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRightBracketTextRect), 
SAL_N_ELEMENTS( mso_sptRightBracketTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRightBracketTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptRightBracketGluePoints),
@@ -3768,7 +3768,7 @@ const mso_CustomShape msoLeftBrace =     // adj value0 0 
-> 5400
     const_cast<sal_uInt16*>(mso_sptBraceSegm), sizeof( mso_sptBraceSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBraceCalc),
     const_cast<sal_Int32*>(mso_sptBraceDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptLeftBraceTextRect), 
SAL_N_ELEMENTS( mso_sptLeftBraceTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptLeftBraceTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptLeftBracketGluePoints),
@@ -3801,7 +3801,7 @@ const mso_CustomShape msoRightBrace =        // adj 
value0 0 -> 5400
     const_cast<sal_uInt16*>(mso_sptBraceSegm), sizeof( mso_sptBraceSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBraceCalc),
     const_cast<sal_Int32*>(mso_sptBraceDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRightBraceTextRect), 
SAL_N_ELEMENTS( mso_sptRightBraceTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRightBraceTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptRightBracketGluePoints),
@@ -3831,7 +3831,7 @@ const mso_CustomShape msoIrregularSeal1 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptIrregularSeal1TextRect), 
SAL_N_ELEMENTS( mso_sptIrregularSeal1TextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptIrregularSeal1TextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptIrregularSeal1GluePoints),
@@ -3863,7 +3863,7 @@ const mso_CustomShape msoIrregularSeal2 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptIrregularSeal2TextRect), 
SAL_N_ELEMENTS( mso_sptIrregularSeal2TextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptIrregularSeal2TextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptIrregularSeal2GluePoints),
@@ -3899,7 +3899,7 @@ const mso_CustomShape msoSeal4 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptSeal4Calc),
     const_cast<sal_Int32*>(mso_sptDefault8100),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSeal4TextRect), SAL_N_ELEMENTS( 
mso_sptSeal4TextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSeal4TextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -3927,7 +3927,7 @@ const mso_CustomShape msoStar =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptStarTextRect), SAL_N_ELEMENTS( 
mso_sptStarTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptStarTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>( mso_sptStarGluePoints ),
@@ -4056,7 +4056,7 @@ const mso_CustomShape msoSeal8 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptSeal24Calc),
     const_cast<sal_Int32*>(mso_sptDefault2500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( 
mso_sptSealTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSealTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4152,7 +4152,7 @@ const mso_CustomShape msoSeal16 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptSeal16Calc),
     const_cast<sal_Int32*>(mso_sptDefault2500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( 
mso_sptSealTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSealTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4180,7 +4180,7 @@ const mso_CustomShape msoSeal24 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptSeal24Calc),
     const_cast<sal_Int32*>(mso_sptDefault2500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( 
mso_sptSealTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSealTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4348,7 +4348,7 @@ const mso_CustomShape msoSeal32 =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptSeal32Calc),
     const_cast<sal_Int32*>(mso_sptDefault2500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( 
mso_sptSealTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptSealTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4445,7 +4445,7 @@ const mso_CustomShape msoRibbon2 =
     const_cast<sal_uInt16*>(mso_sptRibbon2Segm), sizeof( mso_sptRibbon2Segm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptRibbon2Calc),
     const_cast<sal_Int32*>(mso_sptRibbon2Default),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRibbon2TextRect), 
SAL_N_ELEMENTS( mso_sptRibbon2TextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRibbon2TextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4526,7 +4526,7 @@ const mso_CustomShape msoRibbon =
     const_cast<sal_uInt16*>(mso_sptRibbonSegm), sizeof( mso_sptRibbonSegm ) >> 
1,
     std::span<const SvxMSDffCalculationData>(mso_sptRibbonCalc),
     const_cast<sal_Int32*>(mso_sptRibbonDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptRibbonTextRect), 
SAL_N_ELEMENTS( mso_sptRibbonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptRibbonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptRibbonGluePoints),
@@ -4671,7 +4671,7 @@ const mso_CustomShape msosptEllipseRibbon =
     const_cast<sal_uInt16*>(mso_sptEllipseRibbonSegm), sizeof( 
mso_sptEllipseRibbonSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptEllipseRibbonCalc),
     const_cast<sal_Int32*>(mso_sptEllipseRibbonDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseRibbonTextRect), 
SAL_N_ELEMENTS( mso_sptEllipseRibbonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseRibbonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4811,7 +4811,7 @@ const mso_CustomShape msosptEllipseRibbon2 =
     const_cast<sal_uInt16*>(mso_sptEllipseRibbon2Segm), sizeof( 
mso_sptEllipseRibbon2Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptEllipseRibbon2Calc),
     const_cast<sal_Int32*>(mso_sptEllipseRibbon2Default),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseRibbon2TextRect), 
SAL_N_ELEMENTS( mso_sptEllipseRibbon2TextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptEllipseRibbon2TextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -4877,7 +4877,7 @@ const mso_CustomShape msoVerticalScroll =
     const_cast<sal_uInt16*>(mso_sptVerticalScrollSegm), sizeof( 
mso_sptVerticalScrollSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptScrollCalc),
     const_cast<sal_Int32*>(mso_sptDefault2700),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptScrollTextRect), 
SAL_N_ELEMENTS( mso_sptScrollTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptScrollTextRect),
     21600, 21600,
     11000, 10800,
     std::span<const SvxMSDffVertPair>(),
@@ -4923,7 +4923,7 @@ const mso_CustomShape msoHorizontalScroll =
     const_cast<sal_uInt16*>(mso_sptHorizontalScrollSegm), sizeof( 
mso_sptHorizontalScrollSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptScrollCalc),
     const_cast<sal_Int32*>(mso_sptDefault2700),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptScrollTextRect), 
SAL_N_ELEMENTS( mso_sptScrollTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptScrollTextRect),
     21600, 21600,
     10800, 11000,
     std::span<const SvxMSDffVertPair>(),
@@ -4940,7 +4940,7 @@ const mso_CustomShape msoFlowChartProcess =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -4977,7 +4977,7 @@ const mso_CustomShape msoFlowChartAlternateProcess =
     const_cast<sal_uInt16*>(mso_sptFlowChartAlternateProcessSegm), sizeof( 
mso_sptFlowChartAlternateProcessSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptFlowChartAlternateProcessCalc),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartAlternateProcessTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartAlternateProcessTextRect),
     21600, 21600,
     10800, 10800,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -4998,7 +4998,7 @@ const mso_CustomShape msoFlowChartDecision =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDecisionTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartDecisionTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartDecisionTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5023,7 +5023,7 @@ const mso_CustomShape msoFlowChartInputOutput =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartInputOutputTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartInputOutputTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartInputOutputTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartInputOutputGluePoints),
@@ -5054,7 +5054,7 @@ const mso_CustomShape msoFlowChartPredefinedProcess =
     const_cast<sal_uInt16*>(mso_sptFlowChartPredefinedProcessSegm), sizeof( 
mso_sptFlowChartPredefinedProcessSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPredefinedProcessTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartPredefinedProcessTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -5085,7 +5085,7 @@ const mso_CustomShape msoFlowChartInternalStorage =
     const_cast<sal_uInt16*>(mso_sptFlowChartInternalStorageSegm), sizeof( 
mso_sptFlowChartInternalStorageSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartInternalStorageTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartInternalStorageTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -5116,7 +5116,7 @@ const mso_CustomShape msoFlowChartDocument =
     const_cast<sal_uInt16*>(mso_sptFlowChartDocumentSegm), sizeof( 
mso_sptFlowChartDocumentSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDocumentTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartDocumentTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartDocumentTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartDocumentGluePoints),
@@ -5155,7 +5155,7 @@ const mso_CustomShape msoFlowChartMultidocument =
     const_cast<sal_uInt16*>(mso_sptFlowChartMultidocumentSegm), sizeof( 
mso_sptFlowChartMultidocumentSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMultidocumentTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartMultidocumentTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartMultidocumentGluePoints),
@@ -5181,7 +5181,7 @@ const mso_CustomShape msoFlowChartTerminator =
     const_cast<sal_uInt16*>(mso_sptFlowChartTerminatorSegm), sizeof( 
mso_sptFlowChartTerminatorSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartTerminatorTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartTerminatorTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartTerminatorTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5203,7 +5203,7 @@ const mso_CustomShape msoFlowChartPreparation =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPreparationTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartPreparationTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartPreparationTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5228,7 +5228,7 @@ const mso_CustomShape msoFlowChartManualInput =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartManualInputTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartManualInputTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartManualInputTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartManualInputGluePoints),
@@ -5253,7 +5253,7 @@ const mso_CustomShape msoFlowChartManualOperation =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartManualOperationTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartManualOperationTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartManualOperationTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const 
SvxMSDffVertPair>(mso_sptFlowChartManualOperationGluePoints),
@@ -5278,7 +5278,7 @@ const mso_CustomShape msoFlowChartConnector =
     const_cast<sal_uInt16*>(mso_sptFlowChartConnectorSegm), sizeof( 
mso_sptFlowChartConnectorSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartConnectorTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartConnectorTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartConnectorTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -5300,7 +5300,7 @@ const mso_CustomShape msoFlowChartOffpageConnector =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOffpageConnectorTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartOffpageConnectorTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5322,7 +5322,7 @@ const mso_CustomShape msoFlowChartPunchedCard =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPunchedCardTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartPunchedCardTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5360,7 +5360,7 @@ const mso_CustomShape msoFlowChartPunchedTape =
     const_cast<sal_uInt16*>(mso_sptFlowChartPunchedTapeSegm), sizeof( 
mso_sptFlowChartPunchedTapeSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPunchedTapeTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartPunchedTapeTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartPunchedTapeGluePoints),
@@ -5393,7 +5393,7 @@ const mso_CustomShape msoFlowChartSummingJunction =
     const_cast<sal_uInt16*>(mso_sptFlowChartSummingJunctionSegm), sizeof( 
mso_sptFlowChartSummingJunctionSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartSummingJunctionTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartSummingJunctionTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -5424,7 +5424,7 @@ const mso_CustomShape msoFlowChartOr =
     const_cast<sal_uInt16*>(mso_sptFlowChartOrSegm), sizeof( 
mso_sptFlowChartOrSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOrTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartOrTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartOrTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptEllipseGluePoints),
@@ -5449,7 +5449,7 @@ const mso_CustomShape msoFlowChartCollate =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartCollateTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartCollateTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartCollateTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartCollateGluePoints),
@@ -5477,7 +5477,7 @@ const mso_CustomShape msoFlowChartSort =
     const_cast<sal_uInt16*>(mso_sptFlowChartSortSegm), sizeof( 
mso_sptFlowChartSortSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartSortTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartSortTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartSortTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -5502,7 +5502,7 @@ const mso_CustomShape msoFlowChartExtract =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartExtractTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartExtractTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartExtractTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartExtractGluePoints),
@@ -5523,7 +5523,7 @@ const mso_CustomShape msoFlowChartMerge =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMergeTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartMergeTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartMergeTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartExtractGluePoints),
@@ -5553,7 +5553,7 @@ const mso_CustomShape msoFlowChartOnlineStorage =
     const_cast<sal_uInt16*>(mso_sptFlowChartOnlineStorageSegm), sizeof( 
mso_sptFlowChartOnlineStorageSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    
const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOnlineStorageTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartOnlineStorageTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartOnlineStorageGluePoints),
@@ -5579,7 +5579,7 @@ const mso_CustomShape msoFlowChartDelay =
     const_cast<sal_uInt16*>(mso_sptFlowChartDelaySegm), sizeof( 
mso_sptFlowChartDelaySegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDelayTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartDelayTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartDelayTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5608,7 +5608,7 @@ const mso_CustomShape msoFlowChartMagneticTape =
     const_cast<sal_uInt16*>(mso_sptFlowChartMagneticTapeSegm), sizeof( 
mso_sptFlowChartMagneticTapeSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticTapeTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartMagneticTapeTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5641,7 +5641,7 @@ const mso_CustomShape msoFlowChartMagneticDisk =
     const_cast<sal_uInt16*>(mso_sptFlowChartMagneticDiskSegm), sizeof( 
mso_sptFlowChartMagneticDiskSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticDiskTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartMagneticDiskTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartMagneticDiskGluePoints),
@@ -5674,7 +5674,7 @@ const mso_CustomShape msoFlowChartMagneticDrum =
     const_cast<sal_uInt16*>(mso_sptFlowChartMagneticDrumSegm), sizeof( 
mso_sptFlowChartMagneticDrumSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticDrumTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptFlowChartMagneticDrumTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptFlowChartMagneticDrumGluePoints),
@@ -5700,7 +5700,7 @@ const mso_CustomShape msoFlowChartDisplay =
     const_cast<sal_uInt16*>(mso_sptFlowChartDisplaySegm), sizeof( 
mso_sptFlowChartDisplaySegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDisplayTextRect), 
SAL_N_ELEMENTS( mso_sptFlowChartDisplayTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFlowChartDisplayTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptStandardGluePoints),
@@ -5793,7 +5793,7 @@ const mso_CustomShape msoWedgeRectCallout =
     nullptr, 0,
     std::span<const SvxMSDffCalculationData>(mso_sptWedgeRectCalloutCalc),
     const_cast<sal_Int32*>(mso_sptWedgeRectCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptWedgeRectCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptWedgeRectCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptWedgeRectCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptWedgeRectCalloutGluePoints),
@@ -5829,7 +5829,7 @@ const mso_CustomShape msoWedgeRRectCallout =
     const_cast<sal_uInt16*>(mso_sptWedgeRRectCalloutSegm), sizeof( 
mso_sptWedgeRRectCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWedgeRectCalloutCalc),
     const_cast<sal_Int32*>(mso_sptWedgeRectCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptWedgeRRectCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptWedgeRRectCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -5868,7 +5868,7 @@ const mso_CustomShape msoBalloon =
     const_cast<sal_uInt16*>(mso_sptBalloonSegm), sizeof( mso_sptBalloonSegm ) 
>> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWedgeRectCalloutCalc),
     const_cast<sal_Int32*>(mso_sptWedgeRectCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptBalloonTextRect), 
SAL_N_ELEMENTS( mso_sptBalloonTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptBalloonTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -5927,7 +5927,7 @@ const mso_CustomShape msoWedgeEllipseCallout =
     const_cast<sal_uInt16*>(mso_sptWedgeEllipseCalloutSegm), sizeof( 
mso_sptWedgeEllipseCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWedgeEllipseCalloutCalc),
     const_cast<sal_Int32*>(mso_sptWedgeEllipseCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptWedgeEllipseCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutTextRect ),
+    std::span<const 
SvxMSDffTextRectangles>(mso_sptWedgeEllipseCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptWedgeEllipseCalloutGluePoints),
@@ -6032,7 +6032,7 @@ const mso_CustomShape msoCloudCallout =
     const_cast<sal_uInt16*>(mso_sptCloudCalloutSegm), sizeof( 
mso_sptCloudCalloutSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCloudCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCloudCalloutDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptCloudCalloutTextRect), 
SAL_N_ELEMENTS( mso_sptCloudCalloutTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptCloudCalloutTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6110,7 +6110,7 @@ const mso_CustomShape msoWave =
     const_cast<sal_uInt16*>(mso_sptWaveSegm), sizeof( mso_sptWaveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWaveCalc),
     const_cast<sal_Int32*>(mso_sptWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptWaveTextRect), SAL_N_ELEMENTS( 
mso_sptWaveTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptWaveTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptWaveGluePoints),
@@ -6192,7 +6192,7 @@ const mso_CustomShape msoDoubleWave =
     const_cast<sal_uInt16*>(mso_sptDoubleWaveSegm), sizeof( 
mso_sptDoubleWaveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDoubleWaveCalc),
     const_cast<sal_Int32*>(mso_sptDoubleWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDoubleWaveTextRect), 
SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDoubleWaveTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptDoubleWaveGluePoints),
@@ -6308,7 +6308,7 @@ const mso_CustomShape msoTextPlainText =
     const_cast<sal_uInt16*>(mso_sptTextPlainTextSegm), sizeof( 
mso_sptTextPlainTextSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextPlainTextCalc),
     const_cast<sal_Int32*>(mso_sptDefault10800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6345,7 +6345,7 @@ const mso_CustomShape msoTextStop =
     const_cast<sal_uInt16*>(mso_sptTextStopSegm), sizeof( mso_sptTextStopSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextStopCalc),
     const_cast<sal_Int32*>(mso_sptTextStopDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6376,7 +6376,7 @@ const mso_CustomShape msoTextTriangle =
     const_cast<sal_uInt16*>(mso_sptTextTriangleSegm), sizeof( 
mso_sptTextTriangleSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextTriangleCalc),
     const_cast<sal_Int32*>(mso_sptDefault10800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6397,7 +6397,7 @@ const mso_CustomShape msoTextTriangleInverted =
     const_cast<sal_uInt16*>(mso_sptTextTriangleInvertedSegm), sizeof( 
mso_sptTextTriangleInvertedSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextTriangleCalc),
     const_cast<sal_Int32*>(mso_sptDefault10800),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6429,7 +6429,7 @@ const mso_CustomShape msoTextChevron =
     const_cast<sal_uInt16*>(mso_sptTextChevronSegm), sizeof( 
mso_sptTextChevronSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextChevronCalc),
     const_cast<sal_Int32*>(mso_sptDefault5400),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6461,7 +6461,7 @@ const mso_CustomShape msoTextChevronInverted =
     const_cast<sal_uInt16*>(mso_sptTextChevronInvertedSegm), sizeof( 
mso_sptTextChevronInvertedSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextChevronInvertedCalc),
     const_cast<sal_Int32*>(mso_sptDefault16200),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6502,7 +6502,7 @@ const mso_CustomShape msoTextRingInside =
     const_cast<sal_uInt16*>(mso_sptTextRingInsideSegm), sizeof( 
mso_sptTextRingInsideSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextRingInsideCalc),
     const_cast<sal_Int32*>(mso_sptDefault13500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6537,7 +6537,7 @@ const mso_CustomShape msoTextRingOutside =
     const_cast<sal_uInt16*>(mso_sptTextRingOutsideSegm), sizeof( 
mso_sptTextRingOutsideSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextRingOutsideCalc),
     const_cast<sal_Int32*>(mso_sptDefault13500),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6569,7 +6569,7 @@ const mso_CustomShape msoTextFadeRight =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault7200),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6591,7 +6591,7 @@ const mso_CustomShape msoTextFadeLeft =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault7200),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6613,7 +6613,7 @@ const mso_CustomShape msoTextFadeUp =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault7200),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6635,7 +6635,7 @@ const mso_CustomShape msoTextFadeDown =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault7200),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6657,7 +6657,7 @@ const mso_CustomShape msoTextSlantUp =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault12000),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6679,7 +6679,7 @@ const mso_CustomShape msoTextSlantDown =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextFadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault12000),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6707,7 +6707,7 @@ const mso_CustomShape msoTextCascadeUp =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCascadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault9600),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6729,7 +6729,7 @@ const mso_CustomShape msoTextCascadeDown =
     const_cast<sal_uInt16*>(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm 
) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCascadeCalc),
     const_cast<sal_Int32*>(mso_sptDefault9600),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6767,7 +6767,7 @@ const mso_CustomShape msoTextArchUpCurve =
     const_cast<sal_uInt16*>(mso_sptTextArchUpCurveSegm), sizeof( 
mso_sptTextArchUpCurveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextArchCurveCalc),
     const_cast<sal_Int32*>(mso_sptTextArchUpCurveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6797,7 +6797,7 @@ const mso_CustomShape msoTextArchDownCurve =
     const_cast<sal_uInt16*>(mso_sptTextArchDownCurveSegm), sizeof( 
mso_sptTextArchDownCurveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextArchCurveCalc),
     const_cast<sal_Int32*>(mso_sptTextArchDownCurveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6835,7 +6835,7 @@ const mso_CustomShape msoTextCircleCurve =
     const_cast<sal_uInt16*>(mso_sptTextCircleCurveSegm), sizeof( 
mso_sptTextCircleCurveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCircleCurveCalc),
     const_cast<sal_Int32*>(mso_sptTextCircleCurveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6878,7 +6878,7 @@ const mso_CustomShape msoTextButtonCurve =
     const_cast<sal_uInt16*>(mso_sptTextButtonCurveSegm), sizeof( 
mso_sptTextButtonCurveSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextButtonCurveCalc),
     const_cast<sal_Int32*>(mso_sptTextButtonCurveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6924,7 +6924,7 @@ const mso_CustomShape msoTextArchUpPour =
     const_cast<sal_uInt16*>(mso_sptTextArchUpPourSegm), sizeof( 
mso_sptTextArchUpPourSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextArchPourCalc),
     const_cast<sal_Int32*>(mso_sptTextArchUpPourDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6950,7 +6950,7 @@ const mso_CustomShape msoTextArchDownPour =
     const_cast<sal_uInt16*>(mso_sptTextArchDownPourSegm), sizeof( 
mso_sptTextArchDownPourSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextArchPourCalc),
     const_cast<sal_Int32*>(mso_sptTextArchDownPourDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -6997,7 +6997,7 @@ const mso_CustomShape msoTextCirclePour =
     const_cast<sal_uInt16*>(mso_sptTextCirclePourSegm), sizeof( 
mso_sptTextCirclePourSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCirclePourCalc),
     const_cast<sal_Int32*>(mso_sptTextCirclePourDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7065,7 +7065,7 @@ const mso_CustomShape msoTextButtonPour =
     const_cast<sal_uInt16*>(mso_sptTextButtonPourSegm), sizeof( 
mso_sptTextButtonPourSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextButtonPourCalc),
     const_cast<sal_Int32*>(mso_sptTextButtonPourDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7105,7 +7105,7 @@ const mso_CustomShape msoTextCurveUp =
     const_cast<sal_uInt16*>(mso_sptTextCurveUpSegm), sizeof( 
mso_sptTextCurveUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCurveUpCalc),
     const_cast<sal_Int32*>(mso_sptTextCurveUpDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7131,7 +7131,7 @@ const mso_CustomShape msoTextCurveDown =
     const_cast<sal_uInt16*>(mso_sptTextCurveUpSegm), sizeof( 
mso_sptTextCurveUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCurveUpCalc),
     const_cast<sal_Int32*>(mso_sptTextCurveUpDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7171,7 +7171,7 @@ const mso_CustomShape msoTextCanUp =
     const_cast<sal_uInt16*>(mso_sptTextCanUpSegm), sizeof( 
mso_sptTextCanUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCanUpCalc),
     const_cast<sal_Int32*>(mso_sptTextCanUpDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7204,7 +7204,7 @@ const mso_CustomShape msoTextCanDown =
     const_cast<sal_uInt16*>(mso_sptTextCanUpSegm), sizeof( 
mso_sptTextCanUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextCanDownCalc),
     const_cast<sal_Int32*>(mso_sptTextCanDownDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7238,7 +7238,7 @@ const mso_CustomShape msoTextInflate =
     const_cast<sal_uInt16*>(mso_sptTextCanUpSegm), sizeof( 
mso_sptTextCanUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextInflateCalc),
     const_cast<sal_Int32*>(mso_sptTextInflateDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7268,7 +7268,7 @@ const mso_CustomShape msoTextDeflate =
     const_cast<sal_uInt16*>(mso_sptTextCanUpSegm), sizeof( 
mso_sptTextCanUpSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextDeflateCalc),
     const_cast<sal_Int32*>(mso_sptDefault8100),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7307,7 +7307,7 @@ const mso_CustomShape msoTextInflateBottom =
     const_cast<sal_uInt16*>(mso_sptTextInflateBottomSegm), sizeof( 
mso_sptTextInflateBottomSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextInflateBottomCalc),
     const_cast<sal_Int32*>(mso_sptTextInflateBottomDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7346,7 +7346,7 @@ const mso_CustomShape msoTextDeflateBottom =
     const_cast<sal_uInt16*>(mso_sptTextDeflateBottomSegm), sizeof( 
mso_sptTextDeflateBottomSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextDeflateBottomCalc),
     const_cast<sal_Int32*>(mso_sptTextDeflateBottomDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7383,7 +7383,7 @@ const mso_CustomShape msoTextInflateTop =
     const_cast<sal_uInt16*>(mso_sptTextInflateTopSegm), sizeof( 
mso_sptTextInflateTopSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextInflateTopCalc),
     const_cast<sal_Int32*>(mso_sptTextInflateTopDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7420,7 +7420,7 @@ const mso_CustomShape msoTextDeflateTop =
     const_cast<sal_uInt16*>(mso_sptTextDeflateTopSegm), sizeof( 
mso_sptTextDeflateTopSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextDeflateTopCalc),
     const_cast<sal_Int32*>(mso_sptTextDeflateTopDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7466,7 +7466,7 @@ const mso_CustomShape msoTextDeflateInflate =
     const_cast<sal_uInt16*>(mso_sptTextDeflateInflateSegm), sizeof( 
mso_sptTextDeflateInflateSegm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptTextDeflateInflateCalc),
     const_cast<sal_Int32*>(mso_sptTextDeflateInflateDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7520,7 +7520,7 @@ const mso_CustomShape msoTextDeflateInflateDeflate =
     const_cast<sal_uInt16*>(mso_sptTextDeflateInflateDeflateSegm), sizeof( 
mso_sptTextDeflateInflateDeflateSegm ) >> 1,
     std::span<const 
SvxMSDffCalculationData>(mso_sptTextDeflateInflateDeflateCalc),
     const_cast<sal_Int32*>(mso_sptTextDeflateInflateDeflateDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7543,7 +7543,7 @@ const mso_CustomShape msoTextWave1 =
     const_cast<sal_uInt16*>(mso_sptTextWave1Segm), sizeof( 
mso_sptTextWave1Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWaveCalc),
     const_cast<sal_Int32*>(mso_sptWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptWaveGluePoints),
@@ -7561,7 +7561,7 @@ const mso_CustomShape msoTextWave2 =
     const_cast<sal_uInt16*>(mso_sptTextWave1Segm), sizeof( 
mso_sptTextWave1Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptWaveCalc),
     const_cast<sal_Int32*>(mso_sptWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), 
SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptFontWorkTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptWaveGluePoints),
@@ -7584,7 +7584,7 @@ const mso_CustomShape msoTextWave3 =
     const_cast<sal_uInt16*>(mso_sptTextWave3Segm), sizeof( 
mso_sptTextWave3Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDoubleWaveCalc),
     const_cast<sal_Int32*>(mso_sptDoubleWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDoubleWaveTextRect), 
SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDoubleWaveTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptDoubleWaveGluePoints),
@@ -7602,7 +7602,7 @@ const mso_CustomShape msoTextWave4 =
     const_cast<sal_uInt16*>(mso_sptTextWave3Segm), sizeof( 
mso_sptTextWave3Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptDoubleWaveCalc),
     const_cast<sal_Int32*>(mso_sptDoubleWaveDefault),
-    const_cast<SvxMSDffTextRectangles*>(mso_sptDoubleWaveTextRect), 
SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ),
+    std::span<const SvxMSDffTextRectangles>(mso_sptDoubleWaveTextRect),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(mso_sptDoubleWaveGluePoints),
@@ -7769,7 +7769,7 @@ const mso_CustomShape msoCallout90 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( 
mso_sptCalloutSegm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault1),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7781,7 +7781,7 @@ const mso_CustomShape msoCallout1 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( 
mso_sptCalloutSegm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault2),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7793,7 +7793,7 @@ const mso_CustomShape msoCallout2 =
     const_cast<sal_uInt16*>(mso_sptCallout2Segm1b), sizeof( 
mso_sptCallout2Segm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault3),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7805,7 +7805,7 @@ const mso_CustomShape msoCallout3 =
     const_cast<sal_uInt16*>(mso_sptCallout3Segm1b), sizeof( 
mso_sptCallout3Segm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault4),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7817,7 +7817,7 @@ const mso_CustomShape msoAccentCallout90 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( 
mso_sptCalloutSegm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault1),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7829,7 +7829,7 @@ const mso_CustomShape msoAccentCallout1 =
     const_cast<sal_uInt16*>(mso_sptCallout1Segm1b), sizeof( 
mso_sptCallout1Segm1b ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault2),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7841,7 +7841,7 @@ const mso_CustomShape msoAccentCallout2 =
     const_cast<sal_uInt16*>(mso_sptCallout2Segm1d), sizeof( 
mso_sptCallout2Segm1d ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault3),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7853,7 +7853,7 @@ const mso_CustomShape msoAccentCallout3 =
     const_cast<sal_uInt16*>(mso_sptCallout3Segm1d), sizeof( 
mso_sptCallout3Segm1d ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault4),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7865,7 +7865,7 @@ const mso_CustomShape msoBorderCallout90 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( 
mso_sptCalloutSegm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault1),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7877,7 +7877,7 @@ const mso_CustomShape msoBorderCallout1 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( 
mso_sptCalloutSegm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault2),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7889,7 +7889,7 @@ const mso_CustomShape msoBorderCallout2 =
     const_cast<sal_uInt16*>(mso_sptCallout2Segm1a), sizeof( 
mso_sptCallout2Segm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault3),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7901,7 +7901,7 @@ const mso_CustomShape msoBorderCallout3 =
     const_cast<sal_uInt16*>(mso_sptCallout3Segm1a), sizeof( 
mso_sptCallout3Segm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault4),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7913,7 +7913,7 @@ const mso_CustomShape msoAccentBorderCallout90 =
     const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( 
mso_sptCalloutSegm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault1),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7925,7 +7925,7 @@ const mso_CustomShape msoAccentBorderCallout1 =
     const_cast<sal_uInt16*>(mso_sptCallout1Segm1a), sizeof( 
mso_sptCallout1Segm1a ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault2),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7937,7 +7937,7 @@ const mso_CustomShape msoAccentBorderCallout2 =
     const_cast<sal_uInt16*>(mso_sptCallout2Segm1c), sizeof( 
mso_sptCallout2Segm1c ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault3),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7949,7 +7949,7 @@ const mso_CustomShape msoAccentBorderCallout3 =
     const_cast<sal_uInt16*>(mso_sptCallout3Segm1c), sizeof( 
mso_sptCallout3Segm1c ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCalloutCalc),
     const_cast<sal_Int32*>(mso_sptCalloutDefault4),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7970,7 +7970,7 @@ const mso_CustomShape msoStraightConnector1 =
     const_cast<sal_uInt16*>(mso_sptStraightConnector1Segm), sizeof( 
mso_sptStraightConnector1Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -7991,7 +7991,7 @@ const mso_CustomShape msoBentConnector2 =
     const_cast<sal_uInt16*>(mso_sptBentConnector2Segm), sizeof( 
mso_sptBentConnector2Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8025,7 +8025,7 @@ const mso_CustomShape msoBentConnector3 =
     const_cast<sal_uInt16*>(mso_sptBentConnector3Segm), sizeof( 
mso_sptBentConnector3Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBentConnector3Calc),
     const_cast<sal_Int32*>(mso_sptBentConnector3Default),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8065,7 +8065,7 @@ const mso_CustomShape msoBentConnector4 =
     const_cast<sal_uInt16*>(mso_sptBentConnector4Segm), sizeof( 
mso_sptBentConnector4Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBentConnector4Calc),
     const_cast<sal_Int32*>(mso_sptBentConnector4Default),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8110,7 +8110,7 @@ const mso_CustomShape msoBentConnector5 =
     const_cast<sal_uInt16*>(mso_sptBentConnector5Segm), sizeof( 
mso_sptBentConnector5Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptBentConnector5Calc),
     const_cast<sal_Int32*>(mso_sptBentConnector5Default),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8131,7 +8131,7 @@ const mso_CustomShape msoCurvedConnector2 =
     const_cast<sal_uInt16*>(mso_sptCurvedConnector2Segm), sizeof( 
mso_sptCurvedConnector2Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(),
     nullptr,
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8168,7 +8168,7 @@ const mso_CustomShape msoCurvedConnector3 =
     const_cast<sal_uInt16*>(mso_sptCurvedConnector3Segm), sizeof( 
mso_sptCurvedConnector3Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCurvedConnector3Calc),
     const_cast<sal_Int32*>(mso_sptCurvedConnector3Default),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8221,7 +8221,7 @@ const mso_CustomShape msoCurvedConnector4 =
     const_cast<sal_uInt16*>(mso_sptCurvedConnector4Segm), sizeof( 
mso_sptCurvedConnector4Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCurvedConnector4Calc),
     const_cast<sal_Int32*>(mso_sptCurvedConnector4Default),
-    nullptr, 0,
+    std::span<const SvxMSDffTextRectangles>(),
     21600, 21600,
     MIN_INT32, MIN_INT32,
     std::span<const SvxMSDffVertPair>(),
@@ -8284,7 +8284,7 @@ const mso_CustomShape msoCurvedConnector5 =
     const_cast<sal_uInt16*>(mso_sptCurvedConnector5Segm), sizeof( 
mso_sptCurvedConnector5Segm ) >> 1,
     std::span<const SvxMSDffCalculationData>(mso_sptCurvedConnector5Calc),

... etc. - the rest is truncated