oox, svx, sw, xmlsecurity: clang-format these files

I added these files more or less recently and they have long lines. Use
clang-format to break at a sane column limit.

Change-Id: Id4ef832e4843fc81f4a497385e49ccb835a7197f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94503
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

12 files changed, 818 insertions, 730 deletions

diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index b4d6a2ecb1c2..51d5479473da 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -25,9 +25,10 @@ using namespace ::com::sun::star;
 
 namespace
 {
-
 // Parses a string like: Value = (any) { (long) 19098 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj"
-void lcl_parseAdjustmentValue(std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
+void lcl_parseAdjustmentValue(
+    std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues,
+    const OString& rValue)
 {
     sal_Int32 nIndex = 0;
     drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentValue;
@@ -38,23 +39,26 @@ void lcl_parseAdjustmentValue(std::vector<drawing::EnhancedCustomShapeAdjustment
         static const char aValuePrefix[] = "Value = (any) { (long) ";
         if (aToken.startsWith(aNamePrefix))
         {
-            OString aName = aToken.copy(strlen(aNamePrefix), aToken.getLength() - strlen(aNamePrefix) - strlen("\""));
+            OString aName = aToken.copy(strlen(aNamePrefix),
+                                        aToken.getLength() - strlen(aNamePrefix) - strlen("\""));
             aAdjustmentValue.Name = OUString::fromUtf8(aName);
         }
         else if (aToken.startsWith(aValuePrefix))
         {
-            OString aValue = aToken.copy(strlen(aValuePrefix), aToken.getLength() - strlen(aValuePrefix) - strlen(" }"));
+            OString aValue = aToken.copy(strlen(aValuePrefix),
+                                         aToken.getLength() - strlen(aValuePrefix) - strlen(" }"));
             aAdjustmentValue.Value <<= aValue.toInt32();
         }
         else if (!aToken.startsWith("State = "))
             SAL_WARN("oox", "lcl_parseAdjustmentValue: unexpected prefix: " << aToken);
-    }
-    while (nIndex >= 0);
+    } while (nIndex >= 0);
     rAdjustmentValues.push_back(aAdjustmentValue);
 }
 
 // Parses a string like: { Value = (any) { (long) 19098 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj" }, { Value = ..., State = ..., Name = ... }
-void lcl_parseAdjustmentValues(std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
+void lcl_parseAdjustmentValues(
+    std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues,
+    const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
@@ -71,33 +75,39 @@ void lcl_parseAdjustmentValues(std::vector<drawing::EnhancedCustomShapeAdjustmen
             nLevel--;
             if (!nLevel)
             {
-                lcl_parseAdjustmentValue(rAdjustmentValues, rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },")));
+                lcl_parseAdjustmentValue(
+                    rAdjustmentValues,
+                    rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },")));
             }
         }
     }
 }
 
-drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterPair(const OString& rValue)
+drawing::EnhancedCustomShapeParameterPair
+lcl_parseEnhancedCustomShapeParameterPair(const OString& rValue)
 {
     drawing::EnhancedCustomShapeParameterPair aPair;
     // We expect the following here: First.Value, First.Type, Second.Value, Second.Type
-    static const char aExpectedFVPrefix[] = "First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
+    static const char aExpectedFVPrefix[]
+        = "First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
     assert(rValue.startsWith(aExpectedFVPrefix));
     sal_Int32 nIndex = strlen(aExpectedFVPrefix);
     aPair.First.Value <<= static_cast<sal_uInt32>(rValue.getToken(0, '}', nIndex).toInt32());
 
     static const char aExpectedFTPrefix[] = ", Type = (short) ";
-    assert(nIndex>=0 && rValue.match(aExpectedFTPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedFTPrefix, nIndex));
     nIndex += strlen(aExpectedFTPrefix);
     aPair.First.Type = static_cast<sal_uInt16>(rValue.getToken(0, '}', nIndex).toInt32());
 
-    static const char aExpectedSVPrefix[] = ", Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
-    assert(nIndex>=0 && rValue.match(aExpectedSVPrefix, nIndex));
+    static const char aExpectedSVPrefix[] = ", Second = "
+                                            "(com.sun.star.drawing.EnhancedCustomShapeParameter) { "
+                                            "Value = (any) { (long) ";
+    assert(nIndex >= 0 && rValue.match(aExpectedSVPrefix, nIndex));
     nIndex += strlen(aExpectedSVPrefix);
     aPair.Second.Value <<= static_cast<sal_uInt32>(rValue.getToken(0, '}', nIndex).toInt32());
 
     static const char aExpectedSTPrefix[] = ", Type = (short) ";
-    assert(nIndex>=0 && rValue.match(aExpectedSTPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedSTPrefix, nIndex));
     nIndex += strlen(aExpectedSTPrefix);
     aPair.Second.Type = static_cast<sal_uInt16>(rValue.getToken(0, '}', nIndex).toInt32());
     return aPair;
@@ -113,7 +123,7 @@ drawing::EnhancedCustomShapeSegment lcl_parseEnhancedCustomShapeSegment(const OS
     aSegment.Command = static_cast<sal_Int16>(rValue.getToken(0, ',', nIndex).toInt32());
 
     static const char aExpectedCountPrefix[] = " Count = (short) ";
-    assert(nIndex>=0 && rValue.match(aExpectedCountPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedCountPrefix, nIndex));
     nIndex += strlen(aExpectedCountPrefix);
     aSegment.Count = static_cast<sal_Int16>(rValue.getToken(0, '}', nIndex).toInt32());
     return aSegment;
@@ -129,17 +139,17 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue)
     aRectangle.X = rValue.getToken(0, ',', nIndex).toInt32();
 
     static const char aExpectedYPrefix[] = " Y = (long) ";
-    assert(nIndex>=0 && rValue.match(aExpectedYPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedYPrefix, nIndex));
     nIndex += strlen(aExpectedYPrefix);
     aRectangle.Y = rValue.getToken(0, ',', nIndex).toInt32();
 
     static const char aExpectedWidthPrefix[] = " Width = (long) ";
-    assert(nIndex>=0 && rValue.match(aExpectedWidthPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedWidthPrefix, nIndex));
     nIndex += strlen(aExpectedWidthPrefix);
     aRectangle.Width = rValue.getToken(0, ',', nIndex).toInt32();
 
     static const char aExpectedHeightPrefix[] = " Height = (long) ";
-    assert(nIndex>=0 && rValue.match(aExpectedHeightPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedHeightPrefix, nIndex));
     nIndex += strlen(aExpectedHeightPrefix);
     aRectangle.Height = rValue.copy(nIndex).toInt32();
 
@@ -156,7 +166,7 @@ awt::Size lcl_parseSize(const OString& rValue)
     aSize.Width = rValue.getToken(0, ',', nIndex).toInt32();
 
     static const char aExpectedHeightPrefix[] = " Height = (long) ";
-    assert(nIndex>=0 && rValue.match(aExpectedHeightPrefix, nIndex));
+    assert(nIndex >= 0 && rValue.match(aExpectedHeightPrefix, nIndex));
     nIndex += strlen(aExpectedHeightPrefix);
     aSize.Height = rValue.copy(nIndex).toInt32();
 
@@ -186,27 +196,33 @@ drawing::EnhancedCustomShapeTextFrame lcl_parseEnhancedCustomShapeTextFrame(cons
         else if (rValue[i] == ',' && !bIgnore)
         {
             OString aToken = rValue.copy(nStart, i - nStart);
-            static const char aExpectedPrefix[] = "TopLeft = (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
+            static const char aExpectedPrefix[]
+                = "TopLeft = (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" }"));
                 aTextFrame.TopLeft = lcl_parseEnhancedCustomShapeParameterPair(aToken);
             }
             else
-                SAL_WARN("oox", "lcl_parseEnhancedCustomShapeTextFrame: unexpected token: " << aToken);
+                SAL_WARN("oox",
+                         "lcl_parseEnhancedCustomShapeTextFrame: unexpected token: " << aToken);
             nStart = i + strlen(", ");
         }
     }
 
     OString aToken = rValue.copy(nStart);
-    static const char aExpectedPrefix[] = "BottomRight = (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
+    static const char aExpectedPrefix[]
+        = "BottomRight = (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
     if (aToken.startsWith(aExpectedPrefix))
     {
-        aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" }"));
+        aToken = aToken.copy(strlen(aExpectedPrefix),
+                             aToken.getLength() - strlen(aExpectedPrefix) - strlen(" }"));
         aTextFrame.BottomRight = lcl_parseEnhancedCustomShapeParameterPair(aToken);
     }
     else
-        SAL_WARN("oox", "lcl_parseEnhancedCustomShapeTextFrame: unexpected token at the end: " << aToken);
+        SAL_WARN("oox",
+                 "lcl_parseEnhancedCustomShapeTextFrame: unexpected token at the end: " << aToken);
 
     return aTextFrame;
 }
@@ -235,10 +251,12 @@ void lcl_parseHandlePosition(std::vector<beans::PropertyValue>& rHandle, const O
         else if (rValue[i] == ',' && !bIgnore)
         {
             OString aToken = rValue.copy(nStart, i - nStart);
-            static const char aExpectedPrefix[] = "Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
+            static const char aExpectedPrefix[]
+                = "Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
 
                 beans::PropertyValue aPropertyValue;
                 aPropertyValue.Name = "Position";
@@ -254,7 +272,8 @@ void lcl_parseHandlePosition(std::vector<beans::PropertyValue>& rHandle, const O
 
 // Parses a string like: Name = "RangeYMaximum", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
+void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OString& rValue,
+                          const OUString& rName)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -275,7 +294,8 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
         }
         else if (rValue[i] == ',' && !bIgnore)
         {
-            static const char aExpectedPrefix[] = "Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameter) { ";
+            static const char aExpectedPrefix[]
+                = "Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameter) { ";
             if (rValue.match(aExpectedPrefix, nStart))
             {
                 drawing::EnhancedCustomShapeParameter aParameter;
@@ -287,7 +307,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
                 aParameter.Value <<= rValue.getToken(0, '}', nIndex).toInt32();
 
                 static const char aExpectedTPrefix[] = ", Type = (short) ";
-                assert(nIndex>=0 && rValue.match(aExpectedTPrefix, nIndex));
+                assert(nIndex >= 0 && rValue.match(aExpectedTPrefix, nIndex));
                 nIndex += strlen(aExpectedTPrefix);
                 aParameter.Type = static_cast<sal_Int16>(rValue.getToken(0, '}', nIndex).toInt32());
 
@@ -297,18 +317,20 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
                 rHandle.push_back(aPropertyValue);
             }
             else if (!rValue.match("Name =", nStart) && !rValue.match("Handle =", nStart))
-                SAL_WARN("oox", "lcl_parseHandleRange: unexpected token: " << rValue.copy(nStart, i - nStart));
+                SAL_WARN("oox", "lcl_parseHandleRange: unexpected token: "
+                                    << rValue.copy(nStart, i - nStart));
             nStart = i + strlen(", ");
         }
     }
 }
 
 // Parses a string like: Name = "RefY", Handle = (long) 0, Value = (any) { (long) 0 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
-void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
+void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OString& rValue,
+                        const OUString& rName)
 {
     static const char aPrefix[] = "\", Handle = (long) 0, Value = (any) { (long) ";
-    const sal_Int32 nCheck= SAL_N_ELEMENTS(aPrefix) - 1;
-    const sal_Int32 nStart= SAL_N_ELEMENTS("Name = \"") - 1 + rName.getLength();
+    const sal_Int32 nCheck = SAL_N_ELEMENTS(aPrefix) - 1;
+    const sal_Int32 nStart = SAL_N_ELEMENTS("Name = \"") - 1 + rName.getLength();
 
     if (rValue.copy(nStart, nCheck).equalsL(aPrefix, nCheck))
     {
@@ -372,7 +394,8 @@ uno::Sequence<beans::PropertyValue> lcl_parseHandle(const OString& rValue)
     return comphelper::containerToSequence(aRet);
 }
 
-void lcl_parseHandles(std::vector< uno::Sequence<beans::PropertyValue> >& rHandles, const OString& rValue)
+void lcl_parseHandles(std::vector<uno::Sequence<beans::PropertyValue>>& rHandles,
+                      const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
@@ -389,7 +412,8 @@ void lcl_parseHandles(std::vector< uno::Sequence<beans::PropertyValue> >& rHandl
             nLevel--;
             if (!nLevel)
             {
-                uno::Sequence<beans::PropertyValue> aHandle = lcl_parseHandle(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },")));
+                uno::Sequence<beans::PropertyValue> aHandle = lcl_parseHandle(
+                    rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },")));
                 rHandles.push_back(aHandle);
             }
         }
@@ -410,7 +434,8 @@ void lcl_parseEquations(std::vector<OUString>& rEquations, const OString& rValue
         else if (rValue[i] == '"' && bInString)
         {
             bInString = false;
-            rEquations.push_back(OUString::fromUtf8(rValue.copy(nStart + strlen("\""), i - nStart - strlen("\""))));
+            rEquations.push_back(
+                OUString::fromUtf8(rValue.copy(nStart + strlen("\""), i - nStart - strlen("\""))));
         }
     }
 }
@@ -432,7 +457,8 @@ void lcl_parsePathCoordinateValues(std::vector<beans::PropertyValue>& rPath, con
         {
             nLevel--;
             if (!nLevel)
-                aPairs.push_back(lcl_parseEnhancedCustomShapeParameterPair(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
+                aPairs.push_back(lcl_parseEnhancedCustomShapeParameterPair(
+                    rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
         }
     }
 
@@ -466,10 +492,12 @@ void lcl_parsePathCoordinates(std::vector<beans::PropertyValue>& rPath, const OS
         else if (rValue[i] == ',' && !bIgnore)
         {
             OString aToken = rValue.copy(nStart, i - nStart);
-            static const char aExpectedPrefix[] = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
+            static const char aExpectedPrefix[]
+                = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
                 lcl_parsePathCoordinateValues(rPath, aToken);
             }
             else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -496,7 +524,8 @@ void lcl_parsePathSegmentValues(std::vector<beans::PropertyValue>& rPath, const
         {
             nLevel--;
             if (!nLevel)
-                aSegments.push_back(lcl_parseEnhancedCustomShapeSegment(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
+                aSegments.push_back(lcl_parseEnhancedCustomShapeSegment(
+                    rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
         }
     }
 
@@ -530,10 +559,12 @@ void lcl_parsePathSegments(std::vector<beans::PropertyValue>& rPath, const OStri
         else if (rValue[i] == ',' && !bIgnore)
         {
             OString aToken = rValue.copy(nStart, i - nStart);
-            static const char aExpectedPrefix[] = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment) { ";
+            static const char aExpectedPrefix[]
+                = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
                 lcl_parsePathSegmentValues(rPath, aToken);
             }
             else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -560,7 +591,8 @@ void lcl_parsePathTextFrameValues(std::vector<beans::PropertyValue>& rPath, cons
         {
             nLevel--;
             if (!nLevel)
-                aTextFrames.push_back(lcl_parseEnhancedCustomShapeTextFrame(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
+                aTextFrames.push_back(lcl_parseEnhancedCustomShapeTextFrame(
+                    rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
         }
     }
 
@@ -594,10 +626,12 @@ void lcl_parsePathTextFrames(std::vector<beans::PropertyValue>& rPath, const OSt
         else if (rValue[i] == ',' && !bIgnore)
         {
             OString aToken = rValue.copy(nStart, i - nStart);
-            static const char aExpectedPrefix[] = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { ";
+            static const char aExpectedPrefix[]
+                = "Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
                 lcl_parsePathTextFrameValues(rPath, aToken);
             }
             else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -624,7 +658,8 @@ void lcl_parsePathSubViewSizeValues(std::vector<beans::PropertyValue>& rPath, co
         {
             nLevel--;
             if (!nLevel)
-                aSizes.push_back(lcl_parseSize(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
+                aSizes.push_back(
+                    lcl_parseSize(rValue.copy(nStart + strlen("{ "), i - nStart - strlen(" },"))));
         }
     }
 
@@ -659,7 +694,8 @@ void lcl_parsePathSubViewSize(std::vector<beans::PropertyValue>& rPath, const OS
             static const char aExpectedPrefix[] = "Value = (any) { ([]com.sun.star.awt.Size) { ";
             if (aToken.startsWith(aExpectedPrefix))
             {
-                aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
+                aToken = aToken.copy(strlen(aExpectedPrefix),
+                                     aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
                 lcl_parsePathSubViewSizeValues(rPath, aToken);
             }
             else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -701,12 +737,10 @@ void lcl_parsePath(std::vector<beans::PropertyValue>& rPath, const OString& rVal
         }
     }
 }
-
 }
 
 namespace oox::drawingml
 {
-
 void CustomShapeProperties::initializePresetDataMap()
 {
     OUString aPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/filter/oox-drawingml-cs-presets");
@@ -728,7 +762,9 @@ void CustomShapeProperties::initializePresetDataMap()
                 bFirst = false;
             else
                 maPresetDataMap[TokenMap::getTokenFromUnicode(aName)] = aPropertyMap;
-            aName = OUString::fromUtf8(aLine.copy(strlen(aCommentPrefix), aLine.getLength() - strlen(aCommentPrefix) - strlen(" */")));
+            aName = OUString::fromUtf8(
+                aLine.copy(strlen(aCommentPrefix),
+                           aLine.getLength() - strlen(aCommentPrefix) - strlen(" */")));
         }
         else
         {
@@ -738,12 +774,16 @@ void CustomShapeProperties::initializePresetDataMap()
                 if (aLine != "([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) {}")
                 {
                     std::vector<drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentValues;
-                    OString aExpectedPrefix("([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { ");
+                    OString aExpectedPrefix(
+                        "([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
-                    OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
+                    OString aValue = aLine.copy(aExpectedPrefix.getLength(),
+                                                aLine.getLength() - aExpectedPrefix.getLength()
+                                                    - strlen(" }"));
                     lcl_parseAdjustmentValues(aAdjustmentValues, aValue);
-                    aPropertyMap.setProperty(PROP_AdjustmentValues, comphelper::containerToSequence(aAdjustmentValues));
+                    aPropertyMap.setProperty(PROP_AdjustmentValues,
+                                             comphelper::containerToSequence(aAdjustmentValues));
                 }
                 else
                     aPropertyMap.setProperty(PROP_AdjustmentValues, uno::Sequence<OUString>(0));
@@ -757,9 +797,12 @@ void CustomShapeProperties::initializePresetDataMap()
                     OString aExpectedPrefix("([]string) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
-                    OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
+                    OString aValue = aLine.copy(aExpectedPrefix.getLength(),
+                                                aLine.getLength() - aExpectedPrefix.getLength()
+                                                    - strlen(" }"));
                     lcl_parseEquations(aEquations, aValue);
-                    aPropertyMap.setProperty(PROP_Equations, comphelper::containerToSequence(aEquations));
+                    aPropertyMap.setProperty(PROP_Equations,
+                                             comphelper::containerToSequence(aEquations));
                 }
                 else
                     aPropertyMap.setProperty(PROP_Equations, uno::Sequence<OUString>(0));
@@ -769,13 +812,16 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine != "([][]com.sun.star.beans.PropertyValue) {}")
                 {
-                    std::vector< uno::Sequence<beans::PropertyValue> > aHandles;
+                    std::vector<uno::Sequence<beans::PropertyValue>> aHandles;
                     OString aExpectedPrefix("([][]com.sun.star.beans.PropertyValue) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
-                    OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
+                    OString aValue = aLine.copy(aExpectedPrefix.getLength(),
+                                                aLine.getLength() - aExpectedPrefix.getLength()
+                                                    - strlen(" }"));
                     lcl_parseHandles(aHandles, aValue);
-                    aPropertyMap.setProperty(PROP_Handles, comphelper::containerToSequence(aHandles));
+                    aPropertyMap.setProperty(PROP_Handles,
+                                             comphelper::containerToSequence(aHandles));
                 }
                 else
                     aPropertyMap.setProperty(PROP_Handles, uno::Sequence<OUString>(0));
@@ -788,7 +834,8 @@ void CustomShapeProperties::initializePresetDataMap()
                     aPropertyMap.setProperty(PROP_MirroredX, aLine == "true");
                 }
                 else
-                    SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredX parameter");
+                    SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected "
+                                    "MirroredX parameter");
             }
             else if (aLine == "MirroredY")
             {
@@ -798,7 +845,8 @@ void CustomShapeProperties::initializePresetDataMap()
                     aPropertyMap.setProperty(PROP_MirroredY, aLine == "true");
                 }
                 else
-                    SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredY parameter");
+                    SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected "
+                                    "MirroredY parameter");
             }
             else if (aLine == "Path")
             {
@@ -807,7 +855,9 @@ void CustomShapeProperties::initializePresetDataMap()
                 assert(aLine.startsWith(aExpectedPrefix));
 
                 std::vector<beans::PropertyValue> aPathValue;
-                OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
+                OString aValue
+                    = aLine.copy(aExpectedPrefix.getLength(),
+                                 aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                 lcl_parsePath(aPathValue, aValue);
                 aPropertyMap.setProperty(PROP_Path, comphelper::containerToSequence(aPathValue));
             }
@@ -823,17 +873,19 @@ void CustomShapeProperties::initializePresetDataMap()
                 OString aExpectedPrefix("(com.sun.star.awt.Rectangle) { ");
                 assert(aLine.startsWith(aExpectedPrefix));
 
-                OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
+                OString aValue
+                    = aLine.copy(aExpectedPrefix.getLength(),
+                                 aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                 aPropertyMap.setProperty(PROP_ViewBox, lcl_parseRectangle(aValue));
             }
             else
-                SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unhandled line: " << aLine);
+                SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unhandled line: "
+                                    << aLine);
         }
         bNotDone = aStream.ReadLine(aLine);
     }
     maPresetDataMap[TokenMap::getTokenFromUnicode(aName)] = aPropertyMap;
 }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index 2633f33d1fcd..0a56a42eda46 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 #include "LockedCanvasContext.hxx"
 #include <sal/log.hxx>
 #include <oox/drawingml/shape.hxx>
@@ -20,7 +19,6 @@ using namespace com::sun::star;
 
 namespace oox::shape
 {
-
 LockedCanvasContext::LockedCanvasContext(FragmentHandler2 const& rParent)
     : FragmentHandler2(rParent)
 {
@@ -28,35 +26,37 @@ LockedCanvasContext::LockedCanvasContext(FragmentHandler2 const& rParent)
 
 LockedCanvasContext::~LockedCanvasContext() = default;
 
-::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& /*rAttribs*/)
+::oox::core::ContextHandlerRef
+LockedCanvasContext::onCreateContext(sal_Int32 nElementToken,
+                                     const ::oox::AttributeList& /*rAttribs*/)
 {
     switch (getBaseToken(nElementToken))
     {
-    case XML_lockedCanvas:
-    case XML_nvGrpSpPr:
-    case XML_grpSpPr:
-        break;
-    case XML_sp:
-    {
-        oox::drawingml::ShapePtr pMasterShape;
-        mpShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.CustomShape");
-        mpShape->setLockedCanvas(true);
-        return new oox::drawingml::ShapeContext(*this, pMasterShape, mpShape);
-    }
-    case XML_grpSp:
-    {
-        oox::drawingml::ShapePtr pMasterShape;
-        mpShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape");
-        mpShape->setLockedCanvas(true);
-        return new oox::drawingml::ShapeGroupContext(*this, pMasterShape, mpShape);
-    }
-    default:
-        SAL_WARN("oox", "LockedCanvasContext::createFastChildContext: unhandled element:" << getBaseToken(nElementToken));
-        break;
+        case XML_lockedCanvas:
+        case XML_nvGrpSpPr:
+        case XML_grpSpPr:
+            break;
+        case XML_sp:
+        {
+            oox::drawingml::ShapePtr pMasterShape;
+            mpShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.CustomShape");
+            mpShape->setLockedCanvas(true);
+            return new oox::drawingml::ShapeContext(*this, pMasterShape, mpShape);
+        }
+        case XML_grpSp:
+        {
+            oox::drawingml::ShapePtr pMasterShape;
+            mpShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape");
+            mpShape->setLockedCanvas(true);
+            return new oox::drawingml::ShapeGroupContext(*this, pMasterShape, mpShape);
+        }
+        default:
+            SAL_WARN("oox", "LockedCanvasContext::createFastChildContext: unhandled element:"
+                                << getBaseToken(nElementToken));
+            break;
     }
     return nullptr;
 }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index e445e7a1a9cf..68c8e27fad35 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -17,7 +17,6 @@ namespace oox
 {
 namespace shape
 {
-
 /// Locked canvas is kind of a container for drawingml shapes: it can even contain group shapes.
 class LockedCanvasContext final : public oox::core::FragmentHandler2
 {
@@ -25,17 +24,14 @@ public:
     explicit LockedCanvasContext(oox::core::FragmentHandler2 const& rParent);
     ~LockedCanvasContext() override;
 
-    oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& rAttribs) override;
+    oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken,
+                                                 const ::oox::AttributeList& rAttribs) override;
 
-    const oox::drawingml::ShapePtr& getShape() const
-    {
-        return mpShape;
-    }
+    const oox::drawingml::ShapePtr& getShape() const { return mpShape; }
 
 private:
     oox::drawingml::ShapePtr mpShape;
 };
-
 }
 }
 
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index f7e17d123fef..7896f8a4c81d 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 #include "WpgContext.hxx"
 #include <sal/log.hxx>
 #include <drawingml/shapepropertiescontext.hxx>
@@ -20,7 +19,6 @@ using namespace com::sun::star;
 
 namespace oox::shape
 {
-
 WpgContext::WpgContext(FragmentHandler2 const& rParent)
     : FragmentHandler2(rParent)
 {
@@ -30,43 +28,51 @@ WpgContext::WpgContext(FragmentHandler2 const& rParent)
 
 WpgContext::~WpgContext() = default;
 
-oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& /*rAttribs*/)
+oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken,
+                                                         const oox::AttributeList& /*rAttribs*/)
 {
     switch (getBaseToken(nElementToken))
     {
-    case XML_wgp:
-    case XML_cNvGrpSpPr:
-    case XML_grpSpPr:
-        return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
-    case XML_wsp:
-    {
-        // Don't set default character height, Writer has its own way to set
-        // the default, and if we don't set it here, editeng properly inherits
-        // it.
-        oox::drawingml::ShapePtr pShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false);
-        return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
-        // return new oox::shape::WpsContext(*this, uno::Reference<drawing::XShape>(),
-        //                                   mpShape, pShape);
-    }
-    case XML_pic:
-        return new oox::drawingml::GraphicShapeContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape"));
-    case XML_grpSp:
-    {
-        return new oox::drawingml::ShapeGroupContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape"));
-    }
-    case XML_graphicFrame:
-    {
-        auto pShape = std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape");
-        pShape->setWps(true);
-        return new oox::drawingml::GraphicalObjectFrameContext(*this, mpShape, pShape, /*bEmbedShapesInChart=*/true);
-    }
-    default:
-        SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken));
-        break;
+        case XML_wgp:
+        case XML_cNvGrpSpPr:
+        case XML_grpSpPr:
+            return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
+        case XML_wsp:
+        {
+            // Don't set default character height, Writer has its own way to set
+            // the default, and if we don't set it here, editeng properly inherits
+            // it.
+            oox::drawingml::ShapePtr pShape = std::make_shared<oox::drawingml::Shape>(
+                "com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false);
+            return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
+            // return new oox::shape::WpsContext(*this, uno::Reference<drawing::XShape>(),
+            //                                   mpShape, pShape);
+        }
+        case XML_pic:
+            return new oox::drawingml::GraphicShapeContext(
+                *this, mpShape,
+                std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape"));
+        case XML_grpSp:
+        {
+            return new oox::drawingml::ShapeGroupContext(
+                *this, mpShape,
+                std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape"));
+        }
+        case XML_graphicFrame:
+        {
+            auto pShape = std::make_shared<oox::drawingml::Shape>(
+                "com.sun.star.drawing.GraphicObjectShape");
+            pShape->setWps(true);
+            return new oox::drawingml::GraphicalObjectFrameContext(*this, mpShape, pShape,
+                                                                   /*bEmbedShapesInChart=*/true);
+        }
+        default:
+            SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: "
+                                << getBaseToken(nElementToken));
+            break;
     }
     return nullptr;
 }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index 363750169040..1b85cd4ec885 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -17,7 +17,6 @@ namespace oox
 {
 namespace shape
 {
-
 /// Wpg is the drawingML equivalent of v:group.
 class WpgContext final : public oox::core::FragmentHandler2
 {
@@ -25,17 +24,14 @@ public:
     explicit WpgContext(oox::core::FragmentHandler2 const& rParent);
     ~WpgContext() override;
 
-    oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
+    oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken,
+                                                 const oox::AttributeList& rAttribs) override;
 
-    const oox::drawingml::ShapePtr& getShape() const
-    {
-        return mpShape;
-    }
+    const oox::drawingml::ShapePtr& getShape() const { return mpShape; }
 
 private:
     oox::drawingml::ShapePtr mpShape;
 };
-
 }
 }
 
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 26ee7d8c4f54..edf35d916619 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -8373,7 +8373,6 @@ oox/source/drawingml/color.cxx
 oox/source/drawingml/colorchoicecontext.cxx
 oox/source/drawingml/connectorshapecontext.cxx
 oox/source/drawingml/customshapegeometry.cxx
-oox/source/drawingml/customshapepresetdata.cxx
 oox/source/drawingml/customshapeproperties.cxx
 oox/source/drawingml/diagram/constraintlistcontext.cxx
 oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -8541,15 +8540,11 @@ oox/source/ppt/timenode.cxx
 oox/source/ppt/timenodelistcontext.cxx
 oox/source/ppt/timetargetelementcontext.cxx
 oox/source/ppt/timetargetelementcontext.hxx
-oox/source/shape/LockedCanvasContext.cxx
-oox/source/shape/LockedCanvasContext.hxx
 oox/source/shape/ShapeContextHandler.cxx
 oox/source/shape/ShapeContextHandler.hxx
 oox/source/shape/ShapeDrawingFragmentHandler.cxx
 oox/source/shape/ShapeDrawingFragmentHandler.hxx
 oox/source/shape/ShapeFilterBase.cxx
-oox/source/shape/WpgContext.cxx
-oox/source/shape/WpgContext.hxx
 oox/source/token/namespacemap.cxx
 oox/source/token/propertynames.cxx
 oox/source/token/relationship.cxx
@@ -13319,7 +13314,6 @@ svx/inc/unomlstr.hxx
 svx/inc/xpolyimp.hxx
 svx/qa/unit/svdraw/test_SdrTextObject.cxx
 svx/qa/unit/svx-dialogs-test.cxx
-svx/qa/unit/xoutdev.cxx
 svx/source/accessibility/AccessibleControlShape.cxx
 svx/source/accessibility/AccessibleEmptyEditSource.cxx
 svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -14959,7 +14953,6 @@ sw/source/filter/ww8/fields.cxx
 sw/source/filter/ww8/fields.hxx
 sw/source/filter/ww8/needed_cast.hxx
 sw/source/filter/ww8/sortedarray.hxx
-sw/source/filter/ww8/sprmids.hxx
 sw/source/filter/ww8/styles.cxx
 sw/source/filter/ww8/types.hxx
 sw/source/filter/ww8/writerhelper.cxx
@@ -15348,8 +15341,6 @@ sw/source/uibase/docvw/PageBreakWin.cxx
 sw/source/uibase/docvw/PostItMgr.cxx
 sw/source/uibase/docvw/ShadowOverlayObject.cxx
 sw/source/uibase/docvw/ShadowOverlayObject.hxx
-sw/source/uibase/docvw/SidebarScrollBar.cxx
-sw/source/uibase/docvw/SidebarScrollBar.hxx
 sw/source/uibase/docvw/SidebarTxtControl.cxx
 sw/source/uibase/docvw/SidebarTxtControl.hxx
 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -18457,7 +18448,6 @@ xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
 xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
 xmlscript/test/imexp.cxx
 xmlsecurity/inc/biginteger.hxx
-xmlsecurity/inc/certificate.hxx
 xmlsecurity/inc/certificatechooser.hxx
 xmlsecurity/inc/certificateviewer.hxx
 xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -18512,7 +18502,6 @@ xmlsecurity/source/gpg/XMLSecurityContext.cxx
 xmlsecurity/source/gpg/XMLSecurityContext.hxx
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
 xmlsecurity/source/helper/documentsignaturehelper.cxx
-xmlsecurity/source/helper/ooxmlsecexporter.cxx
 xmlsecurity/source/helper/ooxmlsecparser.cxx
 xmlsecurity/source/helper/ooxmlsecparser.hxx
 xmlsecurity/source/helper/xmlsignaturehelper.cxx
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index 1da137bea57e..4b767ca1481e 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -40,12 +40,14 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testPdfGraphicExport)
     test::Directories aDirectories;
     OUString aURL = aDirectories.getURLFromSrc("svx/qa/unit/data/graphic.pdf");
     SvFileStream aStream(aURL, StreamMode::READ);
-    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURL, aStream));
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE,
+                         GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURL, aStream));
 
     // Export it.
     utl::TempFile aTempFile;
     aTempFile.EnableKillingFile();
-    XOutFlags const eFlags = XOutFlags::DontExpandFilename | XOutFlags::DontAddExtension | XOutFlags::UseNativeIfPossible;
+    XOutFlags const eFlags = XOutFlags::DontExpandFilename | XOutFlags::DontAddExtension
+                             | XOutFlags::UseNativeIfPossible;
     OUString aTempURL = aTempFile.GetURL();
     XOutBitmap::WriteGraphic(aGraphic, aTempURL, "pdf", eFlags);
 
diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx
index 7a641230b1a9..f06f906fdc49 100644
--- a/sw/source/filter/ww8/sprmids.hxx
+++ b/sw/source/filter/ww8/sprmids.hxx
@@ -77,165 +77,165 @@ namespace v6
 {
 // Microsoft Word for Windows 6.0 Binary File Format
 //                                              Parameter size
-const sal_uInt16 sprmPIstd            = 2;   // short
-const sal_uInt16 sprmPIstdPermute     = 3;   // variable
-const sal_uInt16 sprmPIncLv1          = 4;   // byte
-const sal_uInt16 sprmPJc              = 5;   // byte
-const sal_uInt16 sprmPFSideBySide     = 6;   // byte
-const sal_uInt16 sprmPFKeep           = 7;   // byte
-const sal_uInt16 sprmPFKeepFollow     = 8;   // byte
-const sal_uInt16 sprmPPageBreakBefore = 9;   // byte
-const sal_uInt16 sprmPBrcl            = 10;  // byte
-const sal_uInt16 sprmPBrcp            = 11;  // byte
-const sal_uInt16 sprmPAnld            = 12;  // variable
-const sal_uInt16 sprmPNLvlAnm         = 13;  // byte
-const sal_uInt16 sprmPFNoLineNumb     = 14;  // byte
-const sal_uInt16 sprmPChgTabsPapx     = 15;  // variable
-const sal_uInt16 sprmPDxaRight        = 16;  // word
-const sal_uInt16 sprmPDxaLeft         = 17;  // word
-const sal_uInt16 sprmPNest            = 18;  // word
-const sal_uInt16 sprmPDxaLeft1        = 19;  // word
-const sal_uInt16 sprmPDyaLine         = 20;  // long
-const sal_uInt16 sprmPDyaBefore       = 21;  // word
-const sal_uInt16 sprmPDyaAfter        = 22;  // word
-const sal_uInt16 sprmPChgTabs         = 23;  // variable
-const sal_uInt16 sprmPFInTable        = 24;  // byte
-const sal_uInt16 sprmPTtp             = 25;  // byte
-const sal_uInt16 sprmPDxaAbs          = 26;  // word
-const sal_uInt16 sprmPDyaAbs          = 27;  // word
-const sal_uInt16 sprmPDxaWidth        = 28;  // word
-const sal_uInt16 sprmPPc              = 29;  // byte
-const sal_uInt16 sprmPBrcTop10        = 30;  // word
-const sal_uInt16 sprmPBrcLeft10       = 31;  // word
-const sal_uInt16 sprmPBrcBottom10     = 32;  // word
-const sal_uInt16 sprmPBrcRight10      = 33;  // word
-const sal_uInt16 sprmPBrcBetween10    = 34;  // word
-const sal_uInt16 sprmPBrcBar10        = 35;  // word
-const sal_uInt16 sprmPFromText10      = 36;  // word
-const sal_uInt16 sprmPWr              = 37;  // byte
-const sal_uInt16 sprmPBrcTop          = 38;  // word
-const sal_uInt16 sprmPBrcLeft         = 39;  // word
-const sal_uInt16 sprmPBrcBottom       = 40;  // word
-const sal_uInt16 sprmPBrcRight        = 41;  // word
-const sal_uInt16 sprmPBrcBetween      = 42;  // word
-const sal_uInt16 sprmPBrcBar          = 43;  // word
-const sal_uInt16 sprmPFNoAutoHyph     = 44;  // byte
-const sal_uInt16 sprmPWHeightAbs      = 45;  // word
-const sal_uInt16 sprmPDcs             = 46;  // short
-const sal_uInt16 sprmPShd             = 47;  // word
-const sal_uInt16 sprmPDyaFromText     = 48;  // word
-const sal_uInt16 sprmPDxaFromText     = 49;  // word
-const sal_uInt16 sprmPFLocked         = 50;  // byte
-const sal_uInt16 sprmPFWidowControl   = 51;  // byte
-const sal_uInt16 sprmPRuler           = 52;
-const sal_uInt16 sprmCFStrikeRM       = 65;  // bit
-const sal_uInt16 sprmCFRMark          = 66;  // bit
-const sal_uInt16 sprmCFFldVanish      = 67;  // bit
-const sal_uInt16 sprmCPicLocation     = 68;  // variable
-const sal_uInt16 sprmCIbstRMark       = 69;  // short
-const sal_uInt16 sprmCDttmRMark       = 70;  // long
-const sal_uInt16 sprmCFData           = 71;  // bit
-const sal_uInt16 sprmCRMReason        = 72;  // short
-const sal_uInt16 sprmCChse            = 73;  // 3 bytes
-const sal_uInt16 sprmCSymbol          = 74;  // variable
-const sal_uInt16 sprmCFOle2           = 75;  // bit
-const sal_uInt16 sprmCIstd            = 80;  // short
-const sal_uInt16 sprmCIstdPermute     = 81;  // variable
-const sal_uInt16 sprmCDefault         = 82;  // variable
-const sal_uInt16 sprmCPlain           = 83;  // 0
-const sal_uInt16 sprmCFBold           = 85;  // byte
-const sal_uInt16 sprmCFItalic         = 86;  // byte
-const sal_uInt16 sprmCFStrike         = 87;  // byte
-const sal_uInt16 sprmCFOutline        = 88;  // byte
-const sal_uInt16 sprmCFShadow         = 89;  // byte
-const sal_uInt16 sprmCFSmallCaps      = 90;  // byte
-const sal_uInt16 sprmCFCaps           = 91;  // byte
-const sal_uInt16 sprmCFVanish         = 92;  // byte
-const sal_uInt16 sprmCFtc             = 93;  // word
-const sal_uInt16 sprmCKul             = 94;  // byte
-const sal_uInt16 sprmCSizePos         = 95;  // 3 bytes
-const sal_uInt16 sprmCDxaSpace        = 96;  // word
-const sal_uInt16 sprmCLid             = 97;  // word
-const sal_uInt16 sprmCIco             = 98;  // byte
-const sal_uInt16 sprmCHps             = 99;  // byte
-const sal_uInt16 sprmCHpsInc          = 100; // byte
-const sal_uInt16 sprmCHpsPos          = 101; // byte
-const sal_uInt16 sprmCHpsPosAdj       = 102; // byte
-const sal_uInt16 sprmCMajority        = 103; // variable
-const sal_uInt16 sprmCIss             = 104; // byte
-const sal_uInt16 sprmCHpsNew50        = 105; // variable
-const sal_uInt16 sprmCHpsInc1         = 106; // variable
-const sal_uInt16 sprmCHpsKern         = 107; // short
-const sal_uInt16 sprmCMajority50      = 108; // variable
-const sal_uInt16 sprmCHpsMul          = 109; // short
-const sal_uInt16 sprmCCondHyhen       = 110; // short
-const sal_uInt16 sprmCFSpec           = 117; // bit
-const sal_uInt16 sprmCFObj            = 118; // bit
-const sal_uInt16 sprmPicBrcl          = 119; // byte
-const sal_uInt16 sprmPicScale         = 120; // length
-const sal_uInt16 sprmPicBrcTop        = 121; // word
-const sal_uInt16 sprmPicBrcLeft       = 122; // word
-const sal_uInt16 sprmPicBrcBottom     = 123; // word
-const sal_uInt16 sprmPicBrcRight      = 124; // word
-const sal_uInt16 sprmSScnsPgn         = 131; // byte
-const sal_uInt16 sprmSiHeadingPgn     = 132; // byte
-const sal_uInt16 sprmSOlstAnm         = 133; // variable
-const sal_uInt16 sprmSDxaColWidth     = 136; // 3 bytes
-const sal_uInt16 sprmSDxaColSpacing   = 137; // 3 bytes
-const sal_uInt16 sprmSFEvenlySpaced   = 138; // byte
-const sal_uInt16 sprmSFProtected      = 139; // byte
-const sal_uInt16 sprmSDmBinFirst      = 140; // word
-const sal_uInt16 sprmSDmBinOther      = 141; // word
-const sal_uInt16 sprmSBkc             = 142; // byte
-const sal_uInt16 sprmSFTitlePage      = 143; // byte
-const sal_uInt16 sprmSCcolumns        = 144; // word
-const sal_uInt16 sprmSDxaColumns      = 145; // word
-const sal_uInt16 sprmSFAutoPgn        = 146; // byte
-const sal_uInt16 sprmSNfcPgn          = 147; // byte
-const sal_uInt16 sprmSDyaPgn          = 148; // short
-const sal_uInt16 sprmSDxaPgn          = 149; // short
-const sal_uInt16 sprmSFPgnRestart     = 150; // byte
-const sal_uInt16 sprmSFEndnote        = 151; // byte
-const sal_uInt16 sprmSLnc             = 152; // byte
-const sal_uInt16 sprmSGprfIhdt        = 153; // byte
-const sal_uInt16 sprmSNLnnMod         = 154; // word
-const sal_uInt16 sprmSDxaLnn          = 155; // word
-const sal_uInt16 sprmSDyaHdrTop       = 156; // word
-const sal_uInt16 sprmSDyaHdrBottom    = 157; // word
-const sal_uInt16 sprmSLBetween        = 158; // byte
-const sal_uInt16 sprmSVjc             = 159; // byte
-const sal_uInt16 sprmSLnnMin          = 160; // word
-const sal_uInt16 sprmSPgnStart        = 161; // word
-const sal_uInt16 sprmSBOrientation    = 162; // byte
-const sal_uInt16 sprmSBCustomize      = 163;
-const sal_uInt16 sprmSXaPage          = 164; // word
-const sal_uInt16 sprmSYaPage          = 165; // word
-const sal_uInt16 sprmSDxaLeft         = 166; // word
-const sal_uInt16 sprmSDxaRight        = 167; // word
-const sal_uInt16 sprmSDyaTop          = 168; // word
-const sal_uInt16 sprmSDyaBottom       = 169; // word
-const sal_uInt16 sprmSDzaGutter       = 170; // word
-const sal_uInt16 sprmSDMPaperReq      = 171; // word
-const sal_uInt16 sprmTJc              = 182; // word (low
-const sal_uInt16 sprmTDxaLeft         = 183; // word
-const sal_uInt16 sprmTDxaGapHalf      = 184; // word
-const sal_uInt16 sprmTFCantSplit      = 185; // byte
-const sal_uInt16 sprmTTableHeader     = 186; // byte
-const sal_uInt16 sprmTTableBorders    = 187; // 12 bytes
-const sal_uInt16 sprmTDefTable10      = 188; // variable
-const sal_uInt16 sprmTDyaRowHeight    = 189; // word
-const sal_uInt16 sprmTDefTable        = 190;
-const sal_uInt16 sprmTDefTableShd     = 191;
-const sal_uInt16 sprmTTlp             = 192; // 4 bytes
-const sal_uInt16 sprmTSetBrc          = 193; // 5 bytes
-const sal_uInt16 sprmTInsert          = 194; // 4 bytes
-const sal_uInt16 sprmTDelete          = 195; // word
-const sal_uInt16 sprmTDxaCol          = 196; // 4 bytes
-const sal_uInt16 sprmTMerge           = 197; // word
-const sal_uInt16 sprmTSplit           = 198; // word
-const sal_uInt16 sprmTSetBrc10        = 199; // 5 bytes
-const sal_uInt16 sprmTSetShd          = 200; // 4 bytes
-const sal_uInt16 sprmMax              = 208;
+const sal_uInt16 sprmPIstd = 2; // short
+const sal_uInt16 sprmPIstdPermute = 3; // variable
+const sal_uInt16 sprmPIncLv1 = 4; // byte
+const sal_uInt16 sprmPJc = 5; // byte
+const sal_uInt16 sprmPFSideBySide = 6; // byte
+const sal_uInt16 sprmPFKeep = 7; // byte
+const sal_uInt16 sprmPFKeepFollow = 8; // byte
+const sal_uInt16 sprmPPageBreakBefore = 9; // byte
+const sal_uInt16 sprmPBrcl = 10; // byte
+const sal_uInt16 sprmPBrcp = 11; // byte
+const sal_uInt16 sprmPAnld = 12; // variable
+const sal_uInt16 sprmPNLvlAnm = 13; // byte
+const sal_uInt16 sprmPFNoLineNumb = 14; // byte
+const sal_uInt16 sprmPChgTabsPapx = 15; // variable
+const sal_uInt16 sprmPDxaRight = 16; // word
+const sal_uInt16 sprmPDxaLeft = 17; // word
+const sal_uInt16 sprmPNest = 18; // word
+const sal_uInt16 sprmPDxaLeft1 = 19; // word
+const sal_uInt16 sprmPDyaLine = 20; // long
+const sal_uInt16 sprmPDyaBefore = 21; // word
+const sal_uInt16 sprmPDyaAfter = 22; // word
+const sal_uInt16 sprmPChgTabs = 23; // variable
+const sal_uInt16 sprmPFInTable = 24; // byte
+const sal_uInt16 sprmPTtp = 25; // byte
+const sal_uInt16 sprmPDxaAbs = 26; // word
+const sal_uInt16 sprmPDyaAbs = 27; // word
+const sal_uInt16 sprmPDxaWidth = 28; // word
+const sal_uInt16 sprmPPc = 29; // byte
+const sal_uInt16 sprmPBrcTop10 = 30; // word
+const sal_uInt16 sprmPBrcLeft10 = 31; // word
+const sal_uInt16 sprmPBrcBottom10 = 32; // word
+const sal_uInt16 sprmPBrcRight10 = 33; // word
+const sal_uInt16 sprmPBrcBetween10 = 34; // word
+const sal_uInt16 sprmPBrcBar10 = 35; // word
+const sal_uInt16 sprmPFromText10 = 36; // word
+const sal_uInt16 sprmPWr = 37; // byte
+const sal_uInt16 sprmPBrcTop = 38; // word
+const sal_uInt16 sprmPBrcLeft = 39; // word
+const sal_uInt16 sprmPBrcBottom = 40; // word
+const sal_uInt16 sprmPBrcRight = 41; // word
+const sal_uInt16 sprmPBrcBetween = 42; // word
+const sal_uInt16 sprmPBrcBar = 43; // word
+const sal_uInt16 sprmPFNoAutoHyph = 44; // byte
+const sal_uInt16 sprmPWHeightAbs = 45; // word
+const sal_uInt16 sprmPDcs = 46; // short
+const sal_uInt16 sprmPShd = 47; // word
+const sal_uInt16 sprmPDyaFromText = 48; // word
+const sal_uInt16 sprmPDxaFromText = 49; // word
+const sal_uInt16 sprmPFLocked = 50; // byte
+const sal_uInt16 sprmPFWidowControl = 51; // byte
+const sal_uInt16 sprmPRuler = 52;
+const sal_uInt16 sprmCFStrikeRM = 65; // bit
+const sal_uInt16 sprmCFRMark = 66; // bit
+const sal_uInt16 sprmCFFldVanish = 67; // bit
+const sal_uInt16 sprmCPicLocation = 68; // variable
+const sal_uInt16 sprmCIbstRMark = 69; // short
+const sal_uInt16 sprmCDttmRMark = 70; // long
+const sal_uInt16 sprmCFData = 71; // bit
+const sal_uInt16 sprmCRMReason = 72; // short
+const sal_uInt16 sprmCChse = 73; // 3 bytes
+const sal_uInt16 sprmCSymbol = 74; // variable
+const sal_uInt16 sprmCFOle2 = 75; // bit
+const sal_uInt16 sprmCIstd = 80; // short
+const sal_uInt16 sprmCIstdPermute = 81; // variable
+const sal_uInt16 sprmCDefault = 82; // variable
+const sal_uInt16 sprmCPlain = 83; // 0
+const sal_uInt16 sprmCFBold = 85; // byte
+const sal_uInt16 sprmCFItalic = 86; // byte
+const sal_uInt16 sprmCFStrike = 87; // byte
+const sal_uInt16 sprmCFOutline = 88; // byte
+const sal_uInt16 sprmCFShadow = 89; // byte
+const sal_uInt16 sprmCFSmallCaps = 90; // byte
+const sal_uInt16 sprmCFCaps = 91; // byte
+const sal_uInt16 sprmCFVanish = 92; // byte
+const sal_uInt16 sprmCFtc = 93; // word
+const sal_uInt16 sprmCKul = 94; // byte
+const sal_uInt16 sprmCSizePos = 95; // 3 bytes
+const sal_uInt16 sprmCDxaSpace = 96; // word
+const sal_uInt16 sprmCLid = 97; // word
+const sal_uInt16 sprmCIco = 98; // byte
+const sal_uInt16 sprmCHps = 99; // byte
+const sal_uInt16 sprmCHpsInc = 100; // byte
+const sal_uInt16 sprmCHpsPos = 101; // byte
+const sal_uInt16 sprmCHpsPosAdj = 102; // byte
+const sal_uInt16 sprmCMajority = 103; // variable
+const sal_uInt16 sprmCIss = 104; // byte
+const sal_uInt16 sprmCHpsNew50 = 105; // variable
+const sal_uInt16 sprmCHpsInc1 = 106; // variable
+const sal_uInt16 sprmCHpsKern = 107; // short
+const sal_uInt16 sprmCMajority50 = 108; // variable
+const sal_uInt16 sprmCHpsMul = 109; // short
+const sal_uInt16 sprmCCondHyhen = 110; // short
+const sal_uInt16 sprmCFSpec = 117; // bit
+const sal_uInt16 sprmCFObj = 118; // bit
+const sal_uInt16 sprmPicBrcl = 119; // byte
+const sal_uInt16 sprmPicScale = 120; // length
+const sal_uInt16 sprmPicBrcTop = 121; // word
+const sal_uInt16 sprmPicBrcLeft = 122; // word
+const sal_uInt16 sprmPicBrcBottom = 123; // word
+const sal_uInt16 sprmPicBrcRight = 124; // word
+const sal_uInt16 sprmSScnsPgn = 131; // byte
+const sal_uInt16 sprmSiHeadingPgn = 132; // byte
+const sal_uInt16 sprmSOlstAnm = 133; // variable
+const sal_uInt16 sprmSDxaColWidth = 136; // 3 bytes
+const sal_uInt16 sprmSDxaColSpacing = 137; // 3 bytes
+const sal_uInt16 sprmSFEvenlySpaced = 138; // byte
+const sal_uInt16 sprmSFProtected = 139; // byte
+const sal_uInt16 sprmSDmBinFirst = 140; // word
+const sal_uInt16 sprmSDmBinOther = 141; // word
+const sal_uInt16 sprmSBkc = 142; // byte
+const sal_uInt16 sprmSFTitlePage = 143; // byte
+const sal_uInt16 sprmSCcolumns = 144; // word
+const sal_uInt16 sprmSDxaColumns = 145; // word
+const sal_uInt16 sprmSFAutoPgn = 146; // byte
+const sal_uInt16 sprmSNfcPgn = 147; // byte
+const sal_uInt16 sprmSDyaPgn = 148; // short
+const sal_uInt16 sprmSDxaPgn = 149; // short
+const sal_uInt16 sprmSFPgnRestart = 150; // byte
+const sal_uInt16 sprmSFEndnote = 151; // byte
+const sal_uInt16 sprmSLnc = 152; // byte
+const sal_uInt16 sprmSGprfIhdt = 153; // byte
+const sal_uInt16 sprmSNLnnMod = 154; // word
+const sal_uInt16 sprmSDxaLnn = 155; // word
+const sal_uInt16 sprmSDyaHdrTop = 156; // word
+const sal_uInt16 sprmSDyaHdrBottom = 157; // word
+const sal_uInt16 sprmSLBetween = 158; // byte
+const sal_uInt16 sprmSVjc = 159; // byte
+const sal_uInt16 sprmSLnnMin = 160; // word
+const sal_uInt16 sprmSPgnStart = 161; // word
+const sal_uInt16 sprmSBOrientation = 162; // byte
+const sal_uInt16 sprmSBCustomize = 163;
+const sal_uInt16 sprmSXaPage = 164; // word
+const sal_uInt16 sprmSYaPage = 165; // word
+const sal_uInt16 sprmSDxaLeft = 166; // word
+const sal_uInt16 sprmSDxaRight = 167; // word
+const sal_uInt16 sprmSDyaTop = 168; // word
+const sal_uInt16 sprmSDyaBottom = 169; // word
+const sal_uInt16 sprmSDzaGutter = 170; // word
+const sal_uInt16 sprmSDMPaperReq = 171; // word
+const sal_uInt16 sprmTJc = 182; // word (low
+const sal_uInt16 sprmTDxaLeft = 183; // word
+const sal_uInt16 sprmTDxaGapHalf = 184; // word
+const sal_uInt16 sprmTFCantSplit = 185; // byte
+const sal_uInt16 sprmTTableHeader = 186; // byte
+const sal_uInt16 sprmTTableBorders = 187; // 12 bytes
+const sal_uInt16 sprmTDefTable10 = 188; // variable
+const sal_uInt16 sprmTDyaRowHeight = 189; // word
+const sal_uInt16 sprmTDefTable = 190;
+const sal_uInt16 sprmTDefTableShd = 191;
+const sal_uInt16 sprmTTlp = 192; // 4 bytes
+const sal_uInt16 sprmTSetBrc = 193; // 5 bytes
+const sal_uInt16 sprmTInsert = 194; // 4 bytes
+const sal_uInt16 sprmTDelete = 195; // word
+const sal_uInt16 sprmTDxaCol = 196; // 4 bytes
+const sal_uInt16 sprmTMerge = 197; // word
+const sal_uInt16 sprmTSplit = 198; // word
+const sal_uInt16 sprmTSetBrc10 = 199; // 5 bytes
+const sal_uInt16 sprmTSetShd = 200; // 4 bytes
+const sal_uInt16 sprmMax = 208;
 }
 
 // [MS-DOC] - v20170112 Section 2.2.5.1
@@ -243,23 +243,25 @@ enum class sgc
 {
     paragraph = 1,
     character = 2,
-    picture   = 3,
-    section   = 4,
-    table     = 5
+    picture = 3,
+    section = 4,
+    table = 5
 };
 enum class spra
 {
     operand_toggle_1b_0 = 0,
-    operand_1b_1        = 1,
-    operand_2b_2        = 2,
-    operand_4b_3        = 3,
-    operand_2b_4        = 4,
-    operand_2b_5        = 5,
-    operand_varlen_6    = 6,
-    operand_3b_7        = 7
+    operand_1b_1 = 1,
+    operand_2b_2 = 2,
+    operand_4b_3 = 3,
+    operand_2b_4 = 4,
+    operand_2b_5 = 5,
+    operand_varlen_6 = 6,
+    operand_3b_7 = 7
 };
 #define SPRM_PART(num, mask, shift) ((static_cast<sal_uInt16>(num) & mask) << shift)
-#define SPRM(ispmd, fSpec, sgc, spra) SPRM_PART(ispmd, 0x01FF, 0) + SPRM_PART(fSpec, 0x0001, 9) + SPRM_PART(sgc, 0x0007, 10) + SPRM_PART(spra, 0x0007, 13)
+#define SPRM(ispmd, fSpec, sgc, spra)                                                              \
+    SPRM_PART(ispmd, 0x01FF, 0) + SPRM_PART(fSpec, 0x0001, 9) + SPRM_PART(sgc, 0x0007, 10)         \
+        + SPRM_PART(spra, 0x0007, 13)
 #define SPRM_PAR(ispmd, fSpec, spra) SPRM(ispmd, fSpec, sgc::paragraph, spra)
 #define SPRM_CHR(ispmd, fSpec, spra) SPRM(ispmd, fSpec, sgc::character, spra)
 #define SPRM_PIC(ispmd, fSpec, spra) SPRM(ispmd, fSpec, sgc::picture, spra)
@@ -267,336 +269,336 @@ enum class spra
 #define SPRM_TBL(ispmd, fSpec, spra) SPRM(ispmd, fSpec, sgc::table, spra)
 
 // [MS-DOC] - v20170112 Section 2.6.1
-const sal_uInt16 sprmCFRMarkDel        = SPRM_CHR(0x00, 0, spra::operand_toggle_1b_0); // 0x0800
-const sal_uInt16 sprmCFRMarkIns        = SPRM_CHR(0x01, 0, spra::operand_toggle_1b_0); // 0x0801
-const sal_uInt16 sprmCFFldVanish       = SPRM_CHR(0x02, 0, spra::operand_toggle_1b_0); // 0x0802
-const sal_uInt16 sprmCPicLocation      = SPRM_CHR(0x03, 1, spra::operand_4b_3);        // 0x6A03
-const sal_uInt16 sprmCIbstRMark        = SPRM_CHR(0x04, 0, spra::operand_2b_2);        // 0x4804
-const sal_uInt16 sprmCDttmRMark        = SPRM_CHR(0x05, 0, spra::operand_4b_3);        // 0x6805
-const sal_uInt16 sprmCFData            = SPRM_CHR(0x06, 0, spra::operand_toggle_1b_0); // 0x0806
-const sal_uInt16 sprmCIdslRMark        = SPRM_CHR(0x07, 0, spra::operand_2b_2);        // 0x4807
-const sal_uInt16 sprmCSymbol           = SPRM_CHR(0x09, 1, spra::operand_4b_3);        // 0x6A09
-const sal_uInt16 sprmCFOle2            = SPRM_CHR(0x0A, 0, spra::operand_toggle_1b_0); // 0x080A
-const sal_uInt16 sprmCHighlight        = SPRM_CHR(0x0C, 1, spra::operand_1b_1);        // 0x2A0C
-const sal_uInt16 sprmCFWebHidden       = SPRM_CHR(0x11, 0, spra::operand_toggle_1b_0); // 0x0811
-const sal_uInt16 sprmCRsidProp         = SPRM_CHR(0x15, 0, spra::operand_4b_3);        // 0x6815
-const sal_uInt16 sprmCRsidText         = SPRM_CHR(0x16, 0, spra::operand_4b_3);        // 0x6816
-const sal_uInt16 sprmCRsidRMDel        = SPRM_CHR(0x17, 0, spra::operand_4b_3);        // 0x6817
-const sal_uInt16 sprmCFSpecVanish      = SPRM_CHR(0x18, 0, spra::operand_toggle_1b_0); // 0x0818
-const sal_uInt16 sprmCFMathPr          = SPRM_CHR(0x1A, 0, spra::operand_varlen_6);    // 0xC81A
-const sal_uInt16 sprmCIstd             = SPRM_CHR(0x30, 1, spra::operand_2b_2);        // 0x4A30
-const sal_uInt16 sprmCIstdPermute      = SPRM_CHR(0x31, 1, spra::operand_varlen_6);    // 0xCA31
-const sal_uInt16 sprmCPlain            = SPRM_CHR(0x33, 1, spra::operand_1b_1);        // 0x2A33
-const sal_uInt16 sprmCKcd              = SPRM_CHR(0x34, 1, spra::operand_1b_1);        // 0x2A34
-const sal_uInt16 sprmCFBold            = SPRM_CHR(0x35, 0, spra::operand_toggle_1b_0); // 0x0835
-const sal_uInt16 sprmCFItalic          = SPRM_CHR(0x36, 0, spra::operand_toggle_1b_0); // 0x0836
-const sal_uInt16 sprmCFStrike          = SPRM_CHR(0x37, 0, spra::operand_toggle_1b_0); // 0x0837
-const sal_uInt16 sprmCFOutline         = SPRM_CHR(0x38, 0, spra::operand_toggle_1b_0); // 0x0838
-const sal_uInt16 sprmCFShadow          = SPRM_CHR(0x39, 0, spra::operand_toggle_1b_0); // 0x0839
-const sal_uInt16 sprmCFSmallCaps       = SPRM_CHR(0x3A, 0, spra::operand_toggle_1b_0); // 0x083A
-const sal_uInt16 sprmCFCaps            = SPRM_CHR(0x3B, 0, spra::operand_toggle_1b_0); // 0x083B
-const sal_uInt16 sprmCFVanish          = SPRM_CHR(0x3C, 0, spra::operand_toggle_1b_0); // 0x083C
-const sal_uInt16 sprmCKul              = SPRM_CHR(0x3E, 1, spra::operand_1b_1);        // 0x2A3E
-const sal_uInt16 sprmCDxaSpace         = SPRM_CHR(0x40, 0, spra::operand_2b_4);        // 0x8840
-const sal_uInt16 sprmCIco              = SPRM_CHR(0x42, 1, spra::operand_1b_1);        // 0x2A42
-const sal_uInt16 sprmCHps              = SPRM_CHR(0x43, 1, spra::operand_2b_2);        // 0x4A43
-const sal_uInt16 sprmCHpsPos           = SPRM_CHR(0x45, 0, spra::operand_2b_2);        // 0x4845
-const sal_uInt16 sprmCMajority         = SPRM_CHR(0x47, 1, spra::operand_varlen_6);    // 0xCA47
-const sal_uInt16 sprmCIss              = SPRM_CHR(0x48, 1, spra::operand_1b_1);        // 0x2A48
-const sal_uInt16 sprmCHpsKern          = SPRM_CHR(0x4B, 0, spra::operand_2b_2);        // 0x484B
-const sal_uInt16 sprmCHresi            = SPRM_CHR(0x4E, 0, spra::operand_2b_2);        // 0x484E
-const sal_uInt16 sprmCRgFtc0           = SPRM_CHR(0x4F, 1, spra::operand_2b_2);        // 0x4A4F
-const sal_uInt16 sprmCRgFtc1           = SPRM_CHR(0x50, 1, spra::operand_2b_2);        // 0x4A50
-const sal_uInt16 sprmCRgFtc2           = SPRM_CHR(0x51, 1, spra::operand_2b_2);        // 0x4A51
-const sal_uInt16 sprmCCharScale        = SPRM_CHR(0x52, 0, spra::operand_2b_2);        // 0x4852
-const sal_uInt16 sprmCFDStrike         = SPRM_CHR(0x53, 1, spra::operand_1b_1);        // 0x2A53
-const sal_uInt16 sprmCFImprint         = SPRM_CHR(0x54, 0, spra::operand_toggle_1b_0); // 0x0854
-const sal_uInt16 sprmCFSpec            = SPRM_CHR(0x55, 0, spra::operand_toggle_1b_0); // 0x0855
-const sal_uInt16 sprmCFObj             = SPRM_CHR(0x56, 0, spra::operand_toggle_1b_0); // 0x0856
-const sal_uInt16 sprmCPropRMark90      = SPRM_CHR(0x57, 1, spra::operand_varlen_6);    // 0xCA57
-const sal_uInt16 sprmCFEmboss          = SPRM_CHR(0x58, 0, spra::operand_toggle_1b_0); // 0x0858
-const sal_uInt16 sprmCSfxText          = SPRM_CHR(0x59, 0, spra::operand_1b_1);        // 0x2859
-const sal_uInt16 sprmCFBiDi            = SPRM_CHR(0x5A, 0, spra::operand_toggle_1b_0); // 0x085A
-const sal_uInt16 sprmCFBoldBi          = SPRM_CHR(0x5C, 0, spra::operand_toggle_1b_0); // 0x085C
-const sal_uInt16 sprmCFItalicBi        = SPRM_CHR(0x5D, 0, spra::operand_toggle_1b_0); // 0x085D
-const sal_uInt16 sprmCFtcBi            = SPRM_CHR(0x5E, 1, spra::operand_2b_2);        // 0x4A5E
-const sal_uInt16 sprmCLidBi            = SPRM_CHR(0x5F, 0, spra::operand_2b_2);        // 0x485F
-const sal_uInt16 sprmCIcoBi            = SPRM_CHR(0x60, 1, spra::operand_2b_2);        // 0x4A60
-const sal_uInt16 sprmCHpsBi            = SPRM_CHR(0x61, 1, spra::operand_2b_2);        // 0x4A61
-const sal_uInt16 sprmCDispFldRMark     = SPRM_CHR(0x62, 1, spra::operand_varlen_6);    // 0xCA62
-const sal_uInt16 sprmCIbstRMarkDel     = SPRM_CHR(0x63, 0, spra::operand_2b_2);        // 0x4863
-const sal_uInt16 sprmCDttmRMarkDel     = SPRM_CHR(0x64, 0, spra::operand_4b_3);        // 0x6864
-const sal_uInt16 sprmCBrc80            = SPRM_CHR(0x65, 0, spra::operand_4b_3);        // 0x6865
-const sal_uInt16 sprmCShd80            = SPRM_CHR(0x66, 0, spra::operand_2b_2);        // 0x4866
-const sal_uInt16 sprmCIdslRMarkDel     = SPRM_CHR(0x67, 0, spra::operand_2b_2);        // 0x4867
+const sal_uInt16 sprmCFRMarkDel = SPRM_CHR(0x00, 0, spra::operand_toggle_1b_0); // 0x0800
+const sal_uInt16 sprmCFRMarkIns = SPRM_CHR(0x01, 0, spra::operand_toggle_1b_0); // 0x0801
+const sal_uInt16 sprmCFFldVanish = SPRM_CHR(0x02, 0, spra::operand_toggle_1b_0); // 0x0802
+const sal_uInt16 sprmCPicLocation = SPRM_CHR(0x03, 1, spra::operand_4b_3); // 0x6A03
+const sal_uInt16 sprmCIbstRMark = SPRM_CHR(0x04, 0, spra::operand_2b_2); // 0x4804
+const sal_uInt16 sprmCDttmRMark = SPRM_CHR(0x05, 0, spra::operand_4b_3); // 0x6805
+const sal_uInt16 sprmCFData = SPRM_CHR(0x06, 0, spra::operand_toggle_1b_0); // 0x0806
+const sal_uInt16 sprmCIdslRMark = SPRM_CHR(0x07, 0, spra::operand_2b_2); // 0x4807
+const sal_uInt16 sprmCSymbol = SPRM_CHR(0x09, 1, spra::operand_4b_3); // 0x6A09
+const sal_uInt16 sprmCFOle2 = SPRM_CHR(0x0A, 0, spra::operand_toggle_1b_0); // 0x080A
+const sal_uInt16 sprmCHighlight = SPRM_CHR(0x0C, 1, spra::operand_1b_1); // 0x2A0C
+const sal_uInt16 sprmCFWebHidden = SPRM_CHR(0x11, 0, spra::operand_toggle_1b_0); // 0x0811
+const sal_uInt16 sprmCRsidProp = SPRM_CHR(0x15, 0, spra::operand_4b_3); // 0x6815
+const sal_uInt16 sprmCRsidText = SPRM_CHR(0x16, 0, spra::operand_4b_3); // 0x6816
+const sal_uInt16 sprmCRsidRMDel = SPRM_CHR(0x17, 0, spra::operand_4b_3); // 0x6817
+const sal_uInt16 sprmCFSpecVanish = SPRM_CHR(0x18, 0, spra::operand_toggle_1b_0); // 0x0818
+const sal_uInt16 sprmCFMathPr = SPRM_CHR(0x1A, 0, spra::operand_varlen_6); // 0xC81A
+const sal_uInt16 sprmCIstd = SPRM_CHR(0x30, 1, spra::operand_2b_2); // 0x4A30
+const sal_uInt16 sprmCIstdPermute = SPRM_CHR(0x31, 1, spra::operand_varlen_6); // 0xCA31
+const sal_uInt16 sprmCPlain = SPRM_CHR(0x33, 1, spra::operand_1b_1); // 0x2A33
+const sal_uInt16 sprmCKcd = SPRM_CHR(0x34, 1, spra::operand_1b_1); // 0x2A34
+const sal_uInt16 sprmCFBold = SPRM_CHR(0x35, 0, spra::operand_toggle_1b_0); // 0x0835
+const sal_uInt16 sprmCFItalic = SPRM_CHR(0x36, 0, spra::operand_toggle_1b_0); // 0x0836
+const sal_uInt16 sprmCFStrike = SPRM_CHR(0x37, 0, spra::operand_toggle_1b_0); // 0x0837
+const sal_uInt16 sprmCFOutline = SPRM_CHR(0x38, 0, spra::operand_toggle_1b_0); // 0x0838
+const sal_uInt16 sprmCFShadow = SPRM_CHR(0x39, 0, spra::operand_toggle_1b_0); // 0x0839
+const sal_uInt16 sprmCFSmallCaps = SPRM_CHR(0x3A, 0, spra::operand_toggle_1b_0); // 0x083A
+const sal_uInt16 sprmCFCaps = SPRM_CHR(0x3B, 0, spra::operand_toggle_1b_0); // 0x083B
+const sal_uInt16 sprmCFVanish = SPRM_CHR(0x3C, 0, spra::operand_toggle_1b_0); // 0x083C
+const sal_uInt16 sprmCKul = SPRM_CHR(0x3E, 1, spra::operand_1b_1); // 0x2A3E
+const sal_uInt16 sprmCDxaSpace = SPRM_CHR(0x40, 0, spra::operand_2b_4); // 0x8840
+const sal_uInt16 sprmCIco = SPRM_CHR(0x42, 1, spra::operand_1b_1); // 0x2A42
+const sal_uInt16 sprmCHps = SPRM_CHR(0x43, 1, spra::operand_2b_2); // 0x4A43
+const sal_uInt16 sprmCHpsPos = SPRM_CHR(0x45, 0, spra::operand_2b_2); // 0x4845
+const sal_uInt16 sprmCMajority = SPRM_CHR(0x47, 1, spra::operand_varlen_6); // 0xCA47
+const sal_uInt16 sprmCIss = SPRM_CHR(0x48, 1, spra::operand_1b_1); // 0x2A48
+const sal_uInt16 sprmCHpsKern = SPRM_CHR(0x4B, 0, spra::operand_2b_2); // 0x484B
+const sal_uInt16 sprmCHresi = SPRM_CHR(0x4E, 0, spra::operand_2b_2); // 0x484E
+const sal_uInt16 sprmCRgFtc0 = SPRM_CHR(0x4F, 1, spra::operand_2b_2); // 0x4A4F
+const sal_uInt16 sprmCRgFtc1 = SPRM_CHR(0x50, 1, spra::operand_2b_2); // 0x4A50
+const sal_uInt16 sprmCRgFtc2 = SPRM_CHR(0x51, 1, spra::operand_2b_2); // 0x4A51
+const sal_uInt16 sprmCCharScale = SPRM_CHR(0x52, 0, spra::operand_2b_2); // 0x4852
+const sal_uInt16 sprmCFDStrike = SPRM_CHR(0x53, 1, spra::operand_1b_1); // 0x2A53
+const sal_uInt16 sprmCFImprint = SPRM_CHR(0x54, 0, spra::operand_toggle_1b_0); // 0x0854
+const sal_uInt16 sprmCFSpec = SPRM_CHR(0x55, 0, spra::operand_toggle_1b_0); // 0x0855
+const sal_uInt16 sprmCFObj = SPRM_CHR(0x56, 0, spra::operand_toggle_1b_0); // 0x0856
+const sal_uInt16 sprmCPropRMark90 = SPRM_CHR(0x57, 1, spra::operand_varlen_6); // 0xCA57
+const sal_uInt16 sprmCFEmboss = SPRM_CHR(0x58, 0, spra::operand_toggle_1b_0); // 0x0858
+const sal_uInt16 sprmCSfxText = SPRM_CHR(0x59, 0, spra::operand_1b_1); // 0x2859
+const sal_uInt16 sprmCFBiDi = SPRM_CHR(0x5A, 0, spra::operand_toggle_1b_0); // 0x085A
+const sal_uInt16 sprmCFBoldBi = SPRM_CHR(0x5C, 0, spra::operand_toggle_1b_0); // 0x085C
+const sal_uInt16 sprmCFItalicBi = SPRM_CHR(0x5D, 0, spra::operand_toggle_1b_0); // 0x085D
+const sal_uInt16 sprmCFtcBi = SPRM_CHR(0x5E, 1, spra::operand_2b_2); // 0x4A5E
+const sal_uInt16 sprmCLidBi = SPRM_CHR(0x5F, 0, spra::operand_2b_2); // 0x485F
+const sal_uInt16 sprmCIcoBi = SPRM_CHR(0x60, 1, spra::operand_2b_2); // 0x4A60
+const sal_uInt16 sprmCHpsBi = SPRM_CHR(0x61, 1, spra::operand_2b_2); // 0x4A61
+const sal_uInt16 sprmCDispFldRMark = SPRM_CHR(0x62, 1, spra::operand_varlen_6); // 0xCA62
+const sal_uInt16 sprmCIbstRMarkDel = SPRM_CHR(0x63, 0, spra::operand_2b_2); // 0x4863
+const sal_uInt16 sprmCDttmRMarkDel = SPRM_CHR(0x64, 0, spra::operand_4b_3); // 0x6864
+const sal_uInt16 sprmCBrc80 = SPRM_CHR(0x65, 0, spra::operand_4b_3); // 0x6865
+const sal_uInt16 sprmCShd80 = SPRM_CHR(0x66, 0, spra::operand_2b_2); // 0x4866
+const sal_uInt16 sprmCIdslRMarkDel = SPRM_CHR(0x67, 0, spra::operand_2b_2); // 0x4867
 const sal_uInt16 sprmCFUsePgsuSettings = SPRM_CHR(0x68, 0, spra::operand_toggle_1b_0); // 0x0868
-const sal_uInt16 sprmCRgLid0_80        = SPRM_CHR(0x6D, 0, spra::operand_2b_2);        // 0x486D
-const sal_uInt16 sprmCRgLid1_80        = SPRM_CHR(0x6E, 0, spra::operand_2b_2);        // 0x486E
-const sal_uInt16 sprmCIdctHint         = SPRM_CHR(0x6F, 0, spra::operand_1b_1);        // 0x286F
-const sal_uInt16 sprmCCv               = SPRM_CHR(0x70, 0, spra::operand_4b_3);        // 0x6870
-const sal_uInt16 sprmCShd              = SPRM_CHR(0x71, 1, spra::operand_varlen_6);    // 0xCA71
-const sal_uInt16 sprmCBrc              = SPRM_CHR(0x72, 1, spra::operand_varlen_6);    // 0xCA72
-const sal_uInt16 sprmCRgLid0           = SPRM_CHR(0x73, 0, spra::operand_2b_2);        // 0x4873
-const sal_uInt16 sprmCRgLid1           = SPRM_CHR(0x74, 0, spra::operand_2b_2);        // 0x4874
-const sal_uInt16 sprmCFNoProof         = SPRM_CHR(0x75, 0, spra::operand_toggle_1b_0); // 0x0875
-const sal_uInt16 sprmCFitText          = SPRM_CHR(0x76, 1, spra::operand_varlen_6);    // 0xCA76
-const sal_uInt16 sprmCCvUl             = SPRM_CHR(0x77, 0, spra::operand_4b_3);        // 0x6877
-const sal_uInt16 sprmCFELayout         = SPRM_CHR(0x78, 1, spra::operand_varlen_6);    // 0xCA78
-const sal_uInt16 sprmCLbcCRJ           = SPRM_CHR(0x79, 0, spra::operand_1b_1);        // 0x2879
-const sal_uInt16 sprmCFComplexScripts  = SPRM_CHR(0x82, 0, spra::operand_toggle_1b_0); // 0x0882
-const sal_uInt16 sprmCWall             = SPRM_CHR(0x83, 1, spra::operand_1b_1);        // 0x2A83
-const sal_uInt16 sprmCCnf              = SPRM_CHR(0x85, 1, spra::operand_varlen_6);    // 0xCA85
-const sal_uInt16 sprmCNeedFontFixup    = SPRM_CHR(0x86, 1, spra::operand_1b_1);        // 0x2A86
-const sal_uInt16 sprmCPbiIBullet       = SPRM_CHR(0x87, 0, spra::operand_4b_3);        // 0x6887
-const sal_uInt16 sprmCPbiGrf           = SPRM_CHR(0x88, 0, spra::operand_2b_2);        // 0x4888
-const sal_uInt16 sprmCPropRMark        = SPRM_CHR(0x89, 1, spra::operand_varlen_6);    // 0xCA89
-const sal_uInt16 sprmCFSdtVanish       = SPRM_CHR(0x90, 1, spra::operand_1b_1);        // 0x2A90
+const sal_uInt16 sprmCRgLid0_80 = SPRM_CHR(0x6D, 0, spra::operand_2b_2); // 0x486D
+const sal_uInt16 sprmCRgLid1_80 = SPRM_CHR(0x6E, 0, spra::operand_2b_2); // 0x486E
+const sal_uInt16 sprmCIdctHint = SPRM_CHR(0x6F, 0, spra::operand_1b_1); // 0x286F
+const sal_uInt16 sprmCCv = SPRM_CHR(0x70, 0, spra::operand_4b_3); // 0x6870
+const sal_uInt16 sprmCShd = SPRM_CHR(0x71, 1, spra::operand_varlen_6); // 0xCA71
+const sal_uInt16 sprmCBrc = SPRM_CHR(0x72, 1, spra::operand_varlen_6); // 0xCA72
+const sal_uInt16 sprmCRgLid0 = SPRM_CHR(0x73, 0, spra::operand_2b_2); // 0x4873
+const sal_uInt16 sprmCRgLid1 = SPRM_CHR(0x74, 0, spra::operand_2b_2); // 0x4874
+const sal_uInt16 sprmCFNoProof = SPRM_CHR(0x75, 0, spra::operand_toggle_1b_0); // 0x0875
+const sal_uInt16 sprmCFitText = SPRM_CHR(0x76, 1, spra::operand_varlen_6); // 0xCA76
+const sal_uInt16 sprmCCvUl = SPRM_CHR(0x77, 0, spra::operand_4b_3); // 0x6877
+const sal_uInt16 sprmCFELayout = SPRM_CHR(0x78, 1, spra::operand_varlen_6); // 0xCA78
+const sal_uInt16 sprmCLbcCRJ = SPRM_CHR(0x79, 0, spra::operand_1b_1); // 0x2879
+const sal_uInt16 sprmCFComplexScripts = SPRM_CHR(0x82, 0, spra::operand_toggle_1b_0); // 0x0882
+const sal_uInt16 sprmCWall = SPRM_CHR(0x83, 1, spra::operand_1b_1); // 0x2A83
+const sal_uInt16 sprmCCnf = SPRM_CHR(0x85, 1, spra::operand_varlen_6); // 0xCA85
+const sal_uInt16 sprmCNeedFontFixup = SPRM_CHR(0x86, 1, spra::operand_1b_1); // 0x2A86
+const sal_uInt16 sprmCPbiIBullet = SPRM_CHR(0x87, 0, spra::operand_4b_3); // 0x6887
+const sal_uInt16 sprmCPbiGrf = SPRM_CHR(0x88, 0, spra::operand_2b_2); // 0x4888
+const sal_uInt16 sprmCPropRMark = SPRM_CHR(0x89, 1, spra::operand_varlen_6); // 0xCA89
+const sal_uInt16 sprmCFSdtVanish = SPRM_CHR(0x90, 1, spra::operand_1b_1); // 0x2A90
 
 // [MS-DOC] - v20170112 Section 2.6.2
-const sal_uInt16 sprmPIstd               = SPRM_PAR(0x00, 1, spra::operand_2b_2);     // 0x4600
-const sal_uInt16 sprmPIstdPermute        = SPRM_PAR(0x01, 1, spra::operand_varlen_6); // 0xC601
-const sal_uInt16 sprmPIncLvl             = SPRM_PAR(0x02, 1, spra::operand_1b_1);     // 0x2602
-const sal_uInt16 sprmPJc80               = SPRM_PAR(0x03, 0, spra::operand_1b_1);     // 0x2403
-const sal_uInt16 sprmPFKeep              = SPRM_PAR(0x05, 0, spra::operand_1b_1);     // 0x2405
-const sal_uInt16 sprmPFKeepFollow        = SPRM_PAR(0x06, 0, spra::operand_1b_1);     // 0x2406
-const sal_uInt16 sprmPFPageBreakBefore   = SPRM_PAR(0x07, 0, spra::operand_1b_1);     // 0x2407
-const sal_uInt16 sprmPIlvl               = SPRM_PAR(0x0A, 1, spra::operand_1b_1);     // 0x260A
-const sal_uInt16 sprmPIlfo               = SPRM_PAR(0x0B, 1, spra::operand_2b_2);     // 0x460B
-const sal_uInt16 sprmPFNoLineNumb        = SPRM_PAR(0x0C, 0, spra::operand_1b_1);     // 0x240C
-const sal_uInt16 sprmPChgTabsPapx        = SPRM_PAR(0x0D, 1, spra::operand_varlen_6); // 0xC60D
-const sal_uInt16 sprmPDxaRight80         = SPRM_PAR(0x0E, 0, spra::operand_2b_4);     // 0x840E
-const sal_uInt16 sprmPDxaLeft80          = SPRM_PAR(0x0F, 0, spra::operand_2b_4);     // 0x840F
-const sal_uInt16 sprmPNest80             = SPRM_PAR(0x10, 1, spra::operand_2b_2);     // 0x4610
-const sal_uInt16 sprmPDxaLeft180         = SPRM_PAR(0x11, 0, spra::operand_2b_4);     // 0x8411
-const sal_uInt16 sprmPDyaLine            = SPRM_PAR(0x12, 0, spra::operand_4b_3);     // 0x6412
-const sal_uInt16 sprmPDyaBefore          = SPRM_PAR(0x13, 0, spra::operand_2b_5);     // 0xA413
-const sal_uInt16 sprmPDyaAfter           = SPRM_PAR(0x14, 0, spra::operand_2b_5);     // 0xA414
-const sal_uInt16 sprmPChgTabs            = SPRM_PAR(0x15, 1, spra::operand_varlen_6); // 0xC615
-const sal_uInt16 sprmPFInTable           = SPRM_PAR(0x16, 0, spra::operand_1b_1);     // 0x2416
-const sal_uInt16 sprmPFTtp               = SPRM_PAR(0x17, 0, spra::operand_1b_1);     // 0x2417
-const sal_uInt16 sprmPDxaAbs             = SPRM_PAR(0x18, 0, spra::operand_2b_4);     // 0x8418
-const sal_uInt16 sprmPDyaAbs             = SPRM_PAR(0x19, 0, spra::operand_2b_4);     // 0x8419
-const sal_uInt16 sprmPDxaWidth           = SPRM_PAR(0x1A, 0, spra::operand_2b_4);     // 0x841A
-const sal_uInt16 sprmPPc                 = SPRM_PAR(0x1B, 1, spra::operand_1b_1);     // 0x261B
-const sal_uInt16 sprmPWr                 = SPRM_PAR(0x23, 0, spra::operand_1b_1);     // 0x2423
-const sal_uInt16 sprmPBrcTop80           = SPRM_PAR(0x24, 0, spra::operand_4b_3);     // 0x6424
-const sal_uInt16 sprmPBrcLeft80          = SPRM_PAR(0x25, 0, spra::operand_4b_3);     // 0x6425
-const sal_uInt16 sprmPBrcBottom80        = SPRM_PAR(0x26, 0, spra::operand_4b_3);     // 0x6426
-const sal_uInt16 sprmPBrcRight80         = SPRM_PAR(0x27, 0, spra::operand_4b_3);     // 0x6427
-const sal_uInt16 sprmPBrcBetween80       = SPRM_PAR(0x28, 0, spra::operand_4b_3);     // 0x6428
-const sal_uInt16 sprmPBrcBar80           = SPRM_PAR(0x29, 1, spra::operand_4b_3);     // 0x6629
-const sal_uInt16 sprmPFNoAutoHyph        = SPRM_PAR(0x2A, 0, spra::operand_1b_1);     // 0x242A
-const sal_uInt16 sprmPWHeightAbs         = SPRM_PAR(0x2B, 0, spra::operand_2b_2);     // 0x442B
-const sal_uInt16 sprmPDcs                = SPRM_PAR(0x2C, 0, spra::operand_2b_2);     // 0x442C
-const sal_uInt16 sprmPShd80              = SPRM_PAR(0x2D, 0, spra::operand_2b_2);     // 0x442D
-const sal_uInt16 sprmPDyaFromText        = SPRM_PAR(0x2E, 0, spra::operand_2b_4);     // 0x842E
-const sal_uInt16 sprmPDxaFromText        = SPRM_PAR(0x2F, 0, spra::operand_2b_4);     // 0x842F
-const sal_uInt16 sprmPFLocked            = SPRM_PAR(0x30, 0, spra::operand_1b_1);     // 0x2430
-const sal_uInt16 sprmPFWidowControl      = SPRM_PAR(0x31, 0, spra::operand_1b_1);     // 0x2431
-const sal_uInt16 sprmPFKinsoku           = SPRM_PAR(0x33, 0, spra::operand_1b_1);     // 0x2433
-const sal_uInt16 sprmPFWordWrap          = SPRM_PAR(0x34, 0, spra::operand_1b_1);     // 0x2434
-const sal_uInt16 sprmPFOverflowPunct     = SPRM_PAR(0x35, 0, spra::operand_1b_1);     // 0x2435
-const sal_uInt16 sprmPFTopLinePunct      = SPRM_PAR(0x36, 0, spra::operand_1b_1);     // 0x2436
-const sal_uInt16 sprmPFAutoSpaceDE       = SPRM_PAR(0x37, 0, spra::operand_1b_1);     // 0x2437
-const sal_uInt16 sprmPFAutoSpaceDN       = SPRM_PAR(0x38, 0, spra::operand_1b_1);     // 0x2438
-const sal_uInt16 sprmPWAlignFont         = SPRM_PAR(0x39, 0, spra::operand_2b_2);     // 0x4439
-const sal_uInt16 sprmPFrameTextFlow      = SPRM_PAR(0x3A, 0, spra::operand_2b_2);     // 0x443A
-const sal_uInt16 sprmPOutLvl             = SPRM_PAR(0x40, 1, spra::operand_1b_1);     // 0x2640
-const sal_uInt16 sprmPFBiDi              = SPRM_PAR(0x41, 0, spra::operand_1b_1);     // 0x2441
-const sal_uInt16 sprmPFNumRMIns          = SPRM_PAR(0x43, 0, spra::operand_1b_1);     // 0x2443
-const sal_uInt16 sprmPNumRM              = SPRM_PAR(0x45, 1, spra::operand_varlen_6); // 0xC645
-const sal_uInt16 sprmPHugePapx           = SPRM_PAR(0x46, 1, spra::operand_4b_3);     // 0x6646
-const sal_uInt16 sprmPFUsePgsuSettings   = SPRM_PAR(0x47, 0, spra::operand_1b_1);     // 0x2447
-const sal_uInt16 sprmPFAdjustRight       = SPRM_PAR(0x48, 0, spra::operand_1b_1);     // 0x2448
-const sal_uInt16 sprmPItap               = SPRM_PAR(0x49, 1, spra::operand_4b_3);     // 0x6649
-const sal_uInt16 sprmPDtap               = SPRM_PAR(0x4A, 1, spra::operand_4b_3);     // 0x664A
-const sal_uInt16 sprmPFInnerTableCell    = SPRM_PAR(0x4B, 0, spra::operand_1b_1);     // 0x244B
-const sal_uInt16 sprmPFInnerTtp          = SPRM_PAR(0x4C, 0, spra::operand_1b_1);     // 0x244C
-const sal_uInt16 sprmPShd                = SPRM_PAR(0x4D, 1, spra::operand_varlen_6); // 0xC64D
-const sal_uInt16 sprmPBrcTop             = SPRM_PAR(0x4E, 1, spra::operand_varlen_6); // 0xC64E
-const sal_uInt16 sprmPBrcLeft            = SPRM_PAR(0x4F, 1, spra::operand_varlen_6); // 0xC64F
-const sal_uInt16 sprmPBrcBottom          = SPRM_PAR(0x50, 1, spra::operand_varlen_6); // 0xC650
-const sal_uInt16 sprmPBrcRight           = SPRM_PAR(0x51, 1, spra::operand_varlen_6); // 0xC651
-const sal_uInt16 sprmPBrcBetween         = SPRM_PAR(0x52, 1, spra::operand_varlen_6); // 0xC652
-const sal_uInt16 sprmPBrcBar             = SPRM_PAR(0x53, 1, spra::operand_varlen_6); // 0xC653
-const sal_uInt16 sprmPDxcRight           = SPRM_PAR(0x55, 0, spra::operand_2b_2);     // 0x4455
-const sal_uInt16 sprmPDxcLeft            = SPRM_PAR(0x56, 0, spra::operand_2b_2);     // 0x4456
-const sal_uInt16 sprmPDxcLeft1           = SPRM_PAR(0x57, 0, spra::operand_2b_2);     // 0x4457
-const sal_uInt16 sprmPDylBefore          = SPRM_PAR(0x58, 0, spra::operand_2b_2);     // 0x4458
-const sal_uInt16 sprmPDylAfter           = SPRM_PAR(0x59, 0, spra::operand_2b_2);     // 0x4459
-const sal_uInt16 sprmPFOpenTch           = SPRM_PAR(0x5A, 0, spra::operand_1b_1);     // 0x245A
-const sal_uInt16 sprmPFDyaBeforeAuto     = SPRM_PAR(0x5B, 0, spra::operand_1b_1);     // 0x245B
-const sal_uInt16 sprmPFDyaAfterAuto      = SPRM_PAR(0x5C, 0, spra::operand_1b_1);     // 0x245C
-const sal_uInt16 sprmPDxaRight           = SPRM_PAR(0x5D, 0, spra::operand_2b_4);     // 0x845D
-const sal_uInt16 sprmPDxaLeft            = SPRM_PAR(0x5E, 0, spra::operand_2b_4);     // 0x845E
-const sal_uInt16 sprmPNest               = SPRM_PAR(0x5F, 1, spra::operand_2b_2);     // 0x465F
-const sal_uInt16 sprmPDxaLeft1           = SPRM_PAR(0x60, 0, spra::operand_2b_4);     // 0x8460
-const sal_uInt16 sprmPJc                 = SPRM_PAR(0x61, 0, spra::operand_1b_1);     // 0x2461
-const sal_uInt16 sprmPFNoAllowOverlap    = SPRM_PAR(0x62, 0, spra::operand_1b_1);     // 0x2462
-const sal_uInt16 sprmPWall               = SPRM_PAR(0x64, 1, spra::operand_1b_1);     // 0x2664
-const sal_uInt16 sprmPIpgp               = SPRM_PAR(0x65, 0, spra::operand_4b_3);     // 0x6465
-const sal_uInt16 sprmPCnf                = SPRM_PAR(0x66, 1, spra::operand_varlen_6); // 0xC666
-const sal_uInt16 sprmPRsid               = SPRM_PAR(0x67, 0, spra::operand_4b_3);     // 0x6467
-const sal_uInt16 sprmPIstdListPermute    = SPRM_PAR(0x69, 1, spra::operand_varlen_6); // 0xC669
-const sal_uInt16 sprmPTableProps         = SPRM_PAR(0x6B, 0, spra::operand_4b_3);     // 0x646B
-const sal_uInt16 sprmPTIstdInfo          = SPRM_PAR(0x6C, 1, spra::operand_varlen_6); // 0xC66C
-const sal_uInt16 sprmPFContextualSpacing = SPRM_PAR(0x6D, 0, spra::operand_1b_1);     // 0x246D
-const sal_uInt16 sprmPPropRMark          = SPRM_PAR(0x6F, 1, spra::operand_varlen_6); // 0xC66F
-const sal_uInt16 sprmPFMirrorIndents     = SPRM_PAR(0x70, 0, spra::operand_1b_1);     // 0x2470
-const sal_uInt16 sprmPTtwo               = SPRM_PAR(0x71, 0, spra::operand_1b_1);     // 0x2471
+const sal_uInt16 sprmPIstd = SPRM_PAR(0x00, 1, spra::operand_2b_2); // 0x4600
+const sal_uInt16 sprmPIstdPermute = SPRM_PAR(0x01, 1, spra::operand_varlen_6); // 0xC601
+const sal_uInt16 sprmPIncLvl = SPRM_PAR(0x02, 1, spra::operand_1b_1); // 0x2602
+const sal_uInt16 sprmPJc80 = SPRM_PAR(0x03, 0, spra::operand_1b_1); // 0x2403
+const sal_uInt16 sprmPFKeep = SPRM_PAR(0x05, 0, spra::operand_1b_1); // 0x2405
+const sal_uInt16 sprmPFKeepFollow = SPRM_PAR(0x06, 0, spra::operand_1b_1); // 0x2406
+const sal_uInt16 sprmPFPageBreakBefore = SPRM_PAR(0x07, 0, spra::operand_1b_1); // 0x2407
+const sal_uInt16 sprmPIlvl = SPRM_PAR(0x0A, 1, spra::operand_1b_1); // 0x260A
+const sal_uInt16 sprmPIlfo = SPRM_PAR(0x0B, 1, spra::operand_2b_2); // 0x460B
+const sal_uInt16 sprmPFNoLineNumb = SPRM_PAR(0x0C, 0, spra::operand_1b_1); // 0x240C
+const sal_uInt16 sprmPChgTabsPapx = SPRM_PAR(0x0D, 1, spra::operand_varlen_6); // 0xC60D
+const sal_uInt16 sprmPDxaRight80 = SPRM_PAR(0x0E, 0, spra::operand_2b_4); // 0x840E
+const sal_uInt16 sprmPDxaLeft80 = SPRM_PAR(0x0F, 0, spra::operand_2b_4); // 0x840F
+const sal_uInt16 sprmPNest80 = SPRM_PAR(0x10, 1, spra::operand_2b_2); // 0x4610
+const sal_uInt16 sprmPDxaLeft180 = SPRM_PAR(0x11, 0, spra::operand_2b_4); // 0x8411
+const sal_uInt16 sprmPDyaLine = SPRM_PAR(0x12, 0, spra::operand_4b_3); // 0x6412
+const sal_uInt16 sprmPDyaBefore = SPRM_PAR(0x13, 0, spra::operand_2b_5); // 0xA413
+const sal_uInt16 sprmPDyaAfter = SPRM_PAR(0x14, 0, spra::operand_2b_5); // 0xA414
+const sal_uInt16 sprmPChgTabs = SPRM_PAR(0x15, 1, spra::operand_varlen_6); // 0xC615
+const sal_uInt16 sprmPFInTable = SPRM_PAR(0x16, 0, spra::operand_1b_1); // 0x2416
+const sal_uInt16 sprmPFTtp = SPRM_PAR(0x17, 0, spra::operand_1b_1); // 0x2417
+const sal_uInt16 sprmPDxaAbs = SPRM_PAR(0x18, 0, spra::operand_2b_4); // 0x8418
+const sal_uInt16 sprmPDyaAbs = SPRM_PAR(0x19, 0, spra::operand_2b_4); // 0x8419
+const sal_uInt16 sprmPDxaWidth = SPRM_PAR(0x1A, 0, spra::operand_2b_4); // 0x841A
+const sal_uInt16 sprmPPc = SPRM_PAR(0x1B, 1, spra::operand_1b_1); // 0x261B
+const sal_uInt16 sprmPWr = SPRM_PAR(0x23, 0, spra::operand_1b_1); // 0x2423
+const sal_uInt16 sprmPBrcTop80 = SPRM_PAR(0x24, 0, spra::operand_4b_3); // 0x6424
+const sal_uInt16 sprmPBrcLeft80 = SPRM_PAR(0x25, 0, spra::operand_4b_3); // 0x6425
+const sal_uInt16 sprmPBrcBottom80 = SPRM_PAR(0x26, 0, spra::operand_4b_3); // 0x6426
+const sal_uInt16 sprmPBrcRight80 = SPRM_PAR(0x27, 0, spra::operand_4b_3); // 0x6427
+const sal_uInt16 sprmPBrcBetween80 = SPRM_PAR(0x28, 0, spra::operand_4b_3); // 0x6428
+const sal_uInt16 sprmPBrcBar80 = SPRM_PAR(0x29, 1, spra::operand_4b_3); // 0x6629
+const sal_uInt16 sprmPFNoAutoHyph = SPRM_PAR(0x2A, 0, spra::operand_1b_1); // 0x242A
+const sal_uInt16 sprmPWHeightAbs = SPRM_PAR(0x2B, 0, spra::operand_2b_2); // 0x442B
+const sal_uInt16 sprmPDcs = SPRM_PAR(0x2C, 0, spra::operand_2b_2); // 0x442C
+const sal_uInt16 sprmPShd80 = SPRM_PAR(0x2D, 0, spra::operand_2b_2); // 0x442D
+const sal_uInt16 sprmPDyaFromText = SPRM_PAR(0x2E, 0, spra::operand_2b_4); // 0x842E
+const sal_uInt16 sprmPDxaFromText = SPRM_PAR(0x2F, 0, spra::operand_2b_4); // 0x842F
+const sal_uInt16 sprmPFLocked = SPRM_PAR(0x30, 0, spra::operand_1b_1); // 0x2430
+const sal_uInt16 sprmPFWidowControl = SPRM_PAR(0x31, 0, spra::operand_1b_1); // 0x2431
+const sal_uInt16 sprmPFKinsoku = SPRM_PAR(0x33, 0, spra::operand_1b_1); // 0x2433
+const sal_uInt16 sprmPFWordWrap = SPRM_PAR(0x34, 0, spra::operand_1b_1); // 0x2434
+const sal_uInt16 sprmPFOverflowPunct = SPRM_PAR(0x35, 0, spra::operand_1b_1); // 0x2435
+const sal_uInt16 sprmPFTopLinePunct = SPRM_PAR(0x36, 0, spra::operand_1b_1); // 0x2436
+const sal_uInt16 sprmPFAutoSpaceDE = SPRM_PAR(0x37, 0, spra::operand_1b_1); // 0x2437
+const sal_uInt16 sprmPFAutoSpaceDN = SPRM_PAR(0x38, 0, spra::operand_1b_1); // 0x2438
+const sal_uInt16 sprmPWAlignFont = SPRM_PAR(0x39, 0, spra::operand_2b_2); // 0x4439
+const sal_uInt16 sprmPFrameTextFlow = SPRM_PAR(0x3A, 0, spra::operand_2b_2); // 0x443A
+const sal_uInt16 sprmPOutLvl = SPRM_PAR(0x40, 1, spra::operand_1b_1); // 0x2640
+const sal_uInt16 sprmPFBiDi = SPRM_PAR(0x41, 0, spra::operand_1b_1); // 0x2441
+const sal_uInt16 sprmPFNumRMIns = SPRM_PAR(0x43, 0, spra::operand_1b_1); // 0x2443
+const sal_uInt16 sprmPNumRM = SPRM_PAR(0x45, 1, spra::operand_varlen_6); // 0xC645
+const sal_uInt16 sprmPHugePapx = SPRM_PAR(0x46, 1, spra::operand_4b_3); // 0x6646
+const sal_uInt16 sprmPFUsePgsuSettings = SPRM_PAR(0x47, 0, spra::operand_1b_1); // 0x2447
+const sal_uInt16 sprmPFAdjustRight = SPRM_PAR(0x48, 0, spra::operand_1b_1); // 0x2448
+const sal_uInt16 sprmPItap = SPRM_PAR(0x49, 1, spra::operand_4b_3); // 0x6649
+const sal_uInt16 sprmPDtap = SPRM_PAR(0x4A, 1, spra::operand_4b_3); // 0x664A
+const sal_uInt16 sprmPFInnerTableCell = SPRM_PAR(0x4B, 0, spra::operand_1b_1); // 0x244B
+const sal_uInt16 sprmPFInnerTtp = SPRM_PAR(0x4C, 0, spra::operand_1b_1); // 0x244C
+const sal_uInt16 sprmPShd = SPRM_PAR(0x4D, 1, spra::operand_varlen_6); // 0xC64D
+const sal_uInt16 sprmPBrcTop = SPRM_PAR(0x4E, 1, spra::operand_varlen_6); // 0xC64E
+const sal_uInt16 sprmPBrcLeft = SPRM_PAR(0x4F, 1, spra::operand_varlen_6); // 0xC64F
+const sal_uInt16 sprmPBrcBottom = SPRM_PAR(0x50, 1, spra::operand_varlen_6); // 0xC650
+const sal_uInt16 sprmPBrcRight = SPRM_PAR(0x51, 1, spra::operand_varlen_6); // 0xC651
+const sal_uInt16 sprmPBrcBetween = SPRM_PAR(0x52, 1, spra::operand_varlen_6); // 0xC652
+const sal_uInt16 sprmPBrcBar = SPRM_PAR(0x53, 1, spra::operand_varlen_6); // 0xC653
+const sal_uInt16 sprmPDxcRight = SPRM_PAR(0x55, 0, spra::operand_2b_2); // 0x4455
+const sal_uInt16 sprmPDxcLeft = SPRM_PAR(0x56, 0, spra::operand_2b_2); // 0x4456
+const sal_uInt16 sprmPDxcLeft1 = SPRM_PAR(0x57, 0, spra::operand_2b_2); // 0x4457
+const sal_uInt16 sprmPDylBefore = SPRM_PAR(0x58, 0, spra::operand_2b_2); // 0x4458
+const sal_uInt16 sprmPDylAfter = SPRM_PAR(0x59, 0, spra::operand_2b_2); // 0x4459
+const sal_uInt16 sprmPFOpenTch = SPRM_PAR(0x5A, 0, spra::operand_1b_1); // 0x245A
+const sal_uInt16 sprmPFDyaBeforeAuto = SPRM_PAR(0x5B, 0, spra::operand_1b_1); // 0x245B
+const sal_uInt16 sprmPFDyaAfterAuto = SPRM_PAR(0x5C, 0, spra::operand_1b_1); // 0x245C
+const sal_uInt16 sprmPDxaRight = SPRM_PAR(0x5D, 0, spra::operand_2b_4); // 0x845D
+const sal_uInt16 sprmPDxaLeft = SPRM_PAR(0x5E, 0, spra::operand_2b_4); // 0x845E
+const sal_uInt16 sprmPNest = SPRM_PAR(0x5F, 1, spra::operand_2b_2); // 0x465F
+const sal_uInt16 sprmPDxaLeft1 = SPRM_PAR(0x60, 0, spra::operand_2b_4); // 0x8460
+const sal_uInt16 sprmPJc = SPRM_PAR(0x61, 0, spra::operand_1b_1); // 0x2461
+const sal_uInt16 sprmPFNoAllowOverlap = SPRM_PAR(0x62, 0, spra::operand_1b_1); // 0x2462
+const sal_uInt16 sprmPWall = SPRM_PAR(0x64, 1, spra::operand_1b_1); // 0x2664
+const sal_uInt16 sprmPIpgp = SPRM_PAR(0x65, 0, spra::operand_4b_3); // 0x6465
+const sal_uInt16 sprmPCnf = SPRM_PAR(0x66, 1, spra::operand_varlen_6); // 0xC666
+const sal_uInt16 sprmPRsid = SPRM_PAR(0x67, 0, spra::operand_4b_3); // 0x6467
+const sal_uInt16 sprmPIstdListPermute = SPRM_PAR(0x69, 1, spra::operand_varlen_6); // 0xC669
+const sal_uInt16 sprmPTableProps = SPRM_PAR(0x6B, 0, spra::operand_4b_3); // 0x646B
+const sal_uInt16 sprmPTIstdInfo = SPRM_PAR(0x6C, 1, spra::operand_varlen_6); // 0xC66C
+const sal_uInt16 sprmPFContextualSpacing = SPRM_PAR(0x6D, 0, spra::operand_1b_1); // 0x246D
+const sal_uInt16 sprmPPropRMark = SPRM_PAR(0x6F, 1, spra::operand_varlen_6); // 0xC66F
+const sal_uInt16 sprmPFMirrorIndents = SPRM_PAR(0x70, 0, spra::operand_1b_1); // 0x2470
+const sal_uInt16 sprmPTtwo = SPRM_PAR(0x71, 0, spra::operand_1b_1); // 0x2471
 
 // [MS-DOC] - v20170112 Section 2.6.3
-const sal_uInt16 sprmTJc90                = SPRM_TBL(0x00, 0, spra::operand_2b_2);     // 0x5400
-const sal_uInt16 sprmTDxaLeft             = SPRM_TBL(0x01, 1, spra::operand_2b_4);     // 0x9601
-const sal_uInt16 sprmTDxaGapHalf          = SPRM_TBL(0x02, 1, spra::operand_2b_4);     // 0x9602
-const sal_uInt16 sprmTFCantSplit90        = SPRM_TBL(0x03, 0, spra::operand_1b_1);     // 0x3403
-const sal_uInt16 sprmTTableHeader         = SPRM_TBL(0x04, 0, spra::operand_1b_1);     // 0x3404
-const sal_uInt16 sprmTTableBorders80      = SPRM_TBL(0x05, 1, spra::operand_varlen_6); // 0xD605
-const sal_uInt16 sprmTDyaRowHeight        = SPRM_TBL(0x07, 0, spra::operand_2b_4);     // 0x9407
-const sal_uInt16 sprmTDefTable            = SPRM_TBL(0x08, 1, spra::operand_varlen_6); // 0xD608
-const sal_uInt16 sprmTDefTableShd80       = SPRM_TBL(0x09, 1, spra::operand_varlen_6); // 0xD609
-const sal_uInt16 sprmTTlp                 = SPRM_TBL(0x0A, 0, spra::operand_4b_3);     // 0x740A
-const sal_uInt16 sprmTFBiDi               = SPRM_TBL(0x0B, 1, spra::operand_2b_2);     // 0x560B
-const sal_uInt16 sprmTDefTableShd3rd      = SPRM_TBL(0x0C, 1, spra::operand_varlen_6); // 0xD60C
-const sal_uInt16 sprmTPc                  = SPRM_TBL(0x0D, 1, spra::operand_1b_1);     // 0x360D
-const sal_uInt16 sprmTDxaAbs              = SPRM_TBL(0x0E, 0, spra::operand_2b_4);     // 0x940E
-const sal_uInt16 sprmTDyaAbs              = SPRM_TBL(0x0F, 0, spra::operand_2b_4);     // 0x940F
-const sal_uInt16 sprmTDxaFromText         = SPRM_TBL(0x10, 0, spra::operand_2b_4);     // 0x9410
-const sal_uInt16 sprmTDyaFromText         = SPRM_TBL(0x11, 0, spra::operand_2b_4);     // 0x9411
-const sal_uInt16 sprmTDefTableShd         = SPRM_TBL(0x12, 1, spra::operand_varlen_6); // 0xD612
-const sal_uInt16 sprmTTableBorders        = SPRM_TBL(0x13, 1, spra::operand_varlen_6); // 0xD613
-const sal_uInt16 sprmTTableWidth          = SPRM_TBL(0x14, 1, spra::operand_3b_7);     // 0xF614
-const sal_uInt16 sprmTFAutofit            = SPRM_TBL(0x15, 1, spra::operand_1b_1);     // 0x3615
-const sal_uInt16 sprmTDefTableShd2nd      = SPRM_TBL(0x16, 1, spra::operand_varlen_6); // 0xD616
-const sal_uInt16 sprmTWidthBefore         = SPRM_TBL(0x17, 1, spra::operand_3b_7);     // 0xF617
-const sal_uInt16 sprmTWidthAfter          = SPRM_TBL(0x18, 1, spra::operand_3b_7);     // 0xF618
-const sal_uInt16 sprmTFKeepFollow         = SPRM_TBL(0x19, 1, spra::operand_1b_1);     // 0x3619
-const sal_uInt16 sprmTBrcTopCv            = SPRM_TBL(0x1A, 1, spra::operand_varlen_6); // 0xD61A
-const sal_uInt16 sprmTBrcLeftCv           = SPRM_TBL(0x1B, 1, spra::operand_varlen_6); // 0xD61B
-const sal_uInt16 sprmTBrcBottomCv         = SPRM_TBL(0x1C, 1, spra::operand_varlen_6); // 0xD61C
-const sal_uInt16 sprmTBrcRightCv          = SPRM_TBL(0x1D, 1, spra::operand_varlen_6); // 0xD61D
-const sal_uInt16 sprmTDxaFromTextRight    = SPRM_TBL(0x1E, 0, spra::operand_2b_4);     // 0x941E
-const sal_uInt16 sprmTDyaFromTextBottom   = SPRM_TBL(0x1F, 0, spra::operand_2b_4);     // 0x941F
-const sal_uInt16 sprmTSetBrc80            = SPRM_TBL(0x20, 1, spra::operand_varlen_6); // 0xD620
-const sal_uInt16 sprmTInsert              = SPRM_TBL(0x21, 1, spra::operand_4b_3);     // 0x7621
-const sal_uInt16 sprmTDelete              = SPRM_TBL(0x22, 1, spra::operand_2b_2);     // 0x5622
-const sal_uInt16 sprmTDxaCol              = SPRM_TBL(0x23, 1, spra::operand_4b_3);     // 0x7623
-const sal_uInt16 sprmTMerge               = SPRM_TBL(0x24, 1, spra::operand_2b_2);     // 0x5624
-const sal_uInt16 sprmTSplit               = SPRM_TBL(0x25, 1, spra::operand_2b_2);     // 0x5625
-const sal_uInt16 sprmTTextFlow            = SPRM_TBL(0x29, 1, spra::operand_4b_3);     // 0x7629
-const sal_uInt16 sprmTVertMerge           = SPRM_TBL(0x2B, 1, spra::operand_varlen_6); // 0xD62B
-const sal_uInt16 sprmTVertAlign           = SPRM_TBL(0x2C, 1, spra::operand_varlen_6); // 0xD62C
-const sal_uInt16 sprmTSetShd              = SPRM_TBL(0x2D, 1, spra::operand_varlen_6); // 0xD62D
-const sal_uInt16 sprmTSetShdOdd           = SPRM_TBL(0x2E, 1, spra::operand_varlen_6); // 0xD62E
-const sal_uInt16 sprmTSetBrc              = SPRM_TBL(0x2F, 1, spra::operand_varlen_6); // 0xD62F
-const sal_uInt16 sprmTCellPadding         = SPRM_TBL(0x32, 1, spra::operand_varlen_6); // 0xD632
-const sal_uInt16 sprmTCellSpacingDefault  = SPRM_TBL(0x33, 1, spra::operand_varlen_6); // 0xD633
-const sal_uInt16 sprmTCellPaddingDefault  = SPRM_TBL(0x34, 1, spra::operand_varlen_6); // 0xD634
-const sal_uInt16 sprmTCellWidth           = SPRM_TBL(0x35, 1, spra::operand_varlen_6); // 0xD635
-const sal_uInt16 sprmTFitText             = SPRM_TBL(0x36, 1, spra::operand_3b_7);     // 0xF636
-const sal_uInt16 sprmTFCellNoWrap         = SPRM_TBL(0x39, 1, spra::operand_varlen_6); // 0xD639
-const sal_uInt16 sprmTIstd                = SPRM_TBL(0x3A, 1, spra::operand_2b_2);     // 0x563A
-const sal_uInt16 sprmTCellPaddingStyle    = SPRM_TBL(0x3E, 1, spra::operand_varlen_6); // 0xD63E
-const sal_uInt16 sprmTCellFHideMark       = SPRM_TBL(0x42, 1, spra::operand_varlen_6); // 0xD642
-const sal_uInt16 sprmTSetShdTable         = SPRM_TBL(0x60, 1, spra::operand_varlen_6); // 0xD660
-const sal_uInt16 sprmTWidthIndent         = SPRM_TBL(0x61, 1, spra::operand_3b_7);     // 0xF661
-const sal_uInt16 sprmTCellBrcType         = SPRM_TBL(0x62, 1, spra::operand_varlen_6); // 0xD662
-const sal_uInt16 sprmTFBiDi90             = SPRM_TBL(0x64, 1, spra::operand_2b_2);     // 0x5664
-const sal_uInt16 sprmTFNoAllowOverlap     = SPRM_TBL(0x65, 0, spra::operand_1b_1);     // 0x3465
-const sal_uInt16 sprmTFCantSplit          = SPRM_TBL(0x66, 0, spra::operand_1b_1);     // 0x3466
-const sal_uInt16 sprmTPropRMark           = SPRM_TBL(0x67, 1, spra::operand_varlen_6); // 0xD667
-const sal_uInt16 sprmTWall                = SPRM_TBL(0x68, 1, spra::operand_1b_1);     // 0x3668
-const sal_uInt16 sprmTIpgp                = SPRM_TBL(0x69, 0, spra::operand_4b_3);     // 0x7469
-const sal_uInt16 sprmTCnf                 = SPRM_TBL(0x6A, 1, spra::operand_varlen_6); // 0xD66A
-const sal_uInt16 sprmTDefTableShdRaw      = SPRM_TBL(0x70, 1, spra::operand_varlen_6); // 0xD670
-const sal_uInt16 sprmTDefTableShdRaw2nd   = SPRM_TBL(0x71, 1, spra::operand_varlen_6); // 0xD671
-const sal_uInt16 sprmTDefTableShdRaw3rd   = SPRM_TBL(0x72, 1, spra::operand_varlen_6); // 0xD672
-const sal_uInt16 sprmTRsid                = SPRM_TBL(0x79, 0, spra::operand_4b_3);     // 0x7479
-const sal_uInt16 sprmTCellVertAlignStyle  = SPRM_TBL(0x7C, 0, spra::operand_1b_1);     // 0x347C
-const sal_uInt16 sprmTCellNoWrapStyle     = SPRM_TBL(0x7D, 0, spra::operand_1b_1);     // 0x347D
-const sal_uInt16 sprmTCellBrcTopStyle     = SPRM_TBL(0x7F, 0, spra::operand_varlen_6); // 0xD47F
-const sal_uInt16 sprmTCellBrcBottomStyle  = SPRM_TBL(0x80, 1, spra::operand_varlen_6); // 0xD680
-const sal_uInt16 sprmTCellBrcLeftStyle    = SPRM_TBL(0x81, 1, spra::operand_varlen_6); // 0xD681
-const sal_uInt16 sprmTCellBrcRightStyle   = SPRM_TBL(0x82, 1, spra::operand_varlen_6); // 0xD682
+const sal_uInt16 sprmTJc90 = SPRM_TBL(0x00, 0, spra::operand_2b_2); // 0x5400
+const sal_uInt16 sprmTDxaLeft = SPRM_TBL(0x01, 1, spra::operand_2b_4); // 0x9601
+const sal_uInt16 sprmTDxaGapHalf = SPRM_TBL(0x02, 1, spra::operand_2b_4); // 0x9602
+const sal_uInt16 sprmTFCantSplit90 = SPRM_TBL(0x03, 0, spra::operand_1b_1); // 0x3403
+const sal_uInt16 sprmTTableHeader = SPRM_TBL(0x04, 0, spra::operand_1b_1); // 0x3404
+const sal_uInt16 sprmTTableBorders80 = SPRM_TBL(0x05, 1, spra::operand_varlen_6); // 0xD605
+const sal_uInt16 sprmTDyaRowHeight = SPRM_TBL(0x07, 0, spra::operand_2b_4); // 0x9407
+const sal_uInt16 sprmTDefTable = SPRM_TBL(0x08, 1, spra::operand_varlen_6); // 0xD608
+const sal_uInt16 sprmTDefTableShd80 = SPRM_TBL(0x09, 1, spra::operand_varlen_6); // 0xD609
+const sal_uInt16 sprmTTlp = SPRM_TBL(0x0A, 0, spra::operand_4b_3); // 0x740A
+const sal_uInt16 sprmTFBiDi = SPRM_TBL(0x0B, 1, spra::operand_2b_2); // 0x560B
+const sal_uInt16 sprmTDefTableShd3rd = SPRM_TBL(0x0C, 1, spra::operand_varlen_6); // 0xD60C
+const sal_uInt16 sprmTPc = SPRM_TBL(0x0D, 1, spra::operand_1b_1); // 0x360D
+const sal_uInt16 sprmTDxaAbs = SPRM_TBL(0x0E, 0, spra::operand_2b_4); // 0x940E
+const sal_uInt16 sprmTDyaAbs = SPRM_TBL(0x0F, 0, spra::operand_2b_4); // 0x940F
+const sal_uInt16 sprmTDxaFromText = SPRM_TBL(0x10, 0, spra::operand_2b_4); // 0x9410
+const sal_uInt16 sprmTDyaFromText = SPRM_TBL(0x11, 0, spra::operand_2b_4); // 0x9411
+const sal_uInt16 sprmTDefTableShd = SPRM_TBL(0x12, 1, spra::operand_varlen_6); // 0xD612
+const sal_uInt16 sprmTTableBorders = SPRM_TBL(0x13, 1, spra::operand_varlen_6); // 0xD613
+const sal_uInt16 sprmTTableWidth = SPRM_TBL(0x14, 1, spra::operand_3b_7); // 0xF614
+const sal_uInt16 sprmTFAutofit = SPRM_TBL(0x15, 1, spra::operand_1b_1); // 0x3615
+const sal_uInt16 sprmTDefTableShd2nd = SPRM_TBL(0x16, 1, spra::operand_varlen_6); // 0xD616
+const sal_uInt16 sprmTWidthBefore = SPRM_TBL(0x17, 1, spra::operand_3b_7); // 0xF617
+const sal_uInt16 sprmTWidthAfter = SPRM_TBL(0x18, 1, spra::operand_3b_7); // 0xF618
+const sal_uInt16 sprmTFKeepFollow = SPRM_TBL(0x19, 1, spra::operand_1b_1); // 0x3619
+const sal_uInt16 sprmTBrcTopCv = SPRM_TBL(0x1A, 1, spra::operand_varlen_6); // 0xD61A
+const sal_uInt16 sprmTBrcLeftCv = SPRM_TBL(0x1B, 1, spra::operand_varlen_6); // 0xD61B
+const sal_uInt16 sprmTBrcBottomCv = SPRM_TBL(0x1C, 1, spra::operand_varlen_6); // 0xD61C
+const sal_uInt16 sprmTBrcRightCv = SPRM_TBL(0x1D, 1, spra::operand_varlen_6); // 0xD61D
+const sal_uInt16 sprmTDxaFromTextRight = SPRM_TBL(0x1E, 0, spra::operand_2b_4); // 0x941E
+const sal_uInt16 sprmTDyaFromTextBottom = SPRM_TBL(0x1F, 0, spra::operand_2b_4); // 0x941F
+const sal_uInt16 sprmTSetBrc80 = SPRM_TBL(0x20, 1, spra::operand_varlen_6); // 0xD620
+const sal_uInt16 sprmTInsert = SPRM_TBL(0x21, 1, spra::operand_4b_3); // 0x7621
+const sal_uInt16 sprmTDelete = SPRM_TBL(0x22, 1, spra::operand_2b_2); // 0x5622
+const sal_uInt16 sprmTDxaCol = SPRM_TBL(0x23, 1, spra::operand_4b_3); // 0x7623
+const sal_uInt16 sprmTMerge = SPRM_TBL(0x24, 1, spra::operand_2b_2); // 0x5624
+const sal_uInt16 sprmTSplit = SPRM_TBL(0x25, 1, spra::operand_2b_2); // 0x5625
+const sal_uInt16 sprmTTextFlow = SPRM_TBL(0x29, 1, spra::operand_4b_3); // 0x7629
+const sal_uInt16 sprmTVertMerge = SPRM_TBL(0x2B, 1, spra::operand_varlen_6); // 0xD62B
+const sal_uInt16 sprmTVertAlign = SPRM_TBL(0x2C, 1, spra::operand_varlen_6); // 0xD62C
+const sal_uInt16 sprmTSetShd = SPRM_TBL(0x2D, 1, spra::operand_varlen_6); // 0xD62D
+const sal_uInt16 sprmTSetShdOdd = SPRM_TBL(0x2E, 1, spra::operand_varlen_6); // 0xD62E
+const sal_uInt16 sprmTSetBrc = SPRM_TBL(0x2F, 1, spra::operand_varlen_6); // 0xD62F
+const sal_uInt16 sprmTCellPadding = SPRM_TBL(0x32, 1, spra::operand_varlen_6); // 0xD632
+const sal_uInt16 sprmTCellSpacingDefault = SPRM_TBL(0x33, 1, spra::operand_varlen_6); // 0xD633
+const sal_uInt16 sprmTCellPaddingDefault = SPRM_TBL(0x34, 1, spra::operand_varlen_6); // 0xD634
+const sal_uInt16 sprmTCellWidth = SPRM_TBL(0x35, 1, spra::operand_varlen_6); // 0xD635
+const sal_uInt16 sprmTFitText = SPRM_TBL(0x36, 1, spra::operand_3b_7); // 0xF636
+const sal_uInt16 sprmTFCellNoWrap = SPRM_TBL(0x39, 1, spra::operand_varlen_6); // 0xD639
+const sal_uInt16 sprmTIstd = SPRM_TBL(0x3A, 1, spra::operand_2b_2); // 0x563A
+const sal_uInt16 sprmTCellPaddingStyle = SPRM_TBL(0x3E, 1, spra::operand_varlen_6); // 0xD63E
+const sal_uInt16 sprmTCellFHideMark = SPRM_TBL(0x42, 1, spra::operand_varlen_6); // 0xD642
+const sal_uInt16 sprmTSetShdTable = SPRM_TBL(0x60, 1, spra::operand_varlen_6); // 0xD660
+const sal_uInt16 sprmTWidthIndent = SPRM_TBL(0x61, 1, spra::operand_3b_7); // 0xF661
+const sal_uInt16 sprmTCellBrcType = SPRM_TBL(0x62, 1, spra::operand_varlen_6); // 0xD662
+const sal_uInt16 sprmTFBiDi90 = SPRM_TBL(0x64, 1, spra::operand_2b_2); // 0x5664
+const sal_uInt16 sprmTFNoAllowOverlap = SPRM_TBL(0x65, 0, spra::operand_1b_1); // 0x3465
+const sal_uInt16 sprmTFCantSplit = SPRM_TBL(0x66, 0, spra::operand_1b_1); // 0x3466
+const sal_uInt16 sprmTPropRMark = SPRM_TBL(0x67, 1, spra::operand_varlen_6); // 0xD667
+const sal_uInt16 sprmTWall = SPRM_TBL(0x68, 1, spra::operand_1b_1); // 0x3668
+const sal_uInt16 sprmTIpgp = SPRM_TBL(0x69, 0, spra::operand_4b_3); // 0x7469
+const sal_uInt16 sprmTCnf = SPRM_TBL(0x6A, 1, spra::operand_varlen_6); // 0xD66A
+const sal_uInt16 sprmTDefTableShdRaw = SPRM_TBL(0x70, 1, spra::operand_varlen_6); // 0xD670
+const sal_uInt16 sprmTDefTableShdRaw2nd = SPRM_TBL(0x71, 1, spra::operand_varlen_6); // 0xD671
+const sal_uInt16 sprmTDefTableShdRaw3rd = SPRM_TBL(0x72, 1, spra::operand_varlen_6); // 0xD672
+const sal_uInt16 sprmTRsid = SPRM_TBL(0x79, 0, spra::operand_4b_3); // 0x7479
+const sal_uInt16 sprmTCellVertAlignStyle = SPRM_TBL(0x7C, 0, spra::operand_1b_1); // 0x347C
+const sal_uInt16 sprmTCellNoWrapStyle = SPRM_TBL(0x7D, 0, spra::operand_1b_1); // 0x347D
+const sal_uInt16 sprmTCellBrcTopStyle = SPRM_TBL(0x7F, 0, spra::operand_varlen_6); // 0xD47F
+const sal_uInt16 sprmTCellBrcBottomStyle = SPRM_TBL(0x80, 1, spra::operand_varlen_6); // 0xD680
+const sal_uInt16 sprmTCellBrcLeftStyle = SPRM_TBL(0x81, 1, spra::operand_varlen_6); // 0xD681
+const sal_uInt16 sprmTCellBrcRightStyle = SPRM_TBL(0x82, 1, spra::operand_varlen_6); // 0xD682
 const sal_uInt16 sprmTCellBrcInsideHStyle = SPRM_TBL(0x83, 1, spra::operand_varlen_6); // 0xD683
 const sal_uInt16 sprmTCellBrcInsideVStyle = SPRM_TBL(0x84, 1, spra::operand_varlen_6); // 0xD684
-const sal_uInt16 sprmTCellBrcTL2BRStyle   = SPRM_TBL(0x85, 1, spra::operand_varlen_6); // 0xD685
-const sal_uInt16 sprmTCellBrcTR2BLStyle   = SPRM_TBL(0x86, 1, spra::operand_varlen_6); // 0xD686
-const sal_uInt16 sprmTCellShdStyle        = SPRM_TBL(0x87, 1, spra::operand_varlen_6); // 0xD687
-const sal_uInt16 sprmTCHorzBands          = SPRM_TBL(0x88, 0, spra::operand_1b_1);     // 0x3488
-const sal_uInt16 sprmTCVertBands          = SPRM_TBL(0x89, 0, spra::operand_1b_1);     // 0x3489
-const sal_uInt16 sprmTJc                  = SPRM_TBL(0x8A, 0, spra::operand_2b_2);     // 0x548A
+const sal_uInt16 sprmTCellBrcTL2BRStyle = SPRM_TBL(0x85, 1, spra::operand_varlen_6); // 0xD685
+const sal_uInt16 sprmTCellBrcTR2BLStyle = SPRM_TBL(0x86, 1, spra::operand_varlen_6); // 0xD686
+const sal_uInt16 sprmTCellShdStyle = SPRM_TBL(0x87, 1, spra::operand_varlen_6); // 0xD687
+const sal_uInt16 sprmTCHorzBands = SPRM_TBL(0x88, 0, spra::operand_1b_1); // 0x3488
+const sal_uInt16 sprmTCVertBands = SPRM_TBL(0x89, 0, spra::operand_1b_1); // 0x3489
+const sal_uInt16 sprmTJc = SPRM_TBL(0x8A, 0, spra::operand_2b_2); // 0x548A
 
 // [MS-DOC] - v20170112 Section 2.6.4
-const sal_uInt16 sprmScnsPgn        = SPRM_SEC(0x00, 0, spra::operand_1b_1);     // 0x3000
-const sal_uInt16 sprmSiHeadingPgn   = SPRM_SEC(0x01, 0, spra::operand_1b_1);     // 0x3001
-const sal_uInt16 sprmSDxaColWidth   = SPRM_SEC(0x03, 1, spra::operand_3b_7);     // 0xF203
-const sal_uInt16 sprmSDxaColSpacing = SPRM_SEC(0x04, 1, spra::operand_3b_7);     // 0xF204
-const sal_uInt16 sprmSFEvenlySpaced = SPRM_SEC(0x05, 0, spra::operand_1b_1);     // 0x3005
-const sal_uInt16 sprmSFProtected    = SPRM_SEC(0x06, 0, spra::operand_1b_1);     // 0x3006
-const sal_uInt16 sprmSDmBinFirst    = SPRM_SEC(0x07, 0, spra::operand_2b_2);     // 0x5007
-const sal_uInt16 sprmSDmBinOther    = SPRM_SEC(0x08, 0, spra::operand_2b_2);     // 0x5008
-const sal_uInt16 sprmSBkc           = SPRM_SEC(0x09, 0, spra::operand_1b_1);     // 0x3009
-const sal_uInt16 sprmSFTitlePage    = SPRM_SEC(0x0A, 0, spra::operand_1b_1);     // 0x300A
-const sal_uInt16 sprmSCcolumns      = SPRM_SEC(0x0B, 0, spra::operand_2b_2);     // 0x500B
-const sal_uInt16 sprmSDxaColumns    = SPRM_SEC(0x0C, 0, spra::operand_2b_4);     // 0x900C
-const sal_uInt16 sprmSNfcPgn        = SPRM_SEC(0x0E, 0, spra::operand_1b_1);     // 0x300E
-const sal_uInt16 sprmSFPgnRestart   = SPRM_SEC(0x11, 0, spra::operand_1b_1);     // 0x3011
-const sal_uInt16 sprmSFEndnote      = SPRM_SEC(0x12, 0, spra::operand_1b_1);     // 0x3012
-const sal_uInt16 sprmSLnc           = SPRM_SEC(0x13, 0, spra::operand_1b_1);     // 0x3013
-const sal_uInt16 sprmSNLnnMod       = SPRM_SEC(0x15, 0, spra::operand_2b_2);     // 0x5015
-const sal_uInt16 sprmSDxaLnn        = SPRM_SEC(0x16, 0, spra::operand_2b_4);     // 0x9016
-const sal_uInt16 sprmSDyaHdrTop     = SPRM_SEC(0x17, 0, spra::operand_2b_5);     // 0xB017
-const sal_uInt16 sprmSDyaHdrBottom  = SPRM_SEC(0x18, 0, spra::operand_2b_5);     // 0xB018
-const sal_uInt16 sprmSLBetween      = SPRM_SEC(0x19, 0, spra::operand_1b_1);     // 0x3019
-const sal_uInt16 sprmSVjc           = SPRM_SEC(0x1A, 0, spra::operand_1b_1);     // 0x301A
-const sal_uInt16 sprmSLnnMin        = SPRM_SEC(0x1B, 0, spra::operand_2b_2);     // 0x501B
-const sal_uInt16 sprmSPgnStart97    = SPRM_SEC(0x1C, 0, spra::operand_2b_2);     // 0x501C
-const sal_uInt16 sprmSBOrientation  = SPRM_SEC(0x1D, 0, spra::operand_1b_1);     // 0x301D
-const sal_uInt16 sprmSXaPage        = SPRM_SEC(0x1F, 0, spra::operand_2b_5);     // 0xB01F
-const sal_uInt16 sprmSYaPage        = SPRM_SEC(0x20, 0, spra::operand_2b_5);     // 0xB020
-const sal_uInt16 sprmSDxaLeft       = SPRM_SEC(0x21, 0, spra::operand_2b_5);     // 0xB021
-const sal_uInt16 sprmSDxaRight      = SPRM_SEC(0x22, 0, spra::operand_2b_5);     // 0xB022
-const sal_uInt16 sprmSDyaTop        = SPRM_SEC(0x23, 0, spra::operand_2b_4);     // 0x9023
-const sal_uInt16 sprmSDyaBottom     = SPRM_SEC(0x24, 0, spra::operand_2b_4);     // 0x9024
-const sal_uInt16 sprmSDzaGutter     = SPRM_SEC(0x25, 0, spra::operand_2b_5);     // 0xB025
-const sal_uInt16 sprmSDmPaperReq    = SPRM_SEC(0x26, 0, spra::operand_2b_2);     // 0x5026
-const sal_uInt16 sprmSFBiDi         = SPRM_SEC(0x28, 1, spra::operand_1b_1);     // 0x3228
-const sal_uInt16 sprmSFRTLGutter    = SPRM_SEC(0x2A, 1, spra::operand_1b_1);     // 0x322A
-const sal_uInt16 sprmSBrcTop80      = SPRM_SEC(0x2B, 0, spra::operand_4b_3);     // 0x702B
-const sal_uInt16 sprmSBrcLeft80     = SPRM_SEC(0x2C, 0, spra::operand_4b_3);     // 0x702C
-const sal_uInt16 sprmSBrcBottom80   = SPRM_SEC(0x2D, 0, spra::operand_4b_3);     // 0x702D
-const sal_uInt16 sprmSBrcRight80    = SPRM_SEC(0x2E, 0, spra::operand_4b_3);     // 0x702E
-const sal_uInt16 sprmSPgbProp       = SPRM_SEC(0x2F, 1, spra::operand_2b_2);     // 0x522F
-const sal_uInt16 sprmSDxtCharSpace  = SPRM_SEC(0x30, 0, spra::operand_4b_3);     // 0x7030
-const sal_uInt16 sprmSDyaLinePitch  = SPRM_SEC(0x31, 0, spra::operand_2b_4);     // 0x9031
-const sal_uInt16 sprmSClm           = SPRM_SEC(0x32, 0, spra::operand_2b_2);     // 0x5032
-const sal_uInt16 sprmSTextFlow      = SPRM_SEC(0x33, 0, spra::operand_2b_2);     // 0x5033
-const sal_uInt16 sprmSBrcTop        = SPRM_SEC(0x34, 1, spra::operand_varlen_6); // 0xD234
-const sal_uInt16 sprmSBrcLeft       = SPRM_SEC(0x35, 1, spra::operand_varlen_6); // 0xD235
-const sal_uInt16 sprmSBrcBottom     = SPRM_SEC(0x36, 1, spra::operand_varlen_6); // 0xD236
-const sal_uInt16 sprmSBrcRight      = SPRM_SEC(0x37, 1, spra::operand_varlen_6); // 0xD237
-const sal_uInt16 sprmSWall          = SPRM_SEC(0x39, 1, spra::operand_1b_1);     // 0x3239
-const sal_uInt16 sprmSRsid          = SPRM_SEC(0x3A, 0, spra::operand_4b_3);     // 0x703A
-const sal_uInt16 sprmSFpc           = SPRM_SEC(0x3B, 0, spra::operand_1b_1);     // 0x303B
-const sal_uInt16 sprmSRncFtn        = SPRM_SEC(0x3C, 0, spra::operand_1b_1);     // 0x303C
-const sal_uInt16 sprmSRncEdn        = SPRM_SEC(0x3E, 0, spra::operand_1b_1);     // 0x303E
-const sal_uInt16 sprmSNFtn          = SPRM_SEC(0x3F, 0, spra::operand_2b_2);     // 0x503F
-const sal_uInt16 sprmSNfcFtnRef     = SPRM_SEC(0x40, 0, spra::operand_2b_2);     // 0x5040
-const sal_uInt16 sprmSNEdn          = SPRM_SEC(0x41, 0, spra::operand_2b_2);     // 0x5041
-const sal_uInt16 sprmSNfcEdnRef     = SPRM_SEC(0x42, 0, spra::operand_2b_2);     // 0x5042
-const sal_uInt16 sprmSPropRMark     = SPRM_SEC(0x43, 1, spra::operand_varlen_6); // 0xD243
-const sal_uInt16 sprmSPgnStart      = SPRM_SEC(0x44, 0, spra::operand_4b_3);     // 0x7044
+const sal_uInt16 sprmScnsPgn = SPRM_SEC(0x00, 0, spra::operand_1b_1); // 0x3000
+const sal_uInt16 sprmSiHeadingPgn = SPRM_SEC(0x01, 0, spra::operand_1b_1); // 0x3001
+const sal_uInt16 sprmSDxaColWidth = SPRM_SEC(0x03, 1, spra::operand_3b_7); // 0xF203
+const sal_uInt16 sprmSDxaColSpacing = SPRM_SEC(0x04, 1, spra::operand_3b_7); // 0xF204
+const sal_uInt16 sprmSFEvenlySpaced = SPRM_SEC(0x05, 0, spra::operand_1b_1); // 0x3005
+const sal_uInt16 sprmSFProtected = SPRM_SEC(0x06, 0, spra::operand_1b_1); // 0x3006
+const sal_uInt16 sprmSDmBinFirst = SPRM_SEC(0x07, 0, spra::operand_2b_2); // 0x5007
+const sal_uInt16 sprmSDmBinOther = SPRM_SEC(0x08, 0, spra::operand_2b_2); // 0x5008
+const sal_uInt16 sprmSBkc = SPRM_SEC(0x09, 0, spra::operand_1b_1); // 0x3009
+const sal_uInt16 sprmSFTitlePage = SPRM_SEC(0x0A, 0, spra::operand_1b_1); // 0x300A
+const sal_uInt16 sprmSCcolumns = SPRM_SEC(0x0B, 0, spra::operand_2b_2); // 0x500B
+const sal_uInt16 sprmSDxaColumns = SPRM_SEC(0x0C, 0, spra::operand_2b_4); // 0x900C
+const sal_uInt16 sprmSNfcPgn = SPRM_SEC(0x0E, 0, spra::operand_1b_1); // 0x300E
+const sal_uInt16 sprmSFPgnRestart = SPRM_SEC(0x11, 0, spra::operand_1b_1); // 0x3011
+const sal_uInt16 sprmSFEndnote = SPRM_SEC(0x12, 0, spra::operand_1b_1); // 0x3012
+const sal_uInt16 sprmSLnc = SPRM_SEC(0x13, 0, spra::operand_1b_1); // 0x3013
+const sal_uInt16 sprmSNLnnMod = SPRM_SEC(0x15, 0, spra::operand_2b_2); // 0x5015
+const sal_uInt16 sprmSDxaLnn = SPRM_SEC(0x16, 0, spra::operand_2b_4); // 0x9016
+const sal_uInt16 sprmSDyaHdrTop = SPRM_SEC(0x17, 0, spra::operand_2b_5); // 0xB017
+const sal_uInt16 sprmSDyaHdrBottom = SPRM_SEC(0x18, 0, spra::operand_2b_5); // 0xB018
+const sal_uInt16 sprmSLBetween = SPRM_SEC(0x19, 0, spra::operand_1b_1); // 0x3019
+const sal_uInt16 sprmSVjc = SPRM_SEC(0x1A, 0, spra::operand_1b_1); // 0x301A
+const sal_uInt16 sprmSLnnMin = SPRM_SEC(0x1B, 0, spra::operand_2b_2); // 0x501B
+const sal_uInt16 sprmSPgnStart97 = SPRM_SEC(0x1C, 0, spra::operand_2b_2); // 0x501C
+const sal_uInt16 sprmSBOrientation = SPRM_SEC(0x1D, 0, spra::operand_1b_1); // 0x301D
+const sal_uInt16 sprmSXaPage = SPRM_SEC(0x1F, 0, spra::operand_2b_5); // 0xB01F
+const sal_uInt16 sprmSYaPage = SPRM_SEC(0x20, 0, spra::operand_2b_5); // 0xB020
+const sal_uInt16 sprmSDxaLeft = SPRM_SEC(0x21, 0, spra::operand_2b_5); // 0xB021
+const sal_uInt16 sprmSDxaRight = SPRM_SEC(0x22, 0, spra::operand_2b_5); // 0xB022
+const sal_uInt16 sprmSDyaTop = SPRM_SEC(0x23, 0, spra::operand_2b_4); // 0x9023
+const sal_uInt16 sprmSDyaBottom = SPRM_SEC(0x24, 0, spra::operand_2b_4); // 0x9024
+const sal_uInt16 sprmSDzaGutter = SPRM_SEC(0x25, 0, spra::operand_2b_5); // 0xB025
+const sal_uInt16 sprmSDmPaperReq = SPRM_SEC(0x26, 0, spra::operand_2b_2); // 0x5026
+const sal_uInt16 sprmSFBiDi = SPRM_SEC(0x28, 1, spra::operand_1b_1); // 0x3228
+const sal_uInt16 sprmSFRTLGutter = SPRM_SEC(0x2A, 1, spra::operand_1b_1); // 0x322A
+const sal_uInt16 sprmSBrcTop80 = SPRM_SEC(0x2B, 0, spra::operand_4b_3); // 0x702B
+const sal_uInt16 sprmSBrcLeft80 = SPRM_SEC(0x2C, 0, spra::operand_4b_3); // 0x702C
+const sal_uInt16 sprmSBrcBottom80 = SPRM_SEC(0x2D, 0, spra::operand_4b_3); // 0x702D
+const sal_uInt16 sprmSBrcRight80 = SPRM_SEC(0x2E, 0, spra::operand_4b_3); // 0x702E
+const sal_uInt16 sprmSPgbProp = SPRM_SEC(0x2F, 1, spra::operand_2b_2); // 0x522F
+const sal_uInt16 sprmSDxtCharSpace = SPRM_SEC(0x30, 0, spra::operand_4b_3); // 0x7030
+const sal_uInt16 sprmSDyaLinePitch = SPRM_SEC(0x31, 0, spra::operand_2b_4); // 0x9031
+const sal_uInt16 sprmSClm = SPRM_SEC(0x32, 0, spra::operand_2b_2); // 0x5032
+const sal_uInt16 sprmSTextFlow = SPRM_SEC(0x33, 0, spra::operand_2b_2); // 0x5033
+const sal_uInt16 sprmSBrcTop = SPRM_SEC(0x34, 1, spra::operand_varlen_6); // 0xD234
+const sal_uInt16 sprmSBrcLeft = SPRM_SEC(0x35, 1, spra::operand_varlen_6); // 0xD235
+const sal_uInt16 sprmSBrcBottom = SPRM_SEC(0x36, 1, spra::operand_varlen_6); // 0xD236
+const sal_uInt16 sprmSBrcRight = SPRM_SEC(0x37, 1, spra::operand_varlen_6); // 0xD237
+const sal_uInt16 sprmSWall = SPRM_SEC(0x39, 1, spra::operand_1b_1); // 0x3239
+const sal_uInt16 sprmSRsid = SPRM_SEC(0x3A, 0, spra::operand_4b_3); // 0x703A
+const sal_uInt16 sprmSFpc = SPRM_SEC(0x3B, 0, spra::operand_1b_1); // 0x303B
+const sal_uInt16 sprmSRncFtn = SPRM_SEC(0x3C, 0, spra::operand_1b_1); // 0x303C
+const sal_uInt16 sprmSRncEdn = SPRM_SEC(0x3E, 0, spra::operand_1b_1); // 0x303E
+const sal_uInt16 sprmSNFtn = SPRM_SEC(0x3F, 0, spra::operand_2b_2); // 0x503F
+const sal_uInt16 sprmSNfcFtnRef = SPRM_SEC(0x40, 0, spra::operand_2b_2); // 0x5040
+const sal_uInt16 sprmSNEdn = SPRM_SEC(0x41, 0, spra::operand_2b_2); // 0x5041
+const sal_uInt16 sprmSNfcEdnRef = SPRM_SEC(0x42, 0, spra::operand_2b_2); // 0x5042
+const sal_uInt16 sprmSPropRMark = SPRM_SEC(0x43, 1, spra::operand_varlen_6); // 0xD243
+const sal_uInt16 sprmSPgnStart = SPRM_SEC(0x44, 0, spra::operand_4b_3); // 0x7044
 
 // [MS-DOC] - v20170112 Section 2.6.5
-const sal_uInt16 sprmPicBrcTop80    = SPRM_PIC(0x02, 0, spra::operand_4b_3);     // 0x6C02
-const sal_uInt16 sprmPicBrcLeft80   = SPRM_PIC(0x03, 0, spra::operand_4b_3);     // 0x6C03
-const sal_uInt16 sprmPicBrcBottom80 = SPRM_PIC(0x04, 0, spra::operand_4b_3);     // 0x6C04
-const sal_uInt16 sprmPicBrcRight80  = SPRM_PIC(0x05, 0, spra::operand_4b_3);     // 0x6C05
-const sal_uInt16 sprmPicBrcTop      = SPRM_PIC(0x08, 1, spra::operand_varlen_6); // 0xCE08
-const sal_uInt16 sprmPicBrcLeft     = SPRM_PIC(0x09, 1, spra::operand_varlen_6); // 0xCE09
-const sal_uInt16 sprmPicBrcBottom   = SPRM_PIC(0x0A, 1, spra::operand_varlen_6); // 0xCE0A
-const sal_uInt16 sprmPicBrcRight    = SPRM_PIC(0x0B, 1, spra::operand_varlen_6); // 0xCE0B
+const sal_uInt16 sprmPicBrcTop80 = SPRM_PIC(0x02, 0, spra::operand_4b_3); // 0x6C02
+const sal_uInt16 sprmPicBrcLeft80 = SPRM_PIC(0x03, 0, spra::operand_4b_3); // 0x6C03
+const sal_uInt16 sprmPicBrcBottom80 = SPRM_PIC(0x04, 0, spra::operand_4b_3); // 0x6C04
+const sal_uInt16 sprmPicBrcRight80 = SPRM_PIC(0x05, 0, spra::operand_4b_3); // 0x6C05
+const sal_uInt16 sprmPicBrcTop = SPRM_PIC(0x08, 1, spra::operand_varlen_6); // 0xCE08
+const sal_uInt16 sprmPicBrcLeft = SPRM_PIC(0x09, 1, spra::operand_varlen_6); // 0xCE09
+const sal_uInt16 sprmPicBrcBottom = SPRM_PIC(0x0A, 1, spra::operand_varlen_6); // 0xCE0A
+const sal_uInt16 sprmPicBrcRight = SPRM_PIC(0x0B, 1, spra::operand_varlen_6); // 0xCE0B
 }
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx
index e94a85b121f0..c7e2978afe4d 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.cxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx
@@ -18,11 +18,11 @@
 
 namespace sw::sidebarwindows
 {
-
-SidebarScrollBar::SidebarScrollBar(sw::annotation::SwAnnotationWin& rSidebarWin, WinBits nStyle, SwView& rView)
-    : ScrollBar(&rSidebarWin, nStyle),
-      m_rSidebarWin(rSidebarWin),
-      m_rView(rView)
+SidebarScrollBar::SidebarScrollBar(sw::annotation::SwAnnotationWin& rSidebarWin, WinBits nStyle,
+                                   SwView& rView)
+    : ScrollBar(&rSidebarWin, nStyle)
+    , m_rSidebarWin(rSidebarWin)
+    , m_rView(rView)
 {
 }
 
@@ -45,7 +45,8 @@ void SidebarScrollBar::LogicInvalidate(const tools::Rectangle* pRectangle)
 
     // Convert from relative twips to absolute ones.
     vcl::Window& rParent = m_rSidebarWin.EditWin();
-    Point aOffset(GetOutOffXPixel() - rParent.GetOutOffXPixel(), GetOutOffYPixel() - rParent.GetOutOffYPixel());
+    Point aOffset(GetOutOffXPixel() - rParent.GetOutOffXPixel(),
+                  GetOutOffYPixel() - rParent.GetOutOffYPixel());
     rParent.Push(PushFlags::MAPMODE);
     rParent.EnableMapMode();
     aOffset = rParent.PixelToLogic(aOffset);
@@ -57,10 +58,7 @@ void SidebarScrollBar::LogicInvalidate(const tools::Rectangle* pRectangle)
     SfxLokHelper::notifyInvalidation(rWrtShell.GetSfxViewShell(), sRectangle);
 }
 
-void SidebarScrollBar::MouseButtonUp(const MouseEvent& /*rMouseEvent*/)
-{
-    EndTracking();
-}
+void SidebarScrollBar::MouseButtonUp(const MouseEvent& /*rMouseEvent*/) { EndTracking(); }
 
 void SidebarScrollBar::MouseMove(const MouseEvent& rMouseEvent)
 {
@@ -68,10 +66,7 @@ void SidebarScrollBar::MouseMove(const MouseEvent& rMouseEvent)
     Tracking(aEvent);
 }
 
-SidebarScrollBar::~SidebarScrollBar()
-{
-    disposeOnce();
-}
+SidebarScrollBar::~SidebarScrollBar() { disposeOnce(); }
 
 } // end of namespace sw::sidebarwindows
 
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.hxx b/sw/source/uibase/docvw/SidebarScrollBar.hxx
index 355bd16371eb..2fb1a90de8e1 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.hxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.hxx
@@ -26,7 +26,6 @@ namespace sw
 {
 namespace sidebarwindows
 {
-
 /// Similar to the VCL scrollbar, but instrumented with Writer-specific details for LOK.
 class SidebarScrollBar : public ScrollBar
 {
@@ -38,11 +37,11 @@ protected:
     void LogicInvalidate(const tools::Rectangle* pRectangle) override;
     void MouseMove(const MouseEvent& rMouseEvent) override;
     void MouseButtonUp(const MouseEvent& rMouseEvent) override;
+
 public:
     SidebarScrollBar(sw::annotation::SwAnnotationWin& rSidebarWin, WinBits nStyle, SwView& rView);
     ~SidebarScrollBar() override;
 };
-
 }
 }
 
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 61ad532fdd6b..a051d69831cd 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -24,12 +24,10 @@ enum class SignatureMethodAlgorithm;
 
 namespace xmlsecurity
 {
-
 /// Extension of css::security::XCertificate for module-internal purposes.
 class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI Certificate
 {
 public:
-
     /// Returns the SHA-256 thumbprint.
     ///
     /// @throws css::uno::RuntimeException
@@ -41,7 +39,6 @@ public:
 protected:
     ~Certificate() noexcept = default;
 };
-
 }
 
 #endif // INCLUDED_XMLSECURITY_INC_CERTIFICATE_H
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 6f5f0f6a93b7..fe4d0df89a5d 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -86,25 +86,19 @@ public:
 
 bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName)
 {
-    static const std::initializer_list<OUStringLiteral> vBlacklist =
-    {
-        "/%5BContent_Types%5D.xml",
-        "/docProps/app.xml",
-        "/docProps/core.xml",
-        // Don't attempt to sign other signatures for now.
-        "/_xmlsignatures"
-    };
+    static const std::initializer_list<OUStringLiteral> vBlacklist
+        = { "/%5BContent_Types%5D.xml", "/docProps/app.xml", "/docProps/core.xml",
+            // Don't attempt to sign other signatures for now.
+            "/_xmlsignatures" };
     // Just check the prefix, as we don't care about the content type part of the stream name.
-    return std::any_of(vBlacklist.begin(), vBlacklist.end(), [&](const OUStringLiteral& rLiteral)
-    {
+    return std::any_of(vBlacklist.begin(), vBlacklist.end(), [&](const OUStringLiteral& rLiteral) {
         return rStreamName.startsWith(rLiteral);
     });
 }
 
 bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationName)
 {
-    static const std::initializer_list<OUStringLiteral> vBlacklist =
-    {
+    static const std::initializer_list<OUStringLiteral> vBlacklist = {
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties",
         "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
         "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
@@ -114,7 +108,8 @@ bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationN
 
 void OOXMLSecExporter::Impl::writeSignedInfo()
 {
-    m_xDocumentHandler->startElement("SignedInfo", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignedInfo", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
 
     writeCanonicalizationMethod();
     writeSignatureMethod();
@@ -127,18 +122,18 @@ void OOXMLSecExporter::Impl::writeCanonicalizationMethod()
 {
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("Algorithm", ALGO_C14N);
-    m_xDocumentHandler->startElement("CanonicalizationMethod", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "CanonicalizationMethod", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     m_xDocumentHandler->endElement("CanonicalizationMethod");
-
 }
 
 void OOXMLSecExporter::Impl::writeCanonicalizationTransform()
 {
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("Algorithm", ALGO_C14N);
-    m_xDocumentHandler->startElement("Transform", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "Transform", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     m_xDocumentHandler->endElement("Transform");
-
 }
 
 void OOXMLSecExporter::Impl::writeSignatureMethod()
@@ -150,7 +145,8 @@ void OOXMLSecExporter::Impl::writeSignatureMethod()
     else
         pAttributeList->AddAttribute("Algorithm", ALGO_RSASHA256);
 
-    m_xDocumentHandler->startElement("SignatureMethod", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "SignatureMethod", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     m_xDocumentHandler->endElement("SignatureMethod");
 }
 
@@ -164,21 +160,27 @@ void OOXMLSecExporter::Impl::writeSignedInfoReferences()
             {
                 rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
                 if (rReference.ouURI != "idSignedProperties")
-                    pAttributeList->AddAttribute("Type", "http://www.w3.org/2000/09/xmldsig#Object");
+                    pAttributeList->AddAttribute("Type",
+                                                 "http://www.w3.org/2000/09/xmldsig#Object");
                 else
-                    pAttributeList->AddAttribute("Type", "http://uri.etsi.org/01903#SignedProperties");
+                    pAttributeList->AddAttribute("Type",
+                                                 "http://uri.etsi.org/01903#SignedProperties");
                 pAttributeList->AddAttribute("URI", "#" + rReference.ouURI);
-                m_xDocumentHandler->startElement("Reference", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+                m_xDocumentHandler->startElement(
+                    "Reference", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
             }
             if (rReference.ouURI == "idSignedProperties")
             {
-                m_xDocumentHandler->startElement("Transforms", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+                m_xDocumentHandler->startElement(
+                    "Transforms",
+                    uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
                 writeCanonicalizationTransform();
                 m_xDocumentHandler->endElement("Transforms");
             }
 
             DocumentSignatureHelper::writeDigestMethod(m_xDocumentHandler);
-            m_xDocumentHandler->startElement("DigestValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+            m_xDocumentHandler->startElement(
+                "DigestValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
             m_xDocumentHandler->characters(rReference.ouDigestValue);
             m_xDocumentHandler->endElement("DigestValue");
             m_xDocumentHandler->endElement("Reference");
@@ -188,16 +190,20 @@ void OOXMLSecExporter::Impl::writeSignedInfoReferences()
 
 void OOXMLSecExporter::Impl::writeSignatureValue()
 {
-    m_xDocumentHandler->startElement("SignatureValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters(m_rInformation.ouSignatureValue);
     m_xDocumentHandler->endElement("SignatureValue");
 }
 
 void OOXMLSecExporter::Impl::writeKeyInfo()
 {
-    m_xDocumentHandler->startElement("KeyInfo", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
-    m_xDocumentHandler->startElement("X509Data", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
-    m_xDocumentHandler->startElement("X509Certificate", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "KeyInfo", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "X509Data", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "X509Certificate", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters(m_rInformation.ouX509Certificate);
     m_xDocumentHandler->endElement("X509Certificate");
     m_xDocumentHandler->endElement("X509Data");
@@ -208,7 +214,8 @@ void OOXMLSecExporter::Impl::writePackageObject()
 {
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("Id", "idPackageObject");
-    m_xDocumentHandler->startElement("Object", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "Object", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
 
     writeManifest();
     writePackageObjectSignatureProperties();
@@ -218,7 +225,8 @@ void OOXMLSecExporter::Impl::writePackageObject()
 
 void OOXMLSecExporter::Impl::writeManifest()
 {
-    m_xDocumentHandler->startElement("Manifest", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "Manifest", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     const SignatureReferenceInformations& rReferences = m_rInformation.vSignatureReferenceInfors;
     for (const SignatureReferenceInformation& rReference : rReferences)
     {
@@ -235,15 +243,22 @@ void OOXMLSecExporter::Impl::writeManifest()
 
 void OOXMLSecExporter::Impl::writeRelationshipTransform(const OUString& rURI)
 {
-    uno::Reference<embed::XHierarchicalStorageAccess> xHierarchicalStorageAccess(m_xRootStorage, uno::UNO_QUERY);
-    uno::Reference<io::XInputStream> xRelStream(xHierarchicalStorageAccess->openStreamElementByHierarchicalName(rURI, embed::ElementModes::READ), uno::UNO_QUERY);
+    uno::Reference<embed::XHierarchicalStorageAccess> xHierarchicalStorageAccess(m_xRootStorage,
+                                                                                 uno::UNO_QUERY);
+    uno::Reference<io::XInputStream> xRelStream(
+        xHierarchicalStorageAccess->openStreamElementByHierarchicalName(rURI,
+                                                                        embed::ElementModes::READ),
+        uno::UNO_QUERY);
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("Algorithm", ALGO_RELATIONSHIP);
-        m_xDocumentHandler->startElement("Transform", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "Transform", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
 
-    const uno::Sequence< uno::Sequence<beans::StringPair> > aRelationsInfo = comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, rURI, m_xComponentContext);
+    const uno::Sequence<uno::Sequence<beans::StringPair>> aRelationsInfo
+        = comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, rURI,
+                                                               m_xComponentContext);
     for (const uno::Sequence<beans::StringPair>& rPairs : aRelationsInfo)
     {
         OUString aId;
@@ -262,7 +277,9 @@ void OOXMLSecExporter::Impl::writeRelationshipTransform(const OUString& rURI)
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("xmlns:mdssi", NS_MDSSI);
         pAttributeList->AddAttribute("SourceId", aId);
-        m_xDocumentHandler->startElement("mdssi:RelationshipReference", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "mdssi:RelationshipReference",
+            uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
         m_xDocumentHandler->endElement("mdssi:RelationshipReference");
     }
 
@@ -271,23 +288,28 @@ void OOXMLSecExporter::Impl::writeRelationshipTransform(const OUString& rURI)
 
 void OOXMLSecExporter::Impl::writePackageObjectSignatureProperties()
 {
-    m_xDocumentHandler->startElement("SignatureProperties", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureProperties", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("Id", "idSignatureTime");
         pAttributeList->AddAttribute("Target", "#idPackageSignature");
-        m_xDocumentHandler->startElement("SignatureProperty", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "SignatureProperty", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("xmlns:mdssi", NS_MDSSI);
-        m_xDocumentHandler->startElement("mdssi:SignatureTime", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "mdssi:SignatureTime", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
-    m_xDocumentHandler->startElement("mdssi:Format", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "mdssi:Format", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("YYYY-MM-DDThh:mm:ssTZD");
     m_xDocumentHandler->endElement("mdssi:Format");
 
-    m_xDocumentHandler->startElement("mdssi:Value", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "mdssi:Value", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     if (!m_rInformation.ouDateTime.isEmpty())
         m_aSignatureTimeValue = m_rInformation.ouDateTime;
     else
@@ -313,10 +335,12 @@ void OOXMLSecExporter::Impl::writeManifestReference(const SignatureReferenceInfo
 {
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("URI", rReference.ouURI);
-    m_xDocumentHandler->startElement("Reference", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "Reference", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
 
     // Transforms
-    if (rReference.ouURI.endsWith("?ContentType=application/vnd.openxmlformats-package.relationships+xml"))
+    if (rReference.ouURI.endsWith(
+            "?ContentType=application/vnd.openxmlformats-package.relationships+xml"))
     {
         OUString aURI = rReference.ouURI;
         // Ignore leading slash.
@@ -327,7 +351,8 @@ void OOXMLSecExporter::Impl::writeManifestReference(const SignatureReferenceInfo
         if (nQueryPos != -1)
             aURI = aURI.copy(0, nQueryPos);
 
-        m_xDocumentHandler->startElement("Transforms", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+        m_xDocumentHandler->startElement(
+            "Transforms", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
 
         writeRelationshipTransform(aURI);
         writeCanonicalizationTransform();
@@ -336,7 +361,8 @@ void OOXMLSecExporter::Impl::writeManifestReference(const SignatureReferenceInfo
     }
 
     DocumentSignatureHelper::writeDigestMethod(m_xDocumentHandler);
-    m_xDocumentHandler->startElement("DigestValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "DigestValue", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters(rReference.ouDigestValue);
     m_xDocumentHandler->endElement("DigestValue");
     m_xDocumentHandler->endElement("Reference");
@@ -347,14 +373,17 @@ void OOXMLSecExporter::Impl::writeOfficeObject()
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("Id", "idOfficeObject");
-        m_xDocumentHandler->startElement("Object", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "Object", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
-    m_xDocumentHandler->startElement("SignatureProperties", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureProperties", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("Id", "idOfficeV1Details");
         pAttributeList->AddAttribute("Target", "#idPackageSignature");
-        m_xDocumentHandler->startElement("SignatureProperty", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "SignatureProperty", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
     writeSignatureInfo();
     m_xDocumentHandler->endElement("SignatureProperty");
@@ -366,49 +395,67 @@ void OOXMLSecExporter::Impl::writeSignatureInfo()
 {
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("xmlns", "http://schemas.microsoft.com/office/2006/digsig");
-    m_xDocumentHandler->startElement("SignatureInfoV1", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_xDocumentHandler->startElement(
+        "SignatureInfoV1", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
 
-    m_xDocumentHandler->startElement("SetupID", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SetupID", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters(m_rInformation.ouSignatureLineId);
     m_xDocumentHandler->endElement("SetupID");
-    m_xDocumentHandler->startElement("SignatureText", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureText", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->endElement("SignatureText");
-    m_xDocumentHandler->startElement("SignatureImage", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureImage", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->endElement("SignatureImage");
-    m_xDocumentHandler->startElement("SignatureComments", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureComments", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters(m_rInformation.ouDescription);
     m_xDocumentHandler->endElement("SignatureComments");
     // Just hardcode something valid according to [MS-OFFCRYPTO].
-    m_xDocumentHandler->startElement("WindowsVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "WindowsVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("6.1");
     m_xDocumentHandler->endElement("WindowsVersion");
-    m_xDocumentHandler->startElement("OfficeVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "OfficeVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("16.0");
     m_xDocumentHandler->endElement("OfficeVersion");
-    m_xDocumentHandler->startElement("ApplicationVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "ApplicationVersion", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("16.0");
     m_xDocumentHandler->endElement("ApplicationVersion");
-    m_xDocumentHandler->startElement("Monitors", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "Monitors", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("1");
     m_xDocumentHandler->endElement("Monitors");
-    m_xDocumentHandler->startElement("HorizontalResolution", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "HorizontalResolution", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("1280");
     m_xDocumentHandler->endElement("HorizontalResolution");
-    m_xDocumentHandler->startElement("VerticalResolution", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "VerticalResolution", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("800");
     m_xDocumentHandler->endElement("VerticalResolution");
-    m_xDocumentHandler->startElement("ColorDepth", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "ColorDepth", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("32");
     m_xDocumentHandler->endElement("ColorDepth");
-    m_xDocumentHandler->startElement("SignatureProviderId", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureProviderId", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("{00000000-0000-0000-0000-000000000000}");
     m_xDocumentHandler->endElement("SignatureProviderId");
-    m_xDocumentHandler->startElement("SignatureProviderUrl", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureProviderUrl", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->endElement("SignatureProviderUrl");
-    m_xDocumentHandler->startElement("SignatureProviderDetails", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
-    m_xDocumentHandler->characters("9"); // This is what MSO 2016 writes, though [MS-OFFCRYPTO] doesn't document what the value means.
+    m_xDocumentHandler->startElement(
+        "SignatureProviderDetails",
+        uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->characters(
+        "9"); // This is what MSO 2016 writes, though [MS-OFFCRYPTO] doesn't document what the value means.
     m_xDocumentHandler->endElement("SignatureProviderDetails");
-    m_xDocumentHandler->startElement("SignatureType", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "SignatureType", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     m_xDocumentHandler->characters("2");
     m_xDocumentHandler->endElement("SignatureType");
 
@@ -417,15 +464,19 @@ void OOXMLSecExporter::Impl::writeSignatureInfo()
 
 void OOXMLSecExporter::Impl::writePackageSignature()
 {
-    m_xDocumentHandler->startElement("Object", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
+    m_xDocumentHandler->startElement(
+        "Object", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
     {
         rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
         pAttributeList->AddAttribute("xmlns:xd", NS_XD);
         pAttributeList->AddAttribute("Target", "#idPackageSignature");
-        m_xDocumentHandler->startElement("xd:QualifyingProperties", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+        m_xDocumentHandler->startElement(
+            "xd:QualifyingProperties",
+            uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
     }
 
-    DocumentSignatureHelper::writeSignedProperties(m_xDocumentHandler, m_rInformation, m_aSignatureTimeValue, false);
+    DocumentSignatureHelper::writeSignedProperties(m_xDocumentHandler, m_rInformation,
+                                                   m_aSignatureTimeValue, false);
 
     m_xDocumentHandler->endElement("xd:QualifyingProperties");
     m_xDocumentHandler->endElement("Object");
@@ -461,11 +512,13 @@ void OOXMLSecExporter::Impl::writeSignatureLineImages()
     }
 }
 
-OOXMLSecExporter::OOXMLSecExporter(const uno::Reference<uno::XComponentContext>& xComponentContext,
-                                   const uno::Reference<embed::XStorage>& xRootStorage,
-                                   const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler,
-                                   const SignatureInformation& rInformation)
-    : m_pImpl(std::make_unique<Impl>(xComponentContext, xRootStorage, xDocumentHandler, rInformation))
+OOXMLSecExporter::OOXMLSecExporter(
+    const uno::Reference<uno::XComponentContext>& xComponentContext,
+    const uno::Reference<embed::XStorage>& xRootStorage,
+    const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler,
+    const SignatureInformation& rInformation)
+    : m_pImpl(
+          std::make_unique<Impl>(xComponentContext, xRootStorage, xDocumentHandler, rInformation))
 {
 }
 
@@ -476,7 +529,8 @@ void OOXMLSecExporter::writeSignature()
     rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList());
     pAttributeList->AddAttribute("xmlns", NS_XMLDSIG);
     pAttributeList->AddAttribute("Id", "idPackageSignature");
-    m_pImpl->getDocumentHandler()->startElement("Signature", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
+    m_pImpl->getDocumentHandler()->startElement(
+        "Signature", uno::Reference<xml::sax::XAttributeList>(pAttributeList.get()));
 
     m_pImpl->writeSignedInfo();
     m_pImpl->writeSignatureValue();