Rename .doc SPRM IDs to match current MS specs

I understand that Libreoffice's names for SPRM IDs come from old
documentation for WW8 (Word '97), plus some later additions named by
OpenOffice developers as they encountered newer SPRMs in the wild.

Meanwhile Microsoft has released newer documentation which supplies
names for these previously undocumented SPRMs, plus it renames some
WW8 properties to have the suffix "80" to make room for newer
versions of those properties.

This commit aims to bring LibreOffice's SPRM ID names in line with
the current file format specification from Microsoft.
http://msdn.microsoft.com/en-us/library/dd923581.aspx

Change-Id: I904c1db17a776e2d9e6076f87369160e3b80f2e4
Reviewed-on: https://gerrit.libreoffice.org/8884
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 37 insertions, 34 deletions

diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx
index b12d907e8d31..e3c3923f1482 100644
--- a/include/filter/msfilter/sprmids.hxx
+++ b/include/filter/msfilter/sprmids.hxx
@@ -165,8 +165,9 @@ namespace NS_sprm {
     const sal_uInt16 LN_CDispFldRMark = 0xca62;
     const sal_uInt16 LN_CIbstRMarkDel = 0x4863;
     const sal_uInt16 LN_CDttmRMarkDel = 0x6864;
-    const sal_uInt16 LN_CBrc = 0x6865;
-    const sal_uInt16 LN_CShd = 0x4866;
+    const sal_uInt16 LN_CBrc80 = 0x6865;
+    const sal_uInt16 LN_CShd80 = 0x4866;
+    const sal_uInt16 LN_CShd = 0xca71;
     const sal_uInt16 LN_CIdslRMarkDel = 0x4867;
     const sal_uInt16 LN_CFUsePgsuSettings = 0x0868;
     const sal_uInt16 LN_CCpg = 0x486b;
@@ -177,10 +178,10 @@ namespace NS_sprm {
     const sal_uInt16 LN_CIdctHint = 0x286f;
     const sal_uInt16 LN_PicBrcl = 0x2e00;
     const sal_uInt16 LN_PicScale = 0xce01;
-    const sal_uInt16 LN_PicBrcTop = 0x6c02;
-    const sal_uInt16 LN_PicBrcLeft = 0x6c03;
-    const sal_uInt16 LN_PicBrcBottom = 0x6c04;
-    const sal_uInt16 LN_PicBrcRight = 0x6c05;
+    const sal_uInt16 LN_PicBrcTop80 = 0x6c02;
+    const sal_uInt16 LN_PicBrcLeft80 = 0x6c03;
+    const sal_uInt16 LN_PicBrcBottom80 = 0x6c04;
+    const sal_uInt16 LN_PicBrcRight80 = 0x6c05;
     const sal_uInt16 LN_ScnsPgn = 0x3000;
     const sal_uInt16 LN_SiHeadingPgn = 0x3001;
     const sal_uInt16 LN_SOlstAnm = 0xd202;
@@ -224,30 +225,31 @@ namespace NS_sprm {
     const sal_uInt16 LN_SFBiDi = 0x3228;
     const sal_uInt16 LN_SFFacingCol = 0x3229;
     const sal_uInt16 LN_SFRTLGutter = 0x322a;
-    const sal_uInt16 LN_SBrcTop = 0x702b;
-    const sal_uInt16 LN_SBrcLeft = 0x702c;
-    const sal_uInt16 LN_SBrcBottom = 0x702d;
-    const sal_uInt16 LN_SBrcRight = 0x702e;
-    const sal_uInt16 LN_SBorderTop = 0xd234;
-    const sal_uInt16 LN_SBorderLeft = 0xd235;
-    const sal_uInt16 LN_SBorderBottom = 0xd236;
-    const sal_uInt16 LN_SBorderRight = 0xd237;
+    const sal_uInt16 LN_SBrcTop80 = 0x702b;
+    const sal_uInt16 LN_SBrcLeft80 = 0x702c;
+    const sal_uInt16 LN_SBrcBottom80 = 0x702d;
+    const sal_uInt16 LN_SBrcRight80 = 0x702e;
+    const sal_uInt16 LN_SBrcTop = 0xd234;
+    const sal_uInt16 LN_SBrcLeft = 0xd235;
+    const sal_uInt16 LN_SBrcBottom = 0xd236;
+    const sal_uInt16 LN_SBrcRight = 0xd237;
     const sal_uInt16 LN_SPgbProp = 0x522f;
     const sal_uInt16 LN_SDxtCharSpace = 0x7030;
     const sal_uInt16 LN_SDyaLinePitch = 0x9031;
     const sal_uInt16 LN_SClm = 0x5032;
     const sal_uInt16 LN_STextFlow = 0x5033;
-    const sal_uInt16 LN_TJc = 0x5400;
+    const sal_uInt16 LN_TJc = 0x548A;
+    const sal_uInt16 LN_TJc90 = 0x5400;
     const sal_uInt16 LN_TDxaLeft = 0x9601;
     const sal_uInt16 LN_TDxaGapHalf = 0x9602;
     const sal_uInt16 LN_TFCantSplit = 0x3403;
     const sal_uInt16 LN_TTableHeader = 0x3404;
-    const sal_uInt16 LN_TTableBorders = 0xd605;
+    const sal_uInt16 LN_TTableBorders80 = 0xd605;
     const sal_uInt16 LN_TDefTable10 = 0xd606;
     const sal_uInt16 LN_TDyaRowHeight = 0x9407;
     const sal_uInt16 LN_TDefTable = 0xd608;
-    const sal_uInt16 LN_TDefTableShd = 0xd609;
-    const sal_uInt16 LN_TCellShd = 0xd612;
+    const sal_uInt16 LN_TDefTableShd80 = 0xd609;
+    const sal_uInt16 LN_TDefTableShd = 0xd612;
     const sal_uInt16 LN_TTlp = 0x740a;
     const sal_uInt16 LN_TFBiDi = 0x560b;
     const sal_uInt16 LN_THTMLProps = 0x740c;
@@ -259,8 +261,8 @@ namespace NS_sprm {
     const sal_uInt16 LN_TMerge = 0x5624;
     const sal_uInt16 LN_TSplit = 0x5625;
     const sal_uInt16 LN_TSetBrc10 = 0xd626;
-    const sal_uInt16 LN_TSetShd = 0x7627;
-    const sal_uInt16 LN_TSetShdOdd = 0x7628;
+    const sal_uInt16 LN_TSetShd80 = 0x7627;
+    const sal_uInt16 LN_TSetShdOdd80 = 0x7628;
     const sal_uInt16 LN_TTextFlow = 0x7629;
     const sal_uInt16 LN_TDiagLine = 0xd62a;
     const sal_uInt16 LN_TVertMerge = 0xd62b;
@@ -269,22 +271,22 @@ namespace NS_sprm {
     const sal_uInt16 LN_TCellLeftColor = 0xd61b;
     const sal_uInt16 LN_TCellBottomColor = 0xd61c;
     const sal_uInt16 LN_TCellRightColor = 0xd61d;
-    const sal_uInt16 LN_TGridLineProps = 0xd613;
+    const sal_uInt16 LN_TTableBorders = 0xd613;
     const sal_uInt16 LN_Cdelrsid = 0x6817;
     const sal_uInt16 LN_PTableDepth = 0x6649;
-    const sal_uInt16 LN_TCellShadow = 0xd670;
-    const sal_uInt16 LN_PBrcTop = 0x6424;
-    const sal_uInt16 LN_PBrcLeft = 0x6425;
-    const sal_uInt16 LN_PBrcBottom = 0x6426;
-    const sal_uInt16 LN_PBrcRight = 0x6427;
-    const sal_uInt16 LN_PBrcBetween = 0x6428;
-    const sal_uInt16 LN_PBorderTop = 0xc64e;
-    const sal_uInt16 LN_PBorderLeft = 0xc64f;
-    const sal_uInt16 LN_PBorderBottom = 0xc650;
-    const sal_uInt16 LN_PBorderRight = 0xc651;
-    const sal_uInt16 LN_PBorderBetween = 0xc652;
-    const sal_uInt16 LN_CBorder = 0xca72;
-    const sal_uInt16 LN_TTPreferredWidth = 0xf614;
+    const sal_uInt16 LN_TDefTableShdRaw = 0xd670;
+    const sal_uInt16 LN_PBrcTop80 = 0x6424;
+    const sal_uInt16 LN_PBrcLeft80 = 0x6425;
+    const sal_uInt16 LN_PBrcBottom80 = 0x6426;
+    const sal_uInt16 LN_PBrcRight80 = 0x6427;
+    const sal_uInt16 LN_PBrcBetween80 = 0x6428;
+    const sal_uInt16 LN_PBrcTop = 0xc64e;
+    const sal_uInt16 LN_PBrcLeft = 0xc64f;
+    const sal_uInt16 LN_PBrcBottom = 0xc650;
+    const sal_uInt16 LN_PBrcRight = 0xc651;
+    const sal_uInt16 LN_PBrcBetween = 0xc652;
+    const sal_uInt16 LN_CBrc = 0xca72;
+    const sal_uInt16 LN_TTableWidth = 0xf614;
     const sal_uInt16 LN_CFELayout = 0xca78;
     const sal_uInt16 LN_TWidthBefore = 0xf617;
     const sal_uInt16 LN_TWidthAfter = 0xf618;
@@ -293,6 +295,7 @@ namespace NS_sprm {
     const sal_uInt16 LN_CRsidProp = 0x6815;
     const sal_uInt16 LN_CRgLid0 = 0x4873;
     const sal_uInt16 LN_CRgLid1 = 0x4874;
+    const sal_uInt16 LN_TCellPadding = 0xd632;
     const sal_uInt16 LN_TCellPaddingDefault = 0xd634;
     const sal_uInt16 LN_TRsid = 0x7479;
     const sal_uInt16 LN_TFAutofit = 0x3615;