summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-02-24 09:59:04 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-02-24 15:12:02 +0000
commit2213bfefb347e3ee00274714ee25ead97be55537 (patch)
treee0b8776fc0a29ca5833f85c1f1674b0cb210b6b6 /sw
parent40e55cf24dd30acd6d928cd764bc597dd11f5fad (diff)
Rename sprm ids to match [MS-DOC] documentation
Change-Id: Iab5b7c10c635dfdf832df3d0864939a7984282d1 Reviewed-on: https://gerrit.libreoffice.org/34599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/sprmids.hxx571
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx24
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx26
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx48
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx12
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx242
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx3
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx50
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx138
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx114
13 files changed, 669 insertions, 575 deletions
diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx
index 3d58ab545115..872df417e567 100644
--- a/sw/source/filter/ww8/sprmids.hxx
+++ b/sw/source/filter/ww8/sprmids.hxx
@@ -24,40 +24,9 @@
namespace NS_sprm
{
-const sal_uInt16 LN_PContextualSpacing = 0x246d;
-const sal_uInt16 LN_PIstdPermute = 0xc601;
-const sal_uInt16 LN_PTabProps = 0x646b;
-const sal_uInt16 LN_TFCantSplit90 = 0x3466;
-const sal_uInt16 LN_TCantSplit = 0x3644;
-const sal_uInt16 LN_PIncLvl = 0x2602;
-const sal_uInt16 LN_PJcExtra = 0x2461;
-const sal_uInt16 LN_PJc = 0x2403;
const sal_uInt16 LN_PFSideBySide = 0x2404;
-const sal_uInt16 LN_PFKeep = 0x2405;
-const sal_uInt16 LN_PFKeepFollow = 0x2406;
-const sal_uInt16 LN_PFPageBreakBefore = 0x2407;
const sal_uInt16 LN_PBrcl = 0x2408;
const sal_uInt16 LN_PBrcp = 0x2409;
-const sal_uInt16 LN_PIlvl = 0x260a;
-const sal_uInt16 LN_PIlfo = 0x460b;
-const sal_uInt16 LN_PFNoLineNumb = 0x240c;
-const sal_uInt16 LN_PChgTabsPapx = 0xc60d;
-const sal_uInt16 LN_PDxaRight = 0x840e;
-const sal_uInt16 LN_PDxaLeft = 0x840f;
-const sal_uInt16 LN_PNest = 0x4610;
-const sal_uInt16 LN_PDxaLeft180 = 0x8411;
-const sal_uInt16 LN_PDyaLine = 0x6412;
-const sal_uInt16 LN_PDyaBefore = 0xa413;
-const sal_uInt16 LN_PDyaAfter = 0xa414;
-const sal_uInt16 LN_PChgTabs = 0xc615;
-const sal_uInt16 LN_PFInTable = 0x2416;
-const sal_uInt16 LN_PCell = 0x244b;
-const sal_uInt16 LN_PRow = 0x244c;
-const sal_uInt16 LN_PFTtp = 0x2417;
-const sal_uInt16 LN_PDxaAbs = 0x8418;
-const sal_uInt16 LN_PDyaAbs = 0x8419;
-const sal_uInt16 LN_PDxaWidth = 0x841a;
-const sal_uInt16 LN_PPc = 0x261b;
const sal_uInt16 LN_PBrcTop10 = 0x461c;
const sal_uInt16 LN_PBrcLeft10 = 0x461d;
const sal_uInt16 LN_PBrcBottom10 = 0x461e;
@@ -65,252 +34,376 @@ const sal_uInt16 LN_PBrcRight10 = 0x461f;
const sal_uInt16 LN_PBrcBetween10 = 0x4620;
const sal_uInt16 LN_PBrcBar10 = 0x4621;
const sal_uInt16 LN_PDxaFromText10 = 0x4622;
-const sal_uInt16 LN_PWr = 0x2423;
-const sal_uInt16 LN_PBrcBar = 0x6629;
-const sal_uInt16 LN_PFNoAutoHyph = 0x242a;
-const sal_uInt16 LN_PWHeightAbs = 0x442b;
-const sal_uInt16 LN_PDcs = 0x442c;
-const sal_uInt16 LN_PShd = 0x442d;
-const sal_uInt16 LN_PDyaFromText = 0x842e;
-const sal_uInt16 LN_PDxaFromText = 0x842f;
-const sal_uInt16 LN_PFLocked = 0x2430;
-const sal_uInt16 LN_PFWidowControl = 0x2431;
const sal_uInt16 LN_PRuler = 0xc632;
-const sal_uInt16 LN_PFKinsoku = 0x2433;
-const sal_uInt16 LN_PFWordWrap = 0x2434;
-const sal_uInt16 LN_PFOverflowPunct = 0x2435;
-const sal_uInt16 LN_PFTopLinePunct = 0x2436;
-const sal_uInt16 LN_PFAutoSpaceDE = 0x2437;
-const sal_uInt16 LN_PFAutoSpaceDN = 0x2438;
-const sal_uInt16 LN_PWAlignFont = 0x4439;
-const sal_uInt16 LN_PFrameTextFlow = 0x443a;
const sal_uInt16 LN_PISnapBaseLine = 0x243b;
const sal_uInt16 LN_PAnld = 0xc63e;
const sal_uInt16 LN_PPropRMark = 0xc63f;
-const sal_uInt16 LN_POutLvl = 0x2640;
-const sal_uInt16 LN_PFBiDi = 0x2441;
-const sal_uInt16 LN_PFNumRMIns = 0x2443;
const sal_uInt16 LN_PCrLf = 0x2444;
-const sal_uInt16 LN_PNumRM = 0xc645;
const sal_uInt16 LN_PHugePapx = 0x6645;
-const sal_uInt16 LN_PFUsePgsuSettings = 0x2447;
-const sal_uInt16 LN_PFAdjustRight = 0x2448;
-const sal_uInt16 LN_CFRMarkDel = 0x0800;
-const sal_uInt16 LN_CFRMark = 0x0801;
-const sal_uInt16 LN_CFFieldVanish = 0x0802;
-const sal_uInt16 LN_CPicLocation = 0x6a03;
-const sal_uInt16 LN_CIbstRMark = 0x4804;
-const sal_uInt16 LN_CDttmRMark = 0x6805;
-const sal_uInt16 LN_CFData = 0x0806;
-const sal_uInt16 LN_CIdslRMark = 0x4807;
const sal_uInt16 LN_CChs = 0xea08;
-const sal_uInt16 LN_CSymbol = 0x6a09;
-const sal_uInt16 LN_CFOle2 = 0x080a;
const sal_uInt16 LN_CIdCharType = 0x480b;
-const sal_uInt16 LN_CHighlight = 0x2a0c;
const sal_uInt16 LN_CObjLocation = 0x680e;
const sal_uInt16 LN_CFFtcAsciSymb = 0x2a10;
-const sal_uInt16 LN_CIstd = 0x4a30;
-const sal_uInt16 LN_CIstdPermute = 0xca31;
const sal_uInt16 LN_CDefault = 0x2a32;
-const sal_uInt16 LN_CPlain = 0x2a33;
-const sal_uInt16 LN_CKcd = 0x2a34;
-const sal_uInt16 LN_CFBold = 0x0835;
-const sal_uInt16 LN_CFItalic = 0x0836;
-const sal_uInt16 LN_CFStrike = 0x0837;
-const sal_uInt16 LN_CFOutline = 0x0838;
-const sal_uInt16 LN_CFShadow = 0x0839;
-const sal_uInt16 LN_CFSmallCaps = 0x083a;
-const sal_uInt16 LN_CFCaps = 0x083b;
-const sal_uInt16 LN_CFVanish = 0x083c;
const sal_uInt16 LN_CFtcDefault = 0x4a3d;
-const sal_uInt16 LN_CKul = 0x2a3e;
const sal_uInt16 LN_CSizePos = 0xea3f;
-const sal_uInt16 LN_CDxaSpace = 0x8840;
const sal_uInt16 LN_CLid = 0x4a41;
-const sal_uInt16 LN_CIco = 0x2a42;
-const sal_uInt16 LN_CHps = 0x4a43;
const sal_uInt16 LN_CHpsInc = 0x2a44;
-const sal_uInt16 LN_CHpsPos = 0x4845;
const sal_uInt16 LN_CHpsPosAdj = 0x2a46;
-const sal_uInt16 LN_CMajority = 0xca47;
-const sal_uInt16 LN_CIss = 0x2a48;
const sal_uInt16 LN_CHpsNew50 = 0xca49;
const sal_uInt16 LN_CHpsInc1 = 0xca4a;
-const sal_uInt16 LN_CHpsKern = 0x484b;
const sal_uInt16 LN_CMajority50 = 0xca4c;
const sal_uInt16 LN_CHpsMul = 0x4a4d;
-const sal_uInt16 LN_CYsri = 0x484e;
-const sal_uInt16 LN_CRgFtc0 = 0x4a4f;
-const sal_uInt16 LN_CRgFtc1 = 0x4a50;
-const sal_uInt16 LN_CRgFtc2 = 0x4a51;
-const sal_uInt16 LN_CCharScale = 0x4852;
-const sal_uInt16 LN_CFDStrike = 0x2a53;
-const sal_uInt16 LN_CFImprint = 0x0854;
-const sal_uInt16 LN_CFNoProof = 0x0875;
-const sal_uInt16 LN_CFspecVanish = 0x0818;
-const sal_uInt16 LN_CFitText = 0xca76;
-const sal_uInt16 LN_CComplexScript = 0x882;
-const sal_uInt16 LN_PTightWrap = 0x2471;
-const sal_uInt16 LN_CFSpec = 0x0855;
-const sal_uInt16 LN_CFObj = 0x0856;
-const sal_uInt16 LN_CPropRMark = 0xca57;
-const sal_uInt16 LN_CFEmboss = 0x0858;
-const sal_uInt16 LN_CSfxText = 0x2859;
-const sal_uInt16 LN_CFBiDi = 0x085a;
const sal_uInt16 LN_CFDiacColor = 0x085b;
-const sal_uInt16 LN_CFBoldBi = 0x085c;
-const sal_uInt16 LN_CFItalicBi = 0x085d;
-const sal_uInt16 LN_CFtcBi = 0x4a5e;
-const sal_uInt16 LN_CLidBi = 0x485f;
-const sal_uInt16 LN_CIcoBi = 0x4a60;
-const sal_uInt16 LN_CHpsBi = 0x4a61;
-const sal_uInt16 LN_CDispFieldRMark = 0xca62;
-const sal_uInt16 LN_CIbstRMarkDel = 0x4863;
-const sal_uInt16 LN_CDttmRMarkDel = 0x6864;
-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;
-const sal_uInt16 LN_CPbiGrf = 0x4888;
-const sal_uInt16 LN_CPbiIBullet = 0x6887;
-const sal_uInt16 LN_CRgLid0_80 = 0x486d;
-const sal_uInt16 LN_CRgLid1_80 = 0x486e;
-const sal_uInt16 LN_CIdctHint = 0x286f;
const sal_uInt16 LN_PicBrcl = 0x2e00;
const sal_uInt16 LN_PicScale = 0xce01;
-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;
-const sal_uInt16 LN_SDxaColWidth = 0xf203;
-const sal_uInt16 LN_SDxaColSpacing = 0xf204;
-const sal_uInt16 LN_SFEvenlySpaced = 0x3005;
-const sal_uInt16 LN_SFProtected = 0x3006;
-const sal_uInt16 LN_SDmBinFirst = 0x5007;
-const sal_uInt16 LN_SDmBinOther = 0x5008;
-const sal_uInt16 LN_SBkc = 0x3009;
-const sal_uInt16 LN_SFTitlePage = 0x300a;
-const sal_uInt16 LN_SCcolumns = 0x500b;
-const sal_uInt16 LN_SDxaColumns = 0x900c;
const sal_uInt16 LN_SFAutoPgn = 0x300d;
-const sal_uInt16 LN_SNfcPgn = 0x300e;
const sal_uInt16 LN_SDyaPgn = 0xb00f;
const sal_uInt16 LN_SDxaPgn = 0xb010;
-const sal_uInt16 LN_SFPgnRestart = 0x3011;
-const sal_uInt16 LN_SFEndnote = 0x3012;
-const sal_uInt16 LN_SLnc = 0x3013;
const sal_uInt16 LN_SGprfIhdt = 0x3014;
-const sal_uInt16 LN_SNLnnMod = 0x5015;
-const sal_uInt16 LN_SDxaLnn = 0x9016;
-const sal_uInt16 LN_SDyaHdrTop = 0xb017;
-const sal_uInt16 LN_SDyaHdrBottom = 0xb018;
-const sal_uInt16 LN_SLBetween = 0x3019;
-const sal_uInt16 LN_SVjc = 0x301a;
-const sal_uInt16 LN_SLnnMin = 0x501b;
-const sal_uInt16 LN_SPgnStart = 0x501c;
-const sal_uInt16 LN_SBOrientation = 0x301d;
const sal_uInt16 LN_SBCustomize = 0x301e;
-const sal_uInt16 LN_SXaPage = 0xb01f;
-const sal_uInt16 LN_SYaPage = 0xb020;
-const sal_uInt16 LN_SDxaLeft = 0xb021;
-const sal_uInt16 LN_SDxaRight = 0xb022;
-const sal_uInt16 LN_SDyaTop = 0x9023;
-const sal_uInt16 LN_SDyaBottom = 0x9024;
-const sal_uInt16 LN_SDzaGutter = 0xb025;
-const sal_uInt16 LN_SDmPaperReq = 0x5026;
const sal_uInt16 LN_SPropRMark = 0xd227;
-const sal_uInt16 LN_SFBiDi = 0x3228;
const sal_uInt16 LN_SFFacingCol = 0x3229;
-const sal_uInt16 LN_SFRTLGutter = 0x322a;
-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 = 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_TTableBorders80 = 0xd605;
const sal_uInt16 LN_TDefTable10 = 0xd606;
-const sal_uInt16 LN_TDyaRowHeight = 0x9407;
-const sal_uInt16 LN_TDefTable = 0xd608;
-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;
-const sal_uInt16 LN_TSetBrc80 = 0xd620;
-const sal_uInt16 LN_TSetBrc = 0xd62f;
-const sal_uInt16 LN_TInsert = 0x7621;
-const sal_uInt16 LN_TDelete = 0x5622;
-const sal_uInt16 LN_TDxaCol = 0x7623;
-const sal_uInt16 LN_TMerge = 0x5624;
-const sal_uInt16 LN_TSplit = 0x5625;
const sal_uInt16 LN_TSetBrc10 = 0xd626;
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;
-const sal_uInt16 LN_TVertAlign = 0xd62c;
-const sal_uInt16 LN_TCellTopColor = 0xd61a;
-const sal_uInt16 LN_TCellLeftColor = 0xd61b;
-const sal_uInt16 LN_TCellBottomColor = 0xd61c;
-const sal_uInt16 LN_TCellRightColor = 0xd61d;
-const sal_uInt16 LN_TTableBorders = 0xd613;
-const sal_uInt16 LN_Cdelrsid = 0x6817;
-const sal_uInt16 LN_PTableDepth = 0x6649;
-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;
-const sal_uInt16 LN_PDxaLeft1 = 0x8460;
-const sal_uInt16 LN_PRsid = 0x6467;
-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;
-const sal_uInt16 LN_TPc = 0x360d;
-const sal_uInt16 LN_TDyaAbs = 0x940f;
-const sal_uInt16 LN_TDxaFromText = 0x9410;
-const sal_uInt16 LN_TDyaFromText = 0x9411;
-const sal_uInt16 LN_TDxaFromTextRight = 0x941e;
-const sal_uInt16 LN_TDyaFromTextBottom = 0x941f;
-const sal_uInt16 LN_TFNoAllowOverlap = 0x3465;
-const sal_uInt16 LN_CCv = 0x6870;
-const sal_uInt16 LN_CCvUl = 0x6877;
+
+// [MS-DOC] - v20170112 Section 2.6.1
+const sal_uInt16 sprmCFRMarkDel = 0x0800;
+const sal_uInt16 sprmCFRMarkIns = 0x0801;
+const sal_uInt16 sprmCFFldVanish = 0x0802;
+const sal_uInt16 sprmCPicLocation = 0x6A03;
+const sal_uInt16 sprmCIbstRMark = 0x4804;
+const sal_uInt16 sprmCDttmRMark = 0x6805;
+const sal_uInt16 sprmCFData = 0x0806;
+const sal_uInt16 sprmCIdslRMark = 0x4807;
+const sal_uInt16 sprmCSymbol = 0x6A09;
+const sal_uInt16 sprmCFOle2 = 0x080A;
+const sal_uInt16 sprmCHighlight = 0x2A0C;
+const sal_uInt16 sprmCFWebHidden = 0x0811;
+const sal_uInt16 sprmCRsidProp = 0x6815;
+const sal_uInt16 sprmCRsidText = 0x6816;
+const sal_uInt16 sprmCRsidRMDel = 0x6817;
+const sal_uInt16 sprmCFSpecVanish = 0x0818;
+const sal_uInt16 sprmCFMathPr = 0xC81A;
+const sal_uInt16 sprmCIstd = 0x4A30;
+const sal_uInt16 sprmCIstdPermute = 0xCA31;
+const sal_uInt16 sprmCPlain = 0x2A33;
+const sal_uInt16 sprmCKcd = 0x2A34;
+const sal_uInt16 sprmCFBold = 0x0835;
+const sal_uInt16 sprmCFItalic = 0x0836;
+const sal_uInt16 sprmCFStrike = 0x0837;
+const sal_uInt16 sprmCFOutline = 0x0838;
+const sal_uInt16 sprmCFShadow = 0x0839;
+const sal_uInt16 sprmCFSmallCaps = 0x083A;
+const sal_uInt16 sprmCFCaps = 0x083B;
+const sal_uInt16 sprmCFVanish = 0x083C;
+const sal_uInt16 sprmCKul = 0x2A3E;
+const sal_uInt16 sprmCDxaSpace = 0x8840;
+const sal_uInt16 sprmCIco = 0x2A42;
+const sal_uInt16 sprmCHps = 0x4A43;
+const sal_uInt16 sprmCHpsPos = 0x4845;
+const sal_uInt16 sprmCMajority = 0xCA47;
+const sal_uInt16 sprmCIss = 0x2A48;
+const sal_uInt16 sprmCHpsKern = 0x484B;
+const sal_uInt16 sprmCHresi = 0x484E;
+const sal_uInt16 sprmCRgFtc0 = 0x4A4F;
+const sal_uInt16 sprmCRgFtc1 = 0x4A50;
+const sal_uInt16 sprmCRgFtc2 = 0x4A51;
+const sal_uInt16 sprmCCharScale = 0x4852;
+const sal_uInt16 sprmCFDStrike = 0x2A53;
+const sal_uInt16 sprmCFImprint = 0x0854;
+const sal_uInt16 sprmCFSpec = 0x0855;
+const sal_uInt16 sprmCFObj = 0x0856;
+const sal_uInt16 sprmCPropRMark90 = 0xCA57;
+const sal_uInt16 sprmCFEmboss = 0x0858;
+const sal_uInt16 sprmCSfxText = 0x2859;
+const sal_uInt16 sprmCFBiDi = 0x085A;
+const sal_uInt16 sprmCFBoldBi = 0x085C;
+const sal_uInt16 sprmCFItalicBi = 0x085D;
+const sal_uInt16 sprmCFtcBi = 0x4A5E;
+const sal_uInt16 sprmCLidBi = 0x485F;
+const sal_uInt16 sprmCIcoBi = 0x4A60;
+const sal_uInt16 sprmCHpsBi = 0x4A61;
+const sal_uInt16 sprmCDispFldRMark = 0xCA62;
+const sal_uInt16 sprmCIbstRMarkDel = 0x4863;
+const sal_uInt16 sprmCDttmRMarkDel = 0x6864;
+const sal_uInt16 sprmCBrc80 = 0x6865;
+const sal_uInt16 sprmCShd80 = 0x4866;
+const sal_uInt16 sprmCIdslRMarkDel = 0x4867;
+const sal_uInt16 sprmCFUsePgsuSettings = 0x0868;
+const sal_uInt16 sprmCRgLid0_80 = 0x486D;
+const sal_uInt16 sprmCRgLid1_80 = 0x486E;
+const sal_uInt16 sprmCIdctHint = 0x286F;
+const sal_uInt16 sprmCCv = 0x6870;
+const sal_uInt16 sprmCShd = 0xCA71;
+const sal_uInt16 sprmCBrc = 0xCA72;
+const sal_uInt16 sprmCRgLid0 = 0x4873;
+const sal_uInt16 sprmCRgLid1 = 0x4874;
+const sal_uInt16 sprmCFNoProof = 0x0875;
+const sal_uInt16 sprmCFitText = 0xCA76;
+const sal_uInt16 sprmCCvUl = 0x6877;
+const sal_uInt16 sprmCFELayout = 0xCA78;
+const sal_uInt16 sprmCLbcCRJ = 0x2879;
+const sal_uInt16 sprmCFComplexScripts = 0x0882;
+const sal_uInt16 sprmCWall = 0x2A83;
+const sal_uInt16 sprmCCnf = 0xCA85;
+const sal_uInt16 sprmCNeedFontFixup = 0x2A86;
+const sal_uInt16 sprmCPbiIBullet = 0x6887;
+const sal_uInt16 sprmCPbiGrf = 0x4888;
+const sal_uInt16 sprmCPropRMark = 0xCA89;
+const sal_uInt16 sprmCFSdtVanish = 0x2A90;
+
+// [MS-DOC] - v20170112 Section 2.6.2
+const sal_uInt16 sprmPIstd = 0x4600;
+const sal_uInt16 sprmPIstdPermute = 0xC601;
+const sal_uInt16 sprmPIncLvl = 0x2602;
+const sal_uInt16 sprmPJc80 = 0x2403;
+const sal_uInt16 sprmPFKeep = 0x2405;
+const sal_uInt16 sprmPFKeepFollow = 0x2406;
+const sal_uInt16 sprmPFPageBreakBefore = 0x2407;
+const sal_uInt16 sprmPIlvl = 0x260A;
+const sal_uInt16 sprmPIlfo = 0x460B;
+const sal_uInt16 sprmPFNoLineNumb = 0x240C;
+const sal_uInt16 sprmPChgTabsPapx = 0xC60D;
+const sal_uInt16 sprmPDxaRight80 = 0x840E;
+const sal_uInt16 sprmPDxaLeft80 = 0x840F;
+const sal_uInt16 sprmPNest80 = 0x4610;
+const sal_uInt16 sprmPDxaLeft180 = 0x8411;
+const sal_uInt16 sprmPDyaLine = 0x6412;
+const sal_uInt16 sprmPDyaBefore = 0xA413;
+const sal_uInt16 sprmPDyaAfter = 0xA414;
+const sal_uInt16 sprmPChgTabs = 0xC615;
+const sal_uInt16 sprmPFInTable = 0x2416;
+const sal_uInt16 sprmPFTtp = 0x2417;
+const sal_uInt16 sprmPDxaAbs = 0x8418;
+const sal_uInt16 sprmPDyaAbs = 0x8419;
+const sal_uInt16 sprmPDxaWidth = 0x841A;
+const sal_uInt16 sprmPPc = 0x261B;
+const sal_uInt16 sprmPWr = 0x2423;
+const sal_uInt16 sprmPBrcTop80 = 0x6424;
+const sal_uInt16 sprmPBrcLeft80 = 0x6425;
+const sal_uInt16 sprmPBrcBottom80 = 0x6426;
+const sal_uInt16 sprmPBrcRight80 = 0x6427;
+const sal_uInt16 sprmPBrcBetween80 = 0x6428;
+const sal_uInt16 sprmPBrcBar80 = 0x6629;
+const sal_uInt16 sprmPFNoAutoHyph = 0x242A;
+const sal_uInt16 sprmPWHeightAbs = 0x442B;
+const sal_uInt16 sprmPDcs = 0x442C;
+const sal_uInt16 sprmPShd80 = 0x442D;
+const sal_uInt16 sprmPDyaFromText = 0x842E;
+const sal_uInt16 sprmPDxaFromText = 0x842F;
+const sal_uInt16 sprmPFLocked = 0x2430;
+const sal_uInt16 sprmPFWidowControl = 0x2431;
+const sal_uInt16 sprmPFKinsoku = 0x2433;
+const sal_uInt16 sprmPFWordWrap = 0x2434;
+const sal_uInt16 sprmPFOverflowPunct = 0x2435;
+const sal_uInt16 sprmPFTopLinePunct = 0x2436;
+const sal_uInt16 sprmPFAutoSpaceDE = 0x2437;
+const sal_uInt16 sprmPFAutoSpaceDN = 0x2438;
+const sal_uInt16 sprmPWAlignFont = 0x4439;
+const sal_uInt16 sprmPFrameTextFlow = 0x443A;
+const sal_uInt16 sprmPOutLvl = 0x2640;
+const sal_uInt16 sprmPFBiDi = 0x2441;
+const sal_uInt16 sprmPFNumRMIns = 0x2443;
+const sal_uInt16 sprmPNumRM = 0xC645;
+const sal_uInt16 sprmPHugePapx = 0x6646;
+const sal_uInt16 sprmPFUsePgsuSettings = 0x2447;
+const sal_uInt16 sprmPFAdjustRight = 0x2448;
+const sal_uInt16 sprmPItap = 0x6649;
+const sal_uInt16 sprmPDtap = 0x664A;
+const sal_uInt16 sprmPFInnerTableCell = 0x244B;
+const sal_uInt16 sprmPFInnerTtp = 0x244C;
+const sal_uInt16 sprmPShd = 0xC64D;
+const sal_uInt16 sprmPBrcTop = 0xC64E;
+const sal_uInt16 sprmPBrcLeft = 0xC64F;
+const sal_uInt16 sprmPBrcBottom = 0xC650;
+const sal_uInt16 sprmPBrcRight = 0xC651;
+const sal_uInt16 sprmPBrcBetween = 0xC652;
+const sal_uInt16 sprmPBrcBar = 0xC653;
+const sal_uInt16 sprmPDxcRight = 0x4455;
+const sal_uInt16 sprmPDxcLeft = 0x4456;
+const sal_uInt16 sprmPDxcLeft1 = 0x4457;
+const sal_uInt16 sprmPDylBefore = 0x4458;
+const sal_uInt16 sprmPDylAfter = 0x4459;
+const sal_uInt16 sprmPFOpenTch = 0x245A;
+const sal_uInt16 sprmPFDyaBeforeAuto = 0x245B;
+const sal_uInt16 sprmPFDyaAfterAuto = 0x245C;
+const sal_uInt16 sprmPDxaRight = 0x845D;
+const sal_uInt16 sprmPDxaLeft = 0x845E;
+const sal_uInt16 sprmPNest = 0x465F;
+const sal_uInt16 sprmPDxaLeft1 = 0x8460;
+const sal_uInt16 sprmPJc = 0x2461;
+const sal_uInt16 sprmPFNoAllowOverlap = 0x2462;
+const sal_uInt16 sprmPWall = 0x2664;
+const sal_uInt16 sprmPIpgp = 0x6465;
+const sal_uInt16 sprmPCnf = 0xC666;
+const sal_uInt16 sprmPRsid = 0x6467;
+const sal_uInt16 sprmPIstdListPermute = 0xC669;
+const sal_uInt16 sprmPTableProps = 0x646B;
+const sal_uInt16 sprmPTIstdInfo = 0xC66C;
+const sal_uInt16 sprmPFContextualSpacing = 0x246D;
+const sal_uInt16 sprmPPropRMark = 0xC66F;
+const sal_uInt16 sprmPFMirrorIndents = 0x2470;
+const sal_uInt16 sprmPTtwo = 0x2471;
+
+// [MS-DOC] - v20170112 Section 2.6.3
+const sal_uInt16 sprmTJc90 = 0x5400;
+const sal_uInt16 sprmTDxaLeft = 0x9601;
+const sal_uInt16 sprmTDxaGapHalf = 0x9602;
+const sal_uInt16 sprmTFCantSplit90 = 0x3403;
+const sal_uInt16 sprmTTableHeader = 0x3404;
+const sal_uInt16 sprmTTableBorders80 = 0xD605;
+const sal_uInt16 sprmTDyaRowHeight = 0x9407;
+const sal_uInt16 sprmTDefTable = 0xD608;
+const sal_uInt16 sprmTDefTableShd80 = 0xD609;
+const sal_uInt16 sprmTTlp = 0x740A;
+const sal_uInt16 sprmTFBiDi = 0x560B;
+const sal_uInt16 sprmTDefTableShd3rd = 0xD60C;
+const sal_uInt16 sprmTPc = 0x360D;
+const sal_uInt16 sprmTDxaAbs = 0x940E;
+const sal_uInt16 sprmTDyaAbs = 0x940F;
+const sal_uInt16 sprmTDxaFromText = 0x9410;
+const sal_uInt16 sprmTDyaFromText = 0x9411;
+const sal_uInt16 sprmTDefTableShd = 0xD612;
+const sal_uInt16 sprmTTableBorders = 0xD613;
+const sal_uInt16 sprmTTableWidth = 0xF614;
+const sal_uInt16 sprmTFAutofit = 0x3615;
+const sal_uInt16 sprmTDefTableShd2nd = 0xD616;
+const sal_uInt16 sprmTWidthBefore = 0xF617;
+const sal_uInt16 sprmTWidthAfter = 0xF618;
+const sal_uInt16 sprmTFKeepFollow = 0x3619;
+const sal_uInt16 sprmTBrcTopCv = 0xD61A;
+const sal_uInt16 sprmTBrcLeftCv = 0xD61B;
+const sal_uInt16 sprmTBrcBottomCv = 0xD61C;
+const sal_uInt16 sprmTBrcRightCv = 0xD61D;
+const sal_uInt16 sprmTDxaFromTextRight = 0x941E;
+const sal_uInt16 sprmTDyaFromTextBottom = 0x941F;
+const sal_uInt16 sprmTSetBrc80 = 0xD620;
+const sal_uInt16 sprmTInsert = 0x7621;
+const sal_uInt16 sprmTDelete = 0x5622;
+const sal_uInt16 sprmTDxaCol = 0x7623;
+const sal_uInt16 sprmTMerge = 0x5624;
+const sal_uInt16 sprmTSplit = 0x5625;
+const sal_uInt16 sprmTTextFlow = 0x7629;
+const sal_uInt16 sprmTVertMerge = 0xD62B;
+const sal_uInt16 sprmTVertAlign = 0xD62C;
+const sal_uInt16 sprmTSetShd = 0xD62D;
+const sal_uInt16 sprmTSetShdOdd = 0xD62E;
+const sal_uInt16 sprmTSetBrc = 0xD62F;
+const sal_uInt16 sprmTCellPadding = 0xD632;
+const sal_uInt16 sprmTCellSpacingDefault = 0xD633;
+const sal_uInt16 sprmTCellPaddingDefault = 0xD634;
+const sal_uInt16 sprmTCellWidth = 0xD635;
+const sal_uInt16 sprmTFitText = 0xF636;
+const sal_uInt16 sprmTFCellNoWrap = 0xD639;
+const sal_uInt16 sprmTIstd = 0x563A;
+const sal_uInt16 sprmTCellPaddingStyle = 0xD63E;
+const sal_uInt16 sprmTCellFHideMark = 0xD642;
+const sal_uInt16 sprmTSetShdTable = 0xD660;
+const sal_uInt16 sprmTWidthIndent = 0xF661;
+const sal_uInt16 sprmTCellBrcType = 0xD662;
+const sal_uInt16 sprmTFBiDi90 = 0x5664;
+const sal_uInt16 sprmTFNoAllowOverlap = 0x3465;
+const sal_uInt16 sprmTFCantSplit = 0x3466;
+const sal_uInt16 sprmTPropRMark = 0xD667;
+const sal_uInt16 sprmTWall = 0x3668;
+const sal_uInt16 sprmTIpgp = 0x7469;
+const sal_uInt16 sprmTCnf = 0xD66A;
+const sal_uInt16 sprmTDefTableShdRaw = 0xD670;
+const sal_uInt16 sprmTDefTableShdRaw2nd = 0xD671;
+const sal_uInt16 sprmTDefTableShdRaw3rd = 0xD672;
+const sal_uInt16 sprmTRsid = 0x7479;
+const sal_uInt16 sprmTCellVertAlignStyle = 0x347C;
+const sal_uInt16 sprmTCellNoWrapStyle = 0x347D;
+const sal_uInt16 sprmTCellBrcTopStyle = 0xD47F;
+const sal_uInt16 sprmTCellBrcBottomStyle = 0xD680;
+const sal_uInt16 sprmTCellBrcLeftStyle = 0xD681;
+const sal_uInt16 sprmTCellBrcRightStyle = 0xD682;
+const sal_uInt16 sprmTCellBrcInsideHStyle = 0xD683;
+const sal_uInt16 sprmTCellBrcInsideVStyle = 0xD684;
+const sal_uInt16 sprmTCellBrcTL2BRStyle = 0xD685;
+const sal_uInt16 sprmTCellBrcTR2BLStyle = 0xD686;
+const sal_uInt16 sprmTCellShdStyle = 0xD687;
+const sal_uInt16 sprmTCHorzBands = 0x3488;
+const sal_uInt16 sprmTCVertBands = 0x3489;
+const sal_uInt16 sprmTJc = 0x548A;
+
+// [MS-DOC] - v20170112 Section 2.6.4
+const sal_uInt16 sprmScnsPgn = 0x3000;
+const sal_uInt16 sprmSiHeadingPgn = 0x3001;
+const sal_uInt16 sprmSDxaColWidth = 0xF203;
+const sal_uInt16 sprmSDxaColSpacing = 0xF204;
+const sal_uInt16 sprmSFEvenlySpaced = 0x3005;
+const sal_uInt16 sprmSFProtected = 0x3006;
+const sal_uInt16 sprmSDmBinFirst = 0x5007;
+const sal_uInt16 sprmSDmBinOther = 0x5008;
+const sal_uInt16 sprmSBkc = 0x3009;
+const sal_uInt16 sprmSFTitlePage = 0x300A;
+const sal_uInt16 sprmSCcolumns = 0x500B;
+const sal_uInt16 sprmSDxaColumns = 0x900C;
+const sal_uInt16 sprmSNfcPgn = 0x300E;
+const sal_uInt16 sprmSFPgnRestart = 0x3011;
+const sal_uInt16 sprmSFEndnote = 0x3012;
+const sal_uInt16 sprmSLnc = 0x3013;
+const sal_uInt16 sprmSNLnnMod = 0x5015;
+const sal_uInt16 sprmSDxaLnn = 0x9016;
+const sal_uInt16 sprmSDyaHdrTop = 0xB017;
+const sal_uInt16 sprmSDyaHdrBottom = 0xB018;
+const sal_uInt16 sprmSLBetween = 0x3019;
+const sal_uInt16 sprmSVjc = 0x301A;
+const sal_uInt16 sprmSLnnMin = 0x501B;
+const sal_uInt16 sprmSPgnStart97 = 0x501C;
+const sal_uInt16 sprmSBOrientation = 0x301D;
+const sal_uInt16 sprmSXaPage = 0xB01F;
+const sal_uInt16 sprmSYaPage = 0xB020;
+const sal_uInt16 sprmSDxaLeft = 0xB021;
+const sal_uInt16 sprmSDxaRight = 0xB022;
+const sal_uInt16 sprmSDyaTop = 0x9023;
+const sal_uInt16 sprmSDyaBottom = 0x9024;
+const sal_uInt16 sprmSDzaGutter = 0xB025;
+const sal_uInt16 sprmSDmPaperReq = 0x5026;
+const sal_uInt16 sprmSFBiDi = 0x3228;
+const sal_uInt16 sprmSFRTLGutter = 0x322A;
+const sal_uInt16 sprmSBrcTop80 = 0x702B;
+const sal_uInt16 sprmSBrcLeft80 = 0x702C;
+const sal_uInt16 sprmSBrcBottom80 = 0x702D;
+const sal_uInt16 sprmSBrcRight80 = 0x702E;
+const sal_uInt16 sprmSPgbProp = 0x522F;
+const sal_uInt16 sprmSDxtCharSpace = 0x7030;
+const sal_uInt16 sprmSDyaLinePitch = 0x9031;
+const sal_uInt16 sprmSClm = 0x5032;
+const sal_uInt16 sprmSTextFlow = 0x5033;
+const sal_uInt16 sprmSBrcTop = 0xD234;
+const sal_uInt16 sprmSBrcLeft = 0xD235;
+const sal_uInt16 sprmSBrcBottom = 0xD236;
+const sal_uInt16 sprmSBrcRight = 0xD237;
+const sal_uInt16 sprmSWall = 0x3239;
+const sal_uInt16 sprmSRsid = 0x703A;
+const sal_uInt16 sprmSFpc = 0x303B;
+const sal_uInt16 sprmSRncFtn = 0x303C;
+const sal_uInt16 sprmSRncEdn = 0x303E;
+const sal_uInt16 sprmSNFtn = 0x503F;
+const sal_uInt16 sprmSNfcFtnRef = 0x5040;
+const sal_uInt16 sprmSNEdn = 0x5041;
+const sal_uInt16 sprmSNfcEdnRef = 0x5042;
+const sal_uInt16 sprmSPropRMark = 0xD243;
+const sal_uInt16 sprmSPgnStart = 0x7044;
+
+// [MS-DOC] - v20170112 Section 2.6.5
+const sal_uInt16 sprmPicBrcTop80 = 0x6C02;
+const sal_uInt16 sprmPicBrcLeft80 = 0x6C03;
+const sal_uInt16 sprmPicBrcBottom80 = 0x6C04;
+const sal_uInt16 sprmPicBrcRight80 = 0x6C05;
+const sal_uInt16 sprmPicBrcTop = 0xCE08;
+const sal_uInt16 sprmPicBrcLeft = 0xCE09;
+const sal_uInt16 sprmPicBrcBottom = 0xCE0A;
+const sal_uInt16 sprmPicBrcRight = 0xCE0B;
}
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index e4d4a247e4c9..bfd8a1414b3b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1151,7 +1151,7 @@ void WW8AttributeOutput::FieldVanish( const OUString& rText, ww::eField /*eType*
m_rWW8Export.GetCurrentItems( aItems );
// sprmCFFieldVanish
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFieldVanish );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFFldVanish );
aItems.push_back( 1 );
sal_uInt16 nStt_sprmCFSpec = aItems.size();
@@ -1732,22 +1732,22 @@ void WW8AttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop
ShortToSVBT16( nStyle, nSty );
m_rWW8Export.pO->insert( m_rWW8Export.pO->end(), nSty, nSty+2 ); // Style #
- m_rWW8Export.InsUInt16( NS_sprm::LN_PPc ); // Alignment (sprmPPc)
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPPc ); // Alignment (sprmPPc)
m_rWW8Export.pO->push_back( 0x20 );
- m_rWW8Export.InsUInt16( NS_sprm::LN_PWr ); // Wrapping (sprmPWr)
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPWr ); // Wrapping (sprmPWr)
m_rWW8Export.pO->push_back( 0x02 );
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDcs ); // Dropcap (sprmPDcs)
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDcs ); // Dropcap (sprmPDcs)
int nDCS = ( nDropLines << 3 ) | 0x01;
m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( nDCS ) );
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaFromText ); // Distance from text (sprmPDxaFromText)
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDxaFromText ); // Distance from text (sprmPDxaFromText)
m_rWW8Export.InsUInt16( nDistance );
if ( rNode.GetDropSize( rFontHeight, rDropHeight, rDropDescent ) )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaLine ); // Line spacing
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaLine ); // Line spacing
m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -rDropHeight ) );
m_rWW8Export.InsUInt16( 0 );
}
@@ -1770,14 +1770,14 @@ void WW8AttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop
const SwCharFormat *pSwCharFormat = rSwFormatDrop.GetCharFormat();
if ( pSwCharFormat )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCIstd );
m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pSwCharFormat ) );
}
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsPos ); // Lower the chars
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsPos ); // Lower the chars
m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -((nDropLines - 1)*rDropDescent) / 10 ) );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHps ); // Font Size
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHps ); // Font Size
m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( rFontHeight / 10 ) );
}
@@ -3048,12 +3048,12 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
static const sal_uInt16 insSprmIds[ 3 ] =
{
// Ids for insert // for WW8
- NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark,
+ NS_sprm::sprmCFRMarkIns, NS_sprm::sprmCIbstRMark, NS_sprm::sprmCDttmRMark,
};
static const sal_uInt16 delSprmIds[ 3 ] =
{
// Ids for delete // for WW8
- NS_sprm::LN_CFRMarkDel, NS_sprm::LN_CIbstRMarkDel, NS_sprm::LN_CDttmRMarkDel,
+ NS_sprm::sprmCFRMarkDel, NS_sprm::sprmCIbstRMarkDel, NS_sprm::sprmCDttmRMarkDel,
};
const sal_uInt16* pSprmIds = nullptr;
@@ -3068,7 +3068,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
break;
case nsRedlineType_t::REDLINE_FORMAT:
- m_rWW8Export.InsUInt16( NS_sprm::LN_CPropRMark );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCPropRMark90 );
m_rWW8Export.pO->push_back( 7 ); // len
m_rWW8Export.pO->push_back( 1 );
m_rWW8Export.InsUInt16( m_rWW8Export.AddRedlineAuthor( pRedline->GetAuthor() ) );
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index f8ad4abf40a5..d4d1843a623f 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -290,9 +290,9 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
{
sal_uInt16 nFontID = m_rWW8Export.m_aFontHelper.GetId( *pFont );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc0 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgFtc0 );
m_rWW8Export.InsUInt16( nFontID );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc2 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgFtc2 );
m_rWW8Export.InsUInt16( nFontID );
}
@@ -303,9 +303,9 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
int nIndex = m_rWW8Export.GetGrfIndex(*pBrush);
if ( nIndex != -1 )
{
- m_rWW8Export.InsUInt16(NS_sprm::LN_CPbiIBullet);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmCPbiIBullet);
m_rWW8Export.InsUInt32(nIndex);
- m_rWW8Export.InsUInt16(NS_sprm::LN_CPbiGrf);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmCPbiGrf);
m_rWW8Export.InsUInt16(1);
}
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index e033ac9e93bb..2dea97d55e24 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1324,7 +1324,7 @@ void WW8AttributeOutput::SectionFormProtection( bool bProtected )
//is not protected, set the unlocked flag
if ( m_rWW8Export.pSepx->DocumentIsProtected() && !bProtected )
{
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SFProtected );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSFProtected );
m_rWW8Export.pO->push_back( 1 );
}
}
@@ -1332,24 +1332,24 @@ void WW8AttributeOutput::SectionFormProtection( bool bProtected )
void WW8AttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo )
{
// sprmSNLnnMod - activate Line Numbering and define Modulo
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SNLnnMod );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSNLnnMod );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, (sal_uInt16)rLnNumInfo.GetCountBy() );
// sprmSDxaLnn - xPosition of Line Number
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SDxaLnn );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSDxaLnn );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, (sal_uInt16)rLnNumInfo.GetPosFromLeft() );
// sprmSLnc - restart number: 0 per page, 1 per section, 2 never restart
if ( nRestartNo || !rLnNumInfo.IsRestartEachPage() )
{
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SLnc );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSLnc );
m_rWW8Export.pO->push_back( nRestartNo ? 1 : 2 );
}
// sprmSLnnMin - Restart the Line Number with given value
if ( nRestartNo )
{
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SLnnMin );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSLnnMin );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, (sal_uInt16)nRestartNo - 1 );
}
}
@@ -1357,7 +1357,7 @@ void WW8AttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLin
void WW8AttributeOutput::SectionTitlePage()
{
// sprmSFTitlePage
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SFTitlePage );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSFTitlePage );
m_rWW8Export.pO->push_back( 1 );
}
@@ -1384,14 +1384,14 @@ void WW8AttributeOutput::SectionPageBorders( const SwFrameFormat* pPdFormat, con
if ( USHRT_MAX != nPgBorder )
{
// write the Flag and Border Attribute
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SPgbProp );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSPgbProp );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, nPgBorder );
}
}
void WW8AttributeOutput::SectionBiDi( bool bBiDi )
{
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SFBiDi );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSFBiDi );
m_rWW8Export.pO->push_back( bBiDi? 1: 0 );
}
@@ -1399,17 +1399,17 @@ void WW8AttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boos
{
// sprmSNfcPgn
sal_uInt8 nb = WW8Export::GetNumId( nNumType );
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SNfcPgn );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSNfcPgn );
m_rWW8Export.pO->push_back( nb );
if ( oPageRestartNumber )
{
// sprmSFPgnRestart
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SFPgnRestart );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSFPgnRestart );
m_rWW8Export.pO->push_back( 1 );
// sprmSPgnStart
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SPgnStart );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSPgnStart97 );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, oPageRestartNumber.get() );
}
}
@@ -1418,7 +1418,7 @@ void WW8AttributeOutput::SectionType( sal_uInt8 nBreakCode )
{
if ( 2 != nBreakCode ) // new page is the default
{
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SBkc );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSBkc );
m_rWW8Export.pO->push_back( nBreakCode );
}
}
@@ -1462,7 +1462,7 @@ void WW8AttributeOutput::TextVerticalAdjustment( const drawing::TextVerticalAdju
default:
break;
}
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_SVjc );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSVjc );
m_rWW8Export.pO->push_back( nMSVA );
}
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b1604c50eaba..849f325e91fb 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1799,7 +1799,7 @@ void WW8Export::WriteStringAsPara( const OUString& rText )
if( m_bOutTable )
{ // Tab-Attr
// sprmPFInTable
- SwWW8Writer::InsUInt16( aArr, NS_sprm::LN_PFInTable );
+ SwWW8Writer::InsUInt16( aArr, NS_sprm::sprmPFInTable );
aArr.push_back( 1 );
}
@@ -1991,14 +1991,14 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT
if ( nDepth > 0 )
{
/* Cell */
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFInTable );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
- m_rWW8Export.InsUInt16( NS_sprm::LN_PTableDepth );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPItap );
m_rWW8Export.InsUInt32( nDepth );
if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PCell );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
}
}
@@ -2013,23 +2013,23 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa
/* Row */
if ( pTableTextNodeInfoInner->isEndOfLine() )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFInTable );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
if ( nDepth == 1 )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFTtp );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFTtp );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
}
- m_rWW8Export.InsUInt16( NS_sprm::LN_PTableDepth );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPItap );
m_rWW8Export.InsUInt32( nDepth );
if ( nDepth > 1 )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PCell );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
- m_rWW8Export.InsUInt16( NS_sprm::LN_PRow );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTtp );
m_rWW8Export.pO->push_back( (sal_uInt8)0x1 );
}
@@ -2113,7 +2113,7 @@ void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrameFormat ) )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_TTextFlow );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTTextFlow );
m_rWW8Export.pO->push_back( sal_uInt8(n) ); //start range
m_rWW8Export.pO->push_back( sal_uInt8(n + 1) ); //end range
m_rWW8Export.InsUInt16( 5 ); //Equals vertical writing
@@ -2135,9 +2135,9 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
const SwFormatRowSplit& rSplittable = pLineFormat->GetRowSplit();
sal_uInt8 nCantSplit = (!rSplittable.GetValue()) ? 1 : 0;
- m_rWW8Export.InsUInt16( NS_sprm::LN_TFCantSplit );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTFCantSplit90 );
m_rWW8Export.pO->push_back( nCantSplit );
- m_rWW8Export.InsUInt16( NS_sprm::LN_TFCantSplit90 ); // also write fCantSplit90
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTFCantSplit ); // also write fCantSplit90
m_rWW8Export.pO->push_back( nCantSplit );
}
@@ -2148,7 +2148,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable
if ( m_rWW8Export.TrueFrameDirection(*pFrameFormat) == FRMDIR_HORI_RIGHT_TOP )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_TFBiDi );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTFBiDi );
m_rWW8Export.InsUInt16( 1 );
}
}
@@ -2180,7 +2180,7 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab
if ( nHeight )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_TDyaRowHeight );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTDyaRowHeight );
m_rWW8Export.InsUInt16( (sal_uInt16)nHeight );
}
@@ -2213,7 +2213,7 @@ void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
{
case text::HoriOrientation::CENTER:
case text::HoriOrientation::RIGHT:
- m_rWW8Export.InsUInt16( NS_sprm::LN_TJc90 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTJc90 );
m_rWW8Export.InsUInt16( text::HoriOrientation::RIGHT == eHOri ? 2 : 1 );
break;
default:
@@ -2242,19 +2242,19 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
sal_uInt8 nTPc = (nPadding << 4) | (nPcVert << 2) | nPcHorz;
- m_rWW8Export.InsUInt16(NS_sprm::LN_TPc);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmTPc);
m_rWW8Export.pO->push_back( nTPc );
- m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaAbs);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmTDyaAbs);
m_rWW8Export.InsUInt16(rUL.GetUpper());
- m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaFromText);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmTDyaFromText);
m_rWW8Export.InsUInt16(rUL.GetUpper());
}
if (rUL.GetLower() > 0)
{
- m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaFromTextBottom);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmTDyaFromTextBottom);
m_rWW8Export.InsUInt16(rUL.GetLower());
}
}
@@ -2266,7 +2266,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
if ( pTable->GetRowsToRepeat() > pTableTextNodeInfoInner->getRow() )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_TTableHeader );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTTableHeader );
m_rWW8Export.pO->push_back( 1 );
}
@@ -2277,7 +2277,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
assert(nBoxes <= ww8::MAXTABLECELLS);
// sprm header
- m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTable );
sal_uInt16 nSprmSize = 2 + (nBoxes + 1) * 2 + nBoxes * 20;
m_rWW8Export.InsUInt16( nSprmSize ); // length
@@ -2521,7 +2521,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes();
sal_uInt8 nBoxes = rTabBoxes.size();
- m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTableShd80 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTableShd80 );
m_rWW8Export.pO->push_back( (sal_uInt8)(nBoxes * 2) ); // Len
for ( sal_uInt8 n = 0; n < nBoxes; n++ )
@@ -2543,8 +2543,8 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
m_rWW8Export.InsUInt16( aShd.GetValue() );
}
- sal_uInt32 aSprmIds[] = { NS_sprm::LN_TDefTableShd,
- NS_sprm::LN_TDefTableShdRaw };
+ sal_uInt32 aSprmIds[] = { NS_sprm::sprmTDefTableShd,
+ NS_sprm::sprmTDefTableShdRaw };
sal_uInt8 nBoxes0 = rTabBoxes.size();
if (nBoxes0 > 21)
nBoxes0 = 21;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index e90e349e851c..ca4340a681cf 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -336,16 +336,16 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId )
// Ouput the cPicLocation attribute
std::unique_ptr<ww::bytes> pBuf( new ww::bytes );
- SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CPicLocation );
+ SwWW8Writer::InsUInt16( *pBuf, NS_sprm::sprmCPicLocation );
SwWW8Writer::InsUInt32( *pBuf, rOleId.copy( 1 ).toInt32() );
- SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFOle2 );
+ SwWW8Writer::InsUInt16( *pBuf, NS_sprm::sprmCFOle2 );
pBuf->push_back( 1 );
- SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFSpec );
+ SwWW8Writer::InsUInt16( *pBuf, NS_sprm::sprmCFSpec );
pBuf->push_back( 1 );
- SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFObj );
+ SwWW8Writer::InsUInt16( *pBuf, NS_sprm::sprmCFObj );
pBuf->push_back( 1 );
m_pChpPlc->AppendFkpEntry( Strm().Tell(), pBuf->size(), pBuf->data() );
@@ -423,7 +423,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame)
GetItem(RES_CHRATR_FONTSIZE)).GetHeight();
nHeight-=nFontHeight/20;
- Set_UInt16( pArr, NS_sprm::LN_CHpsPos );
+ Set_UInt16( pArr, NS_sprm::sprmCHpsPos );
Set_UInt16( pArr, -((sal_Int16)nHeight));
}
}
@@ -434,7 +434,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame)
Set_UInt8( pArr, 1 );
// sprmCPicLocation
- Set_UInt16( pArr, NS_sprm::LN_CPicLocation );
+ Set_UInt16( pArr, NS_sprm::sprmCPicLocation );
Set_UInt32( pArr, GRF_MAGIC_321 );
// vary Magic, so that different graphic attributes will not be merged
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 274739e225b3..e2f2de80205e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -671,11 +671,11 @@ void WW8AttributeOutput::OutlineNumbering(sal_uInt8 nLvl)
nLvl = WW8ListManager::nMaxLevel-1;
// write sprmPOutLvl sprmPIlvl and sprmPIlfo
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_POutLvl );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmPOutLvl );
m_rWW8Export.pO->push_back( nLvl );
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlvl );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmPIlvl );
m_rWW8Export.pO->push_back( nLvl );
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlfo );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmPIlfo );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO,
1 + m_rWW8Export.GetId( *m_rWW8Export.m_pDoc->GetOutlineNumRule() ) );
}
@@ -695,9 +695,9 @@ bool WW8Export::DisallowInheritingOutlineNumbering(const SwFormat &rFormat)
{
if (static_cast<const SwTextFormatColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
{
- SwWW8Writer::InsUInt16(*pO, NS_sprm::LN_POutLvl);
+ SwWW8Writer::InsUInt16(*pO, NS_sprm::sprmPOutLvl);
pO->push_back(sal_uInt8(9));
- SwWW8Writer::InsUInt16(*pO, NS_sprm::LN_PIlfo);
+ SwWW8Writer::InsUInt16(*pO, NS_sprm::sprmPIlfo);
SwWW8Writer::InsUInt16(*pO, 0);
bRet = true;
@@ -919,7 +919,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
{
if( m_rWW8Export.m_pDoc->GetDocumentType() != SwDoc::DOCTYPE_MSWORD )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFBiDi );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFBiDi );
m_rWW8Export.pO->push_back( (sal_uInt8)1 );
}
}
@@ -927,7 +927,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
// #i46087# patch from james_clark; complex texts needs the undocumented SPRM CComplexScript with param 0x81.
if (nScript == i18n::ScriptType::COMPLEX && !bIsRTL)
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CComplexScript );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFComplexScripts );
m_rWW8Export.pO->push_back( (sal_uInt8)0x81 );
m_rWW8Export.pDop->bUseThaiLineBreakingRules = true;
}
@@ -1035,7 +1035,7 @@ void WW8AttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
void WW8AttributeOutput::OutputWW8Attribute( sal_uInt8 nId, bool bVal )
{
- m_rWW8Export.InsUInt16( 8 == nId ? NS_sprm::LN_CFDStrike : NS_sprm::LN_CFBold + nId );
+ m_rWW8Export.InsUInt16( 8 == nId ? NS_sprm::sprmCFDStrike : NS_sprm::sprmCFBold + nId );
m_rWW8Export.pO->push_back( bVal ? 1 : 0 );
}
@@ -1046,7 +1046,7 @@ void WW8AttributeOutput::OutputWW8AttributeCTL( sal_uInt8 nId, bool bVal )
if (nId > 1)
return;
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFBoldBi + nId );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFBoldBi + nId );
m_rWW8Export.pO->push_back( bVal ? 1 : 0 );
}
@@ -1054,9 +1054,9 @@ void WW8AttributeOutput::CharFont( const SvxFontItem& rFont )
{
sal_uInt16 nFontID = m_rWW8Export.GetId( rFont );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc0 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgFtc0 );
m_rWW8Export.InsUInt16( nFontID );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc2 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgFtc2 );
m_rWW8Export.InsUInt16( nFontID );
}
@@ -1064,14 +1064,14 @@ void WW8AttributeOutput::CharFont( const SvxFontItem& rFont )
void WW8AttributeOutput::CharFontCTL( const SvxFontItem& rFont )
{
sal_uInt16 nFontID = m_rWW8Export.GetId( rFont );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFtcBi );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFtcBi );
m_rWW8Export.InsUInt16( nFontID );
}
void WW8AttributeOutput::CharFontCJK( const SvxFontItem& rFont )
{
sal_uInt16 nFontID = m_rWW8Export.GetId( rFont );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc1 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgFtc1 );
m_rWW8Export.InsUInt16( nFontID );
}
@@ -1108,21 +1108,21 @@ void WW8AttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
void WW8AttributeOutput::CharKerning( const SvxKerningItem& rKerning )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CDxaSpace );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCDxaSpace );
m_rWW8Export.InsUInt16( rKerning.GetValue() );
}
void WW8AttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsKern );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsKern );
m_rWW8Export.InsUInt16( rAutoKern.GetValue() ? 1 : 0 );
}
void WW8AttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CSfxText );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCSfxText );
// At the moment the only animated text effect we support is blinking
m_rWW8Export.pO->push_back( rBlink.GetValue() ? 2 : 0 );
}
@@ -1175,7 +1175,7 @@ void WW8AttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
void WW8AttributeOutput::CharBorder( const SvxBorderLine* pAllBorder, const sal_uInt16 /*nDist*/, const bool bShadow )
{
- WW8Export::Out_BorderLine( *m_rWW8Export.pO, pAllBorder, 0, NS_sprm::LN_CBrc80, NS_sprm::LN_CBrc, bShadow );
+ WW8Export::Out_BorderLine( *m_rWW8Export.pO, pAllBorder, 0, NS_sprm::sprmCBrc80, NS_sprm::sprmCBrc, bShadow );
}
void WW8AttributeOutput::CharHighlight( const SvxBrushItem& rBrush )
@@ -1184,14 +1184,14 @@ void WW8AttributeOutput::CharHighlight( const SvxBrushItem& rBrush )
{
sal_uInt8 nColor = msfilter::util::TransColToIco( rBrush.GetColor() );
// sprmCHighlight
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHighlight );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHighlight );
m_rWW8Export.pO->push_back( nColor );
}
}
void WW8AttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CKul );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCKul );
const SfxPoolItem* pItem = m_rWW8Export.HasItem( RES_CHRATR_WORDLINEMODE );
bool bWord = false;
@@ -1267,7 +1267,7 @@ void WW8AttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
Color aColor = rUnderline.GetColor();
if( aColor != COL_TRANSPARENT )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CCvUl );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCCvUl );
m_rWW8Export.InsUInt32( wwUtility::RGBToBGR( aColor.GetColor() ) );
}
@@ -1279,13 +1279,13 @@ void WW8AttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
switch ( rLanguage.Which() )
{
case RES_CHRATR_LANGUAGE:
- nId = NS_sprm::LN_CRgLid0_80;
+ nId = NS_sprm::sprmCRgLid0_80;
break;
case RES_CHRATR_CJK_LANGUAGE:
- nId = NS_sprm::LN_CRgLid1_80;
+ nId = NS_sprm::sprmCRgLid1_80;
break;
case RES_CHRATR_CTL_LANGUAGE:
- nId = NS_sprm::LN_CLidBi;
+ nId = NS_sprm::sprmCLidBi;
break;
}
@@ -1297,14 +1297,14 @@ void WW8AttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
// Word 2000 and above apparently require both old and new versions of
// these sprms to be set, without it spellchecking doesn't work
- if ( nId == NS_sprm::LN_CRgLid0_80 )
+ if ( nId == NS_sprm::sprmCRgLid0_80 )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgLid0 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid0 );
m_rWW8Export.InsUInt16( rLanguage.GetLanguage() );
}
- else if ( nId == NS_sprm::LN_CRgLid1_80 )
+ else if ( nId == NS_sprm::sprmCRgLid1_80 )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CRgLid1 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid1 );
m_rWW8Export.InsUInt16( rLanguage.GetLanguage() );
}
}
@@ -1330,7 +1330,7 @@ void WW8AttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement )
if ( 0xFF != b )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CIss );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCIss );
m_rWW8Export.pO->push_back( b );
}
@@ -1339,13 +1339,13 @@ void WW8AttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement )
{
long nHeight = static_cast<const SvxFontHeightItem&>(m_rWW8Export.GetItem(
RES_CHRATR_FONTSIZE )).GetHeight();
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsPos );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsPos );
m_rWW8Export.InsUInt16( (short)(( nHeight * nEsc + 500 ) / 1000 ));
if( 100 != nProp || !b )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CHps );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCHps );
m_rWW8Export.InsUInt16(
msword_cast<sal_uInt16>((nHeight * nProp + 500 ) / 1000));
@@ -1360,10 +1360,10 @@ void WW8AttributeOutput::CharFontSize( const SvxFontHeightItem& rHeight )
{
case RES_CHRATR_FONTSIZE:
case RES_CHRATR_CJK_FONTSIZE:
- nId = NS_sprm::LN_CHps;
+ nId = NS_sprm::sprmCHps;
break;
case RES_CHRATR_CTL_FONTSIZE:
- nId = NS_sprm::LN_CHpsBi;
+ nId = NS_sprm::sprmCHpsBi;
break;
}
@@ -1377,7 +1377,7 @@ void WW8AttributeOutput::CharFontSize( const SvxFontHeightItem& rHeight )
void WW8AttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CCharScale );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCCharScale );
m_rWW8Export.InsUInt16( rScaleWidth.GetValue() );
}
@@ -1386,8 +1386,8 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
sal_uInt16 nId;
switch ( rRelief.GetValue() )
{
- case FontRelief::Embossed: nId = NS_sprm::LN_CFEmboss; break;
- case FontRelief::Engraved: nId = NS_sprm::LN_CFImprint; break;
+ case FontRelief::Embossed: nId = NS_sprm::sprmCFEmboss; break;
+ case FontRelief::Engraved: nId = NS_sprm::sprmCFImprint; break;
default: nId = 0; break;
}
@@ -1399,9 +1399,9 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
else
{
// switch both flags off
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFEmboss );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFEmboss );
m_rWW8Export.pO->push_back( (sal_uInt8)0x0 );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFImprint );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFImprint );
m_rWW8Export.pO->push_back( (sal_uInt8)0x0 );
}
}
@@ -1431,11 +1431,11 @@ void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate )
if (!m_rWW8Export.IsInTable())
{
- // #i36867 In word the text in a table is rotated via the TC or NS_sprm::LN_TTextFlow
- // This means you can only rotate all or none of the text adding NS_sprm::LN_CFELayout
+ // #i36867 In word the text in a table is rotated via the TC or NS_sprm::sprmTTextFlow
+ // This means you can only rotate all or none of the text adding NS_sprm::sprmCFELayout
// here corrupts the table, hence !m_rWW8Export.bIsInTable
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout );
m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6
m_rWW8Export.pO->push_back( (sal_uInt8)0x01 );
@@ -1461,7 +1461,7 @@ void WW8AttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisM
// case 1:
nVal = 1;
- m_rWW8Export.InsUInt16( NS_sprm::LN_CKcd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCKcd );
m_rWW8Export.pO->push_back( nVal );
}
@@ -1493,14 +1493,14 @@ sal_uInt32 SuitableBGColor(sal_uInt32 nIn)
void WW8AttributeOutput::CharColor( const SvxColorItem& rColor )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CIco );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCIco );
sal_uInt8 nColor = msfilter::util::TransColToIco( rColor.GetValue() );
m_rWW8Export.pO->push_back( nColor );
if (nColor)
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CCv );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCCv );
m_rWW8Export.InsUInt32( wwUtility::RGBToBGR( rColor.GetValue().GetColor() ) );
}
}
@@ -1511,12 +1511,12 @@ void WW8AttributeOutput::CharBackground( const SvxBrushItem& rBrush )
WW8Export::TransBrush( rBrush.GetColor(), aSHD );
// sprmCShd80
- m_rWW8Export.InsUInt16( NS_sprm::LN_CShd80 );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCShd80 );
m_rWW8Export.InsUInt16( aSHD.GetValue() );
//Quite a few unknowns, some might be transparency or something
//of that nature...
- m_rWW8Export.InsUInt16( NS_sprm::LN_CShd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCShd );
m_rWW8Export.pO->push_back( 10 );
m_rWW8Export.InsUInt32( 0xFF000000 );
m_rWW8Export.InsUInt32( SuitableBGColor( rBrush.GetColor().GetColor() ) );
@@ -1538,7 +1538,7 @@ void WW8AttributeOutput::TextINetFormat( const SwFormatINetFormat& rINet )
? m_rWW8Export.m_pDoc->FindCharFormatByName( rStr )
: m_rWW8Export.m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
- m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCIstd );
m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pFormat ) );
}
@@ -1567,7 +1567,7 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
if ( bIncludeEmptyPicLocation &&
( c == 0x13 || c == 0x14 || c == 0x15 ) )
{
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CPicLocation );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCPicLocation );
SwWW8Writer::InsUInt32( aItems, 0x00000000 );
}
@@ -1606,11 +1606,11 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
rStrm.Seek( nCurrPos );
// write attributes of hyperlink character 0x01
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFieldVanish );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFFldVanish );
aItems.push_back( (sal_uInt8)0x81 );
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CPicLocation );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCPicLocation );
SwWW8Writer::InsUInt32( aItems, nLinkPosInDataStrm );
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFData );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFData );
aItems.push_back( (sal_uInt8)0x01 );
}
@@ -1619,7 +1619,7 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
//is slightly lacking
//aItems.Remove(0, aItems.Count());
// fSpec-Attribute true
- SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFSpec );
+ SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFSpec );
aItems.push_back( 1 );
rWrt.m_pChpPlc->AppendFkpEntry(rWrt.Strm().Tell(), aItems.size(), aItems.data());
@@ -1768,13 +1768,13 @@ void WW8Export::OutputField( const SwField* pField, ww::eField eFieldType,
sal_uInt8 aArr[12];
sal_uInt8 *pArr = aArr;
- Set_UInt16( pArr, NS_sprm::LN_CPicLocation );
+ Set_UInt16( pArr, NS_sprm::sprmCPicLocation );
Set_UInt32( pArr, 0x0 );
- Set_UInt16( pArr, NS_sprm::LN_CFSpec );
+ Set_UInt16( pArr, NS_sprm::sprmCFSpec );
Set_UInt8( pArr, 1 );
- Set_UInt16( pArr, NS_sprm::LN_CFNoProof );
+ Set_UInt16( pArr, NS_sprm::sprmCFNoProof );
Set_UInt8( pArr, 1 );
m_pChpPlc->AppendFkpEntry( Strm().Tell(), static_cast< short >(pArr - aArr), aArr );
@@ -2351,7 +2351,7 @@ void WW8Export::WritePostItBegin( ww::bytes* pOut )
sal_uInt8* pArr = aArr;
// sprmCFSpec true
- Set_UInt16( pArr, NS_sprm::LN_CFSpec );
+ Set_UInt16( pArr, NS_sprm::sprmCFSpec );
Set_UInt8( pArr, 1 );
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
@@ -2941,26 +2941,26 @@ void AttributeOutputBase::TextFlyContent( const SwFormatFlyCnt& rFlyContent )
void WW8AttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
{
// sprmPFNoAutoHyph
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFNoAutoHyph );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFNoAutoHyph );
m_rWW8Export.pO->push_back( rHyphenZone.IsHyphen() ? 0 : 1 );
}
void WW8AttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFAutoSpaceDE );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFAutoSpaceDE );
m_rWW8Export.pO->push_back( rScriptSpace.GetValue() ? 1 : 0 );
}
void WW8AttributeOutput::ParaHangingPunctuation( const SfxBoolItem& rItem )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFOverflowPunct );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFOverflowPunct );
m_rWW8Export.pO->push_back( rItem.GetValue() ? 1 : 0 );
}
void WW8AttributeOutput::ParaForbiddenRules( const SfxBoolItem& rItem )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFKinsoku );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFKinsoku );
m_rWW8Export.pO->push_back( rItem.GetValue() ? 1 : 0 );
}
@@ -2968,7 +2968,7 @@ void WW8AttributeOutput::ParaSnapToGrid( const SvxParaGridItem& rGrid )
{
// sprmPFUsePgsuSettings
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFUsePgsuSettings );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFUsePgsuSettings );
m_rWW8Export.pO->push_back( rGrid.GetValue() ? 1 : 0 );
}
@@ -2976,7 +2976,7 @@ void WW8AttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
{
// sprmPWAlignFont
- m_rWW8Export.InsUInt16( NS_sprm::LN_PWAlignFont );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPWAlignFont );
SvxParaVertAlignItem::Align nAlign = rAlign.GetValue();
sal_uInt16 nVal;
@@ -3033,7 +3033,7 @@ void WW8Export::WriteFootnoteBegin( const SwFormatFootnote& rFootnote, ww::bytes
const SwCharFormat* pCFormat = pOutArr
? pInfo->GetAnchorCharFormat( *m_pDoc )
: pInfo->GetCharFormat( *m_pDoc );
- SwWW8Writer::InsUInt16( aAttrArr, NS_sprm::LN_CIstd );
+ SwWW8Writer::InsUInt16( aAttrArr, NS_sprm::sprmCIstd );
SwWW8Writer::InsUInt16( aAttrArr, GetId( pCFormat ) );
// fSpec-Attribut true
@@ -3150,7 +3150,7 @@ void WW8AttributeOutput::TextCharFormat( const SwFormatCharFormat& rCharFormat )
{
if( rCharFormat.GetCharFormat() )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCIstd );
m_rWW8Export.InsUInt16( m_rWW8Export.GetId( rCharFormat.GetCharFormat() ) );
}
@@ -3164,7 +3164,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
// #i28331# - check that bOn is set
if ( rTwoLines.GetValue() )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout );
m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6
m_rWW8Export.pO->push_back( (sal_uInt8)0x02 );
@@ -3276,9 +3276,9 @@ void WW8AttributeOutput::ParaNumRule_Impl(const SwTextNode* /*pTextNd*/,
sal_Int32 const nLvl, sal_Int32 const nNumId)
{
// write sprmPIlvl and sprmPIlfo
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlvl );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmPIlvl );
m_rWW8Export.pO->push_back( ::sal::static_int_cast<sal_uInt8>(nLvl) );
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlfo );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmPIlfo );
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, ::sal::static_int_cast<sal_uInt16>(nNumId) );
}
@@ -3295,14 +3295,14 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
if ( rSize.GetWidth() && rSize.GetWidthSizeType() == ATT_FIX_SIZE)
{
//"sprmPDxaWidth"
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaWidth );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDxaWidth );
m_rWW8Export.InsUInt16( (sal_uInt16)rSize.GetWidth() );
}
if ( rSize.GetHeight() )
{
// sprmPWHeightAbs
- m_rWW8Export.InsUInt16( NS_sprm::LN_PWHeightAbs );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPWHeightAbs );
sal_uInt16 nH = 0;
switch ( rSize.GetHeightSizeType() )
@@ -3319,17 +3319,17 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
if( m_rWW8Export.m_pAktPageDesc->GetLandscape() )
{
/*sprmSBOrientation*/
- m_rWW8Export.InsUInt16( NS_sprm::LN_SBOrientation );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSBOrientation );
m_rWW8Export.pO->push_back( 2 );
}
/*sprmSXaPage*/
- m_rWW8Export.InsUInt16( NS_sprm::LN_SXaPage );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSXaPage );
m_rWW8Export.InsUInt16(
msword_cast<sal_uInt16>(SvxPaperInfo::GetSloppyPaperDimension(rSize.GetWidth())));
/*sprmSYaPage*/
- m_rWW8Export.InsUInt16( NS_sprm::LN_SYaPage );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSYaPage );
m_rWW8Export.InsUInt16(
msword_cast<sal_uInt16>(SvxPaperInfo::GetSloppyPaperDimension(rSize.GetHeight())));
}
@@ -3429,7 +3429,7 @@ void AttributeOutputBase::FormatPageDescription( const SwFormatPageDesc& rPageDe
void WW8AttributeOutput::PageBreakBefore( bool bBreak )
{
// sprmPPageBreakBefore/sprmPFPageBreakBefore
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFPageBreakBefore );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFPageBreakBefore );
m_rWW8Export.pO->push_back( bBreak ? 1 : 0 );
}
@@ -3583,14 +3583,14 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
nGridType = 1;
break;
}
- m_rWW8Export.InsUInt16( NS_sprm::LN_SClm );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSClm );
m_rWW8Export.InsUInt16( nGridType );
sal_uInt16 nHeight = rGrid.GetBaseHeight() + rGrid.GetRubyHeight();
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDyaLinePitch );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDyaLinePitch );
m_rWW8Export.InsUInt16( nHeight );
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxtCharSpace );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxtCharSpace );
m_rWW8Export.InsUInt32( GridCharacterPitch( rGrid ) );
}
}
@@ -3611,7 +3611,7 @@ void WW8AttributeOutput::FormatPaperBin( const SvxPaperBinItem& rPaperBin )
if ( nVal )
{
m_rWW8Export.InsUInt16( m_rWW8Export.m_bOutFirstPage
- ? NS_sprm::LN_SDmBinFirst : NS_sprm::LN_SDmBinOther );
+ ? NS_sprm::sprmSDmBinFirst : NS_sprm::sprmSDmBinOther );
m_rWW8Export.InsUInt16( nVal );
}
@@ -3644,11 +3644,11 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR )
nRDist = nRDist + (sal_uInt16)rLR.GetRight();
// sprmSDxaLeft
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxaLeft );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaLeft );
m_rWW8Export.InsUInt16( nLDist );
// sprmSDxaRight
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxaRight );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaRight );
m_rWW8Export.InsUInt16( nRDist );
}
else
@@ -3674,7 +3674,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
if ( m_rWW8Export.m_bOutFlyFrameAttrs ) // Flys
{
// sprmPDyaFromText
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaFromText );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaFromText );
// Mittelwert nehmen, da WW nur 1 Wert kennt
m_rWW8Export.InsUInt16( (sal_uInt16) ( ( rUL.GetUpper() + rUL.GetLower() ) / 2 ) );
}
@@ -3689,37 +3689,37 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
if ( aDistances.HasHeader() )
{
//sprmSDyaHdrTop
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDyaHdrTop );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDyaHdrTop );
m_rWW8Export.InsUInt16( aDistances.dyaHdrTop );
}
// sprmSDyaTop
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDyaTop );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDyaTop );
m_rWW8Export.InsUInt16( aDistances.dyaTop );
if ( aDistances.HasFooter() )
{
//sprmSDyaHdrBottom
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDyaHdrBottom );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDyaHdrBottom );
m_rWW8Export.InsUInt16( aDistances.dyaHdrBottom );
}
//sprmSDyaBottom
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDyaBottom );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDyaBottom );
m_rWW8Export.InsUInt16( aDistances.dyaBottom );
}
else
{
// sprmPDyaBefore
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaBefore );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaBefore );
m_rWW8Export.InsUInt16( rUL.GetUpper() );
// sprmPDyaAfter
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaAfter );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaAfter );
m_rWW8Export.InsUInt16( rUL.GetLower() );
// sprmPFContextualSpacing
if (rUL.GetContext())
{
- m_rWW8Export.InsUInt16(NS_sprm::LN_PContextualSpacing);
+ m_rWW8Export.InsUInt16(NS_sprm::sprmPFContextualSpacing);
m_rWW8Export.pO->push_back( (sal_uInt8)rUL.GetContext() );
}
}
@@ -3731,7 +3731,7 @@ void WW8AttributeOutput::FormatSurround( const SwFormatSurround& rSurround )
{
if ( m_rWW8Export.m_bOutFlyFrameAttrs )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PWr );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPWr );
m_rWW8Export.pO->push_back(
( SURROUND_NONE != rSurround.GetSurround() ) ? 2 : 1 );
@@ -3766,7 +3766,7 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVe
}
// sprmPDyaAbs
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaAbs );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaAbs );
m_rWW8Export.InsUInt16( nPos );
}
}
@@ -3804,7 +3804,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyH
}
// sprmPDxaAbs
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaAbs );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDxaAbs );
m_rWW8Export.InsUInt16( nPos );
}
}
@@ -3835,7 +3835,7 @@ void WW8AttributeOutput::FormatAnchor( const SwFormatAnchor& rAnchor )
}
// sprmPPc
- m_rWW8Export.InsUInt16( NS_sprm::LN_PPc );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPPc );
m_rWW8Export.pO->push_back( nP );
}
}
@@ -3849,7 +3849,7 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
WW8Export::TransBrush( rBrush.GetColor(), aSHD );
// sprmPShd
- m_rWW8Export.InsUInt16( NS_sprm::LN_PShd );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPShd80 );
m_rWW8Export.InsUInt16( aSHD.GetValue() );
// Quite a few unknowns, some might be transparency or something
@@ -3977,10 +3977,10 @@ void WW8Export::Out_BorderLine(ww::bytes& rO, const SvxBorderLine* pLine,
{
OSL_ENSURE( ( nSprmNo == 0 ) ||
( nSprmNo >= 38 && nSprmNo <= 41 ) ||
- ( nSprmNo >= NS_sprm::LN_PBrcTop80
- && nSprmNo <= NS_sprm::LN_PBrcRight80 ) ||
- ( nSprmNo >= NS_sprm::LN_SBrcTop80
- && nSprmNo <= NS_sprm::LN_SBrcRight80 ),
+ ( nSprmNo >= NS_sprm::sprmPBrcTop80
+ && nSprmNo <= NS_sprm::sprmPBrcRight80 ) ||
+ ( nSprmNo >= NS_sprm::sprmSBrcTop80
+ && nSprmNo <= NS_sprm::sprmSBrcRight80 ),
"Sprm for border out is of range" );
WW8_BRCVer9 aBrcVer9;
@@ -4019,20 +4019,20 @@ void WW8Export::Out_SwFormatBox(const SvxBoxItem& rBox, bool bShadow)
static const sal_uInt16 aPBrc[] =
{
// WW8 SPRMs
- NS_sprm::LN_PBrcTop80, NS_sprm::LN_PBrcLeft80,
- NS_sprm::LN_PBrcBottom80, NS_sprm::LN_PBrcRight80,
+ NS_sprm::sprmPBrcTop80, NS_sprm::sprmPBrcLeft80,
+ NS_sprm::sprmPBrcBottom80, NS_sprm::sprmPBrcRight80,
// WW9 SPRMs
- NS_sprm::LN_PBrcTop, NS_sprm::LN_PBrcLeft,
- NS_sprm::LN_PBrcBottom, NS_sprm::LN_PBrcRight
+ NS_sprm::sprmPBrcTop, NS_sprm::sprmPBrcLeft,
+ NS_sprm::sprmPBrcBottom, NS_sprm::sprmPBrcRight
};
static const sal_uInt16 aSBrc[] =
{
// WW8 SPRMs
- NS_sprm::LN_SBrcTop80, NS_sprm::LN_SBrcLeft80,
- NS_sprm::LN_SBrcBottom80, NS_sprm::LN_SBrcRight80,
+ NS_sprm::sprmSBrcTop80, NS_sprm::sprmSBrcLeft80,
+ NS_sprm::sprmSBrcBottom80, NS_sprm::sprmSBrcRight80,
// WW9 SPRMs
- NS_sprm::LN_SBrcTop, NS_sprm::LN_SBrcLeft,
- NS_sprm::LN_SBrcBottom, NS_sprm::LN_SBrcRight
+ NS_sprm::sprmSBrcTop, NS_sprm::sprmSBrcLeft,
+ NS_sprm::sprmSBrcBottom, NS_sprm::sprmSBrcRight
};
const SvxBoxItemLine* pBrd = aBorders;
@@ -4100,7 +4100,7 @@ void WW8Export::Out_CellRangeBorders( const SvxBoxItem * pBox, sal_uInt8 nStart,
if (!pLn)
continue;
- InsUInt16( NS_sprm::LN_TSetBrc );
+ InsUInt16( NS_sprm::sprmTSetBrc );
pO->push_back( 11 );
pO->push_back( nStart );
pO->push_back( nLimit );
@@ -4144,21 +4144,21 @@ SwTwips WW8Export::CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const
void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize )
{
// CColumns
- m_rWW8Export.InsUInt16( NS_sprm::LN_SCcolumns );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSCcolumns );
m_rWW8Export.InsUInt16( nCols - 1 );
// DxaColumns
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxaColumns );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaColumns );
m_rWW8Export.InsUInt16( rCol.GetGutterWidth( true ) );
// LBetween
- m_rWW8Export.InsUInt16( NS_sprm::LN_SLBetween );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSLBetween );
m_rWW8Export.pO->push_back( COLADJ_NONE == rCol.GetLineAdj( )? 0 : 1 );
const SwColumns & rColumns = rCol.GetColumns( );
// FEvenlySpaced
- m_rWW8Export.InsUInt16( NS_sprm::LN_SFEvenlySpaced );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSFEvenlySpaced );
m_rWW8Export.pO->push_back( bEven ? 1 : 0 );
if ( !bEven )
@@ -4166,7 +4166,7 @@ void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol
for ( sal_uInt16 n = 0; n < nCols; ++n )
{
//sprmSDxaColWidth
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxaColWidth );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaColWidth );
m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(n) );
m_rWW8Export.InsUInt16( rCol.
CalcPrtColWidth( n,
@@ -4175,7 +4175,7 @@ void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol
if ( n + 1 != nCols )
{
//sprmSDxaColSpacing
- m_rWW8Export.InsUInt16( NS_sprm::LN_SDxaColSpacing );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaColSpacing );
m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(n) );
m_rWW8Export.InsUInt16( rColumns[n].GetRight( ) +
rColumns[n + 1].GetLeft( ) );
@@ -4255,7 +4255,7 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol )
void WW8AttributeOutput::FormatKeep( const SvxFormatKeepItem& rKeep )
{
// sprmFKeepFollow
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFKeepFollow );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFKeepFollow );
m_rWW8Export.pO->push_back( rKeep.GetValue() ? 1 : 0 );
}
@@ -4264,7 +4264,7 @@ void WW8AttributeOutput::FormatKeep( const SvxFormatKeepItem& rKeep )
void WW8AttributeOutput::FormatLineNumbering( const SwFormatLineNumber& rNumbering )
{
// sprmPFNoLineNumb
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFNoLineNumb );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFNoLineNumb );
m_rWW8Export.pO->push_back( rNumbering.IsCount() ? 0 : 1 );
}
@@ -4274,7 +4274,7 @@ void WW8AttributeOutput::FormatLineNumbering( const SwFormatLineNumber& rNumberi
void WW8AttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
{
// sprmPDyaLine
- m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaLine );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaLine );
m_rWW8Export.InsUInt16( nSpace );
m_rWW8Export.InsUInt16( nMulti );
@@ -4369,7 +4369,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
if ( 255 != nAdj ) // supported Attribut?
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PJc );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPJc80 );
m_rWW8Export.pO->push_back( nAdj );
/*
@@ -4377,7 +4377,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
for right to left paragraphs the bidi one is the reverse of the
normal one.
*/
- m_rWW8Export.InsUInt16( NS_sprm::LN_PJcExtra ); //bidi version ?
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPJc ); //bidi version ?
bool bBiDiSwap = false;
if ( m_rWW8Export.m_pOutFormatNode )
{
@@ -4462,14 +4462,14 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
if ( m_rWW8Export.m_bOutPageDescs )
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_STextFlow );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSTextFlow );
m_rWW8Export.InsUInt16( nTextFlow );
- m_rWW8Export.InsUInt16( NS_sprm::LN_SFBiDi );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmSFBiDi );
m_rWW8Export.pO->push_back( bBiDi ? 1 : 0 );
}
else if ( !m_rWW8Export.m_bOutFlyFrameAttrs ) //paragraph/style
{
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFBiDi );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFBiDi );
m_rWW8Export.pO->push_back( bBiDi ? 1 : 0 );
}
}
@@ -4490,7 +4490,7 @@ void WW8AttributeOutput::ParaOutlineLevel(const SfxUInt16Item& /*rItem*/)
void WW8AttributeOutput::ParaSplit( const SvxFormatSplitItem& rSplit )
{
// sprmPFKeep
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFKeep );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFKeep );
m_rWW8Export.pO->push_back( rSplit.GetValue() ? 0 : 1 );
}
@@ -4500,7 +4500,7 @@ void WW8AttributeOutput::ParaSplit( const SvxFormatSplitItem& rSplit )
void WW8AttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
{
// sprmPFWidowControl
- m_rWW8Export.InsUInt16( NS_sprm::LN_PFWidowControl );
+ m_rWW8Export.InsUInt16( NS_sprm::sprmPFWidowControl );
m_rWW8Export.pO->push_back( rWidows.GetValue() ? 1 : 0 );
}
@@ -4615,7 +4615,7 @@ void SwWW8WrTabu::PutAll(WW8Export& rWrt)
if (nSiz > 255)
nSiz = 255;
- rWrt.InsUInt16(NS_sprm::LN_PChgTabsPapx);
+ rWrt.InsUInt16(NS_sprm::sprmPChgTabsPapx);
// cch eintragen
rWrt.pO->push_back(msword_cast<sal_uInt8>(nSiz));
// DelArr schreiben
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 3bd74491fcbf..e1c1f8900bff 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -95,6 +95,7 @@
#include <o3tl/enumrange.hxx>
#include <memory>
#include <filter/msfilter/escherex.hxx>
+#include <sprmids.hxx>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -1051,7 +1052,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
break;
case 68: // Read_Pic()
case 0x6A03:
- case 0x680E:
+ case NS_sprm::LN_CObjLocation:
Read_PicLoc(nAktId, pParams, 1);
break;
}
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b0bb013b5df6..e6b3b99ceee4 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -961,7 +961,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
else
{
// this is ROW numbering ?
- pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E); // sprmAnld
+ pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : NS_sprm::LN_PAnld); // sprmAnld
if (pS12 && 0 != reinterpret_cast<WW8_ANLD const *>(pS12)->fNumberAcross)
sNumRule.clear();
}
@@ -989,7 +989,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
if (m_pTableDesc)
{
if (!pS12)
- pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E); // sprmAnld
+ pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : NS_sprm::LN_PAnld); // sprmAnld
if (!pS12 || !reinterpret_cast<WW8_ANLD const *>(pS12)->fNumberAcross)
m_pTableDesc->SetNumRuleName(pNumRule->GetName());
}
@@ -1025,7 +1025,7 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
{
// not defined yet
// sprmAnld o. 0
- const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E);
+ const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : NS_sprm::LN_PAnld);
SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), m_nSwNumLevel, false);
}
}
@@ -1049,7 +1049,7 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
else // no Olst -> use Anld
{
// sprmAnld
- const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : 0xC63E);
+ const sal_uInt8* pS12 = m_pPlcxMan->HasParaSprm(m_bVer67 ? 12 : NS_sprm::LN_PAnld);
SetAnld(pNumRule, reinterpret_cast<WW8_ANLD const *>(pS12), m_nSwNumLevel, false);
}
}
@@ -1629,47 +1629,47 @@ wwTableSprm GetTableSprm(sal_uInt16 nId, ww::WordVersion eVer)
case ww::eWW8:
switch (nId)
{
- case NS_sprm::LN_TTableWidth:
+ case NS_sprm::sprmTTableWidth:
return sprmTTableWidth;
- case NS_sprm::LN_TTextFlow:
+ case NS_sprm::sprmTTextFlow:
return sprmTTextFlow;
- case NS_sprm::LN_TTableHeader:
+ case NS_sprm::sprmTTableHeader:
return sprmTTableHeader;
- case NS_sprm::LN_TFCantSplit:
+ case NS_sprm::sprmTFCantSplit90:
return sprmTFCantSplit;
- case NS_sprm::LN_TJc90:
+ case NS_sprm::sprmTJc90:
return sprmTJc;
- case NS_sprm::LN_TFBiDi:
+ case NS_sprm::sprmTFBiDi:
return sprmTFBiDi;
- case NS_sprm::LN_TDelete:
+ case NS_sprm::sprmTDelete:
return sprmTDelete;
- case NS_sprm::LN_TInsert:
+ case NS_sprm::sprmTInsert:
return sprmTInsert;
- case NS_sprm::LN_TDxaCol:
+ case NS_sprm::sprmTDxaCol:
return sprmTDxaCol;
- case NS_sprm::LN_TDyaRowHeight:
+ case NS_sprm::sprmTDyaRowHeight:
return sprmTDyaRowHeight;
- case NS_sprm::LN_TDxaLeft:
+ case NS_sprm::sprmTDxaLeft:
return sprmTDxaLeft;
- case NS_sprm::LN_TDxaGapHalf:
+ case NS_sprm::sprmTDxaGapHalf:
return sprmTDxaGapHalf;
- case NS_sprm::LN_TTableBorders80:
+ case NS_sprm::sprmTTableBorders80:
return sprmTTableBorders;
- case NS_sprm::LN_TDefTable:
+ case NS_sprm::sprmTDefTable:
return sprmTDefTable;
- case NS_sprm::LN_TDefTableShd80:
+ case NS_sprm::sprmTDefTableShd80:
return sprmTDefTableShd;
- case NS_sprm::LN_TDefTableShd:
+ case NS_sprm::sprmTDefTableShd:
return sprmTDefTableNewShd;
- case NS_sprm::LN_TTableBorders:
+ case NS_sprm::sprmTTableBorders:
return sprmTTableBorders90;
- case NS_sprm::LN_TSetBrc80:
+ case NS_sprm::sprmTSetBrc80:
return sprmTSetBrc;
- case NS_sprm::LN_TSetBrc:
+ case NS_sprm::sprmTSetBrc:
return sprmTSetBrc90;
- case NS_sprm::LN_TCellPadding:
+ case NS_sprm::sprmTCellPadding:
return sprmTCellPadding;
- case NS_sprm::LN_TCellPaddingDefault:
+ case NS_sprm::sprmTCellPaddingDefault:
return sprmTCellPaddingDefault;
}
break;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 32eb95805e9f..e331b9de6e45 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -665,8 +665,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet,
return false;
//For i120928,parse the graphic info of bullets
- sal_uInt8 *pSprmWhichPis = GrpprlHasSprm(NS_sprm::LN_CPbiIBullet, aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
- sal_uInt8 *pSprmIsPicBullet = GrpprlHasSprm(NS_sprm::LN_CPbiGrf, aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
+ sal_uInt8 *pSprmWhichPis = GrpprlHasSprm(NS_sprm::sprmCPbiIBullet, aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
+ sal_uInt8 *pSprmIsPicBullet = GrpprlHasSprm(NS_sprm::sprmCPbiGrf, aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
if (pSprmWhichPis)
{
nWitchPicIsBullet = *pSprmWhichPis;
@@ -2065,7 +2065,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
m_nListLevel = WW8ListManager::nMaxLevel;
}
}
- else if (m_pPlcxMan && m_pPlcxMan->HasParaSprm(0xC63E))
+ else if (m_pPlcxMan && m_pPlcxMan->HasParaSprm(NS_sprm::LN_PAnld))
{
/*
#i8114# Horrific backwards compatible ww7- lists in ww8+
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 7a4c6c002677..b27d98362854 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -500,7 +500,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
m_pPlcxMan->HasCharSprm( bIns ? 0x4804 : 0x4863, aResult);
pSprmCIbstRMark = aResult.empty() ? nullptr : aResult.back();
aResult.clear();
- m_pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::LN_CDttmRMarkDel, aResult);
+ m_pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::sprmCDttmRMarkDel, aResult);
pSprmCDttmRMark = aResult.empty() ? nullptr : aResult.back();
}
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d1f9e76ba051..d55d2bf79fa2 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1254,8 +1254,8 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP*
sal_uInt8* pSprm[4];
if( pSep->Find4Sprms(
- NS_sprm::LN_SBrcTop80, NS_sprm::LN_SBrcLeft80,
- NS_sprm::LN_SBrcBottom80, NS_sprm::LN_SBrcRight80,
+ NS_sprm::sprmSBrcTop80, NS_sprm::sprmSBrcLeft80,
+ NS_sprm::sprmSBrcBottom80, NS_sprm::sprmSBrcRight80,
pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) )
{
for( int i = 0; i < 4; ++i )
@@ -1263,8 +1263,8 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP*
}
// Version 9 BRCs if present will override version 8
if( pSep->Find4Sprms(
- NS_sprm::LN_SBrcTop, NS_sprm::LN_SBrcLeft,
- NS_sprm::LN_SBrcBottom, NS_sprm::LN_SBrcRight,
+ NS_sprm::sprmSBrcTop, NS_sprm::sprmSBrcLeft,
+ NS_sprm::sprmSBrcBottom, NS_sprm::sprmSBrcRight,
pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) )
{
for( int i = 0; i < 4; ++i )
@@ -1579,17 +1579,17 @@ void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8PLCFx_Cp_FKP* pPap)
}
else
{
- SetValSprm( &nSp26, pPap, NS_sprm::LN_PDxaAbs ); // X-position
+ SetValSprm( &nSp26, pPap, NS_sprm::sprmPDxaAbs ); // X-position
//set in me or in parent style
- mbVertSet |= SetValSprm( &nSp27, pPap, NS_sprm::LN_PDyaAbs ); // Y-position
- SetValSprm( &nSp45, pPap, NS_sprm::LN_PWHeightAbs ); // height
- SetValSprm( &nSp28, pPap, NS_sprm::LN_PDxaWidth ); // width
- SetValSprm( &nLeMgn, pPap, NS_sprm::LN_PDxaFromText ); // L-border
- SetValSprm( &nRiMgn, pPap, NS_sprm::LN_PDxaFromText ); // R-border
- SetValSprm( &nUpMgn, pPap, NS_sprm::LN_PDyaFromText ); // U-border
- SetValSprm( &nLoMgn, pPap, NS_sprm::LN_PDyaFromText ); // D-border
-
- pS = pPap->HasSprm( NS_sprm::LN_PWr ); // wrapping
+ mbVertSet |= SetValSprm( &nSp27, pPap, NS_sprm::sprmPDyaAbs ); // Y-position
+ SetValSprm( &nSp45, pPap, NS_sprm::sprmPWHeightAbs ); // height
+ SetValSprm( &nSp28, pPap, NS_sprm::sprmPDxaWidth ); // width
+ SetValSprm( &nLeMgn, pPap, NS_sprm::sprmPDxaFromText ); // L-border
+ SetValSprm( &nRiMgn, pPap, NS_sprm::sprmPDxaFromText ); // R-border
+ SetValSprm( &nUpMgn, pPap, NS_sprm::sprmPDyaFromText ); // U-border
+ SetValSprm( &nLoMgn, pPap, NS_sprm::sprmPDyaFromText ); // D-border
+
+ pS = pPap->HasSprm( NS_sprm::sprmPWr ); // wrapping
if( pS )
nSp37 = *pS;
}
@@ -3411,7 +3411,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
void SwWW8ImplReader::Read_TextColor( sal_uInt16, const sal_uInt8* pData, short nLen )
{
//Has newer colour variant, ignore this old variant
- if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv))
+ if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::sprmCCv))
return;
if( nLen < 0 )
@@ -4885,7 +4885,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
SvxBoxItem aBoxItem(RES_CHRATR_BOX);
aBoxItem = *pBox;
WW8_BRCVer9 aBrc;
- int nBrcVer = (nId == NS_sprm::LN_CBrc) ? 9 : (m_bVer67 ? 6 : 8);
+ int nBrcVer = (nId == NS_sprm::sprmCBrc) ? 9 : (m_bVer67 ? 6 : 8);
SetWW8_BRC(nBrcVer, aBrc, pData);
@@ -5061,7 +5061,7 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap)
pTabPos->nLoMgn = SVBT16ToShort(pRes);
bRet = true;
}
- if (nullptr != (pRes = pPap->HasSprm(NS_sprm::LN_TDefTable)))
+ if (nullptr != (pRes = pPap->HasSprm(NS_sprm::sprmTDefTable)))
{
WW8TabBandDesc aDesc;
aDesc.ReadDef(false, pRes);
@@ -5680,7 +5680,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//PAP to be produced; byte;
{0x2403, &SwWW8ImplReader::Read_Justify}, //"sprmPJc" pap.jc;jc
//(justification);byte;
- {0x2404, nullptr}, //"sprmPFSideBySide"
+ {NS_sprm::LN_PFSideBySide, nullptr}, //"sprmPFSideBySide"
//pap.fSideBySide;0 or 1;byte;
{0x2405, &SwWW8ImplReader::Read_KeepLines}, //"sprmPFKeep" pap.fKeep;0 or
//1;byte;
@@ -5689,9 +5689,9 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x2407, &SwWW8ImplReader::Read_BreakBefore},//"sprmPFPageBreakBefore"
//pap.fPageBreakBefore;0 or 1;
//byte;
- {0x2408, nullptr}, //"sprmPBrcl" pap.brcl;brcl;
+ {NS_sprm::LN_PBrcl, nullptr}, //"sprmPBrcl" pap.brcl;brcl;
//byte;
- {0x2409, nullptr}, //"sprmPBrcp" pap.brcp;brcp;
+ {NS_sprm::LN_PBrcp, nullptr}, //"sprmPBrcp" pap.brcp;brcp;
//byte;
{0x260A, &SwWW8ImplReader::Read_ListLevel}, //"sprmPIlvl" pap.ilvl;ilvl;
//byte;
@@ -5736,17 +5736,17 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//dxa;word;
{0x261B, &SwWW8ImplReader::Read_ApoPPC}, //"sprmPPc" pap.pcHorz,
//pap.pcVert;complex;byte;
- {0x461C, nullptr}, //"sprmPBrcTop10" pap.brcTop;
+ {NS_sprm::LN_PBrcTop10, nullptr}, //"sprmPBrcTop10" pap.brcTop;
//BRC10;word;
- {0x461D, nullptr}, //"sprmPBrcLeft10" pap.brcLeft;
+ {NS_sprm::LN_PBrcLeft10, nullptr}, //"sprmPBrcLeft10" pap.brcLeft;
//BRC10;word;
- {0x461E, nullptr}, //"sprmPBrcBottom10"
+ {NS_sprm::LN_PBrcBottom10, nullptr}, //"sprmPBrcBottom10"
//pap.brcBottom;BRC10;word;
- {0x461F, nullptr}, //"sprmPBrcRight10"
+ {NS_sprm::LN_PBrcRight10, nullptr}, //"sprmPBrcRight10"
//pap.brcRight;BRC10;word;
- {0x4620, nullptr}, //"sprmPBrcBetween10"
+ {NS_sprm::LN_PBrcBetween10, nullptr}, //"sprmPBrcBetween10"
//pap.brcBetween;BRC10;word;
- {0x4621, nullptr}, //"sprmPBrcBar10" pap.brcBar;
+ {NS_sprm::LN_PBrcBar10, nullptr}, //"sprmPBrcBar10" pap.brcBar;
//BRC10;word;
{0x4622, nullptr}, //"sprmPDxaFromText10"
//pap.dxaFromText;dxa;word;
@@ -5777,7 +5777,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//0 or 1;byte;
{0x2431, &SwWW8ImplReader::Read_WidowControl},//"sprmPFWidowControl"
//pap.fWidowControl;0 or 1;byte
- {0xC632, nullptr}, //"sprmPRuler" variable length;
+ {NS_sprm::LN_PRuler, nullptr}, //"sprmPRuler" variable length;
{0x2433, &SwWW8ImplReader::Read_BoolItem}, //"sprmPFKinsoku" pap.fKinsoku;
//0 or 1;byte;
{0x2434, nullptr}, //"sprmPFWordWrap"
@@ -5791,17 +5791,17 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//pap.fAutoSpaceDE;0 or 1;byte;
{0x2438, nullptr}, //"sprmPFAutoSpaceDN"
//pap.fAutoSpaceDN;0 or 1;byte;
- {NS_sprm::LN_PWAlignFont, &SwWW8ImplReader::Read_AlignFont}, //"sprmPWAlignFont"
+ {NS_sprm::sprmPWAlignFont, &SwWW8ImplReader::Read_AlignFont}, //"sprmPWAlignFont"
//pap.wAlignFont;iFa; word;
{0x443A, nullptr}, //"sprmPFrameTextFlow"
//pap.fVertical pap.fBackward
//pap.fRotateFont;complex; word
- {0x243B, nullptr}, //"sprmPISnapBaseLine" obsolete
+ {NS_sprm::LN_PISnapBaseLine, nullptr}, //"sprmPISnapBaseLine" obsolete
//not applicable in Word97
//and later versions;;byte;
- {0xC63E, &SwWW8ImplReader::Read_ANLevelDesc},//"sprmPAnld" pap.anld;;
+ {NS_sprm::LN_PAnld, &SwWW8ImplReader::Read_ANLevelDesc},//"sprmPAnld" pap.anld;;
//variable length;
- {0xC63F, nullptr}, //"sprmPPropRMark"
+ {NS_sprm::LN_PPropRMark, nullptr}, //"sprmPPropRMark"
//pap.fPropRMark;complex;
//variable length;
{0x2640, &SwWW8ImplReader::Read_POutLvl}, //"sprmPOutLvl" pap.lvl;has no
@@ -5810,10 +5810,10 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x2441, &SwWW8ImplReader::Read_ParaBiDi}, //"sprmPFBiDi" ;;byte;
{0x2443, nullptr}, //"sprmPFNumRMIns"
//pap.fNumRMIns;1 or 0;bit;
- {0x2444, nullptr}, //"sprmPCrLf" ;;byte;
+ {NS_sprm::LN_PCrLf, nullptr}, //"sprmPCrLf" ;;byte;
{0xC645, nullptr}, //"sprmPNumRM" pap.numrm;;
//variable length;
- {0x6645, nullptr}, //"sprmPHugePapx" ;fc in the
+ {NS_sprm::LN_PHugePapx, nullptr}, //"sprmPHugePapx" ;fc in the
//data stream to locate the
//huge grpprl; long;
{0x6646, nullptr}, //"sprmPHugePapx" ;fc in the
@@ -5845,7 +5845,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//chp.idslRMReason;an index to
//a table of strings defined in
//Word 6.0 executables;short;
- {0xEA08, &SwWW8ImplReader::Read_CharSet}, //"sprmCChs" chp.fChsDiff and
+ {NS_sprm::LN_CChs, &SwWW8ImplReader::Read_CharSet}, //"sprmCChs" chp.fChsDiff and
//chp.chse;3 bytes;
{0x6A09, &SwWW8ImplReader::Read_Symbol}, //"sprmCSymbol" chp.fSpec,
//chp.xchSym and chp.ftcSym;
@@ -5853,7 +5853,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//recorded is always 4;
{0x080A, &SwWW8ImplReader::Read_Obj}, //"sprmCFOle2" chp.fOle2;1 or
//0;bit;
- //0x480B, //"sprmCIdCharType", obsolete:
+ //NS_sprm::LN_CIdCharType, //"sprmCIdCharType", obsolete:
//not applicable in Word97
//and later versions
{0x2A0C, &SwWW8ImplReader::Read_CharHighlight},//"sprmCHighlight"
@@ -5861,15 +5861,15 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//chp.icoHighlight;ico
//(fHighlight is set to 1 iff
//ico is not 0);byte;
- {0x680E, &SwWW8ImplReader::Read_PicLoc}, //"sprmCObjLocation" chp.fcObj;
+ {NS_sprm::LN_CObjLocation, &SwWW8ImplReader::Read_PicLoc}, //"sprmCObjLocation" chp.fcObj;
//FC;long;
- //0x2A10, ? ? ?, //"sprmCFFtcAsciSymb"
+ //NS_sprm::LN_CFFtcAsciSymb, ? ? ?, //"sprmCFFtcAsciSymb"
{0x4A30, &SwWW8ImplReader::Read_CColl}, //"sprmCIstd" chp.istd;istd,
//short;
{0xCA31, nullptr}, //"sprmCIstdPermute" chp.istd;
//permutation vector; variable
//length;
- {0x2A32, nullptr}, //"sprmCDefault" whole CHP;none
+ {NS_sprm::LN_CDefault, nullptr}, //"sprmCDefault" whole CHP;none
//;variable length;
{0x2A33, nullptr}, //"sprmCPlain" whole CHP;none;
//Laenge: 0;
@@ -5891,22 +5891,22 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//128, or 129; byte;
{0x083C, &SwWW8ImplReader::Read_BoldUsw}, //"sprmCFVanish" chp.fVanish;0,
//1, 128, or 129; byte;
- //0x4A3D, 0, //"sprmCFtcDefault" ftc, only
+ //NS_sprm::LN_CFtcDefault, 0, //"sprmCFtcDefault" ftc, only
//used internally, never
//stored in file;word;
{0x2A3E, &SwWW8ImplReader::Read_Underline}, //"sprmCKul" chp.kul;kul;byte;
- {0xEA3F, nullptr}, //"sprmCSizePos" chp.hps,
+ {NS_sprm::LN_CSizePos, nullptr}, //"sprmCSizePos" chp.hps,
//chp.hpsPos;3 bytes;
{0x8840, &SwWW8ImplReader::Read_Kern}, //"sprmCDxaSpace" chp.dxaSpace;
//dxa;word;
- {0x4A41, &SwWW8ImplReader::Read_Language}, //"sprmCLid" ;only used
+ {NS_sprm::LN_CLid, &SwWW8ImplReader::Read_Language}, //"sprmCLid" ;only used
//internally never stored;word;
{0x2A42, &SwWW8ImplReader::Read_TextColor}, //"sprmCIco" chp.ico;ico;byte;
{0x4A43, &SwWW8ImplReader::Read_FontSize}, //"sprmCHps" chp.hps;hps;byte;
- {0x2A44, nullptr}, //"sprmCHpsInc" chp.hps;byte;
+ {NS_sprm::LN_CHpsInc, nullptr}, //"sprmCHpsInc" chp.hps;byte;
{0x4845, &SwWW8ImplReader::Read_SubSuperProp},//"sprmCHpsPos" chp.hpsPos;
//hps; byte;
- {0x2A46, nullptr}, //"sprmCHpsPosAdj" chp.hpsPos;
+ {NS_sprm::LN_CHpsPosAdj, nullptr}, //"sprmCHpsPosAdj" chp.hpsPos;
//hps; byte;
{0xCA47, &SwWW8ImplReader::Read_Majority}, //"sprmCMajority" chp.fBold,
//chp.fItalic, chp.fSmallCaps,
@@ -5918,22 +5918,22 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//length, length byte plus
//size of following grpprl;
{0x2A48, &SwWW8ImplReader::Read_SubSuper}, //"sprmCIss" chp.iss;iss;byte;
- {0xCA49, nullptr}, //"sprmCHpsNew50" chp.hps;hps;
+ {NS_sprm::LN_CHpsNew50, nullptr}, //"sprmCHpsNew50" chp.hps;hps;
//variable width, length
//always recorded as 2;
- {0xCA4A, nullptr}, //"sprmCHpsInc1" chp.hps;
+ {NS_sprm::LN_CHpsInc1, nullptr}, //"sprmCHpsInc1" chp.hps;
//complex; variable width,
//length always recorded as 2;
{0x484B, &SwWW8ImplReader::Read_FontKern}, //"sprmCHpsKern" chp.hpsKern;
//hps;short;
- {0xCA4C, &SwWW8ImplReader::Read_Majority}, //"sprmCMajority50" chp.fBold,
+ {NS_sprm::LN_CMajority50, &SwWW8ImplReader::Read_Majority}, //"sprmCMajority50" chp.fBold,
//chp.fItalic, chp.fSmallCaps,
//chp.fVanish, chp.fStrike,
//chp.fCaps, chp.ftc, chp.hps,
//chp.hpsPos, chp.kul,
//chp.dxaSpace, chp.ico;
//complex; variable length;
- {0x4A4D, nullptr}, //"sprmCHpsMul" chp.hps;
+ {NS_sprm::LN_CHpsMul, nullptr}, //"sprmCHpsMul" chp.hps;
//percentage to grow hps;short;
{0x484E, nullptr}, //"sprmCYsri" chp.ysri;ysri;
//short;
@@ -5964,7 +5964,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x2859, &SwWW8ImplReader::Read_TextAnim}, //"sprmCSfxText" chp.sfxtText;
//text animation;byte;
{0x085A, &SwWW8ImplReader::Read_Bidi}, //"sprmCFBiDi"
- {0x085B, nullptr}, //"sprmCFDiacColor"
+ {NS_sprm::LN_CFDiacColor, nullptr}, //"sprmCFDiacColor"
{0x085C, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFBoldBi"
{0x085D, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFItalicBi"
{0x4A5E, &SwWW8ImplReader::Read_FontCode}, //"sprmCFtcBi"
@@ -5980,7 +5980,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x4863, nullptr}, //"sprmCIbstRMarkDel"
//chp.ibstRMarkDel;index into
//sttbRMark;short;
- {NS_sprm::LN_CDttmRMarkDel, nullptr},
+ {NS_sprm::sprmCDttmRMarkDel, nullptr},
//chp.dttmRMarkDel;DTTM;long;
{0x6865, &SwWW8ImplReader::Read_CharBorder}, //"sprmCBrc80" chp.brc;BRC;long;
{0xca72, &SwWW8ImplReader::Read_CharBorder}, //"sprmCBrc" chp.brc;BRC;long;
@@ -5993,7 +5993,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x0868, nullptr}, //"sprmCFUsePgsuSettings"
//chp.fUsePgsuSettings; 1 or 0;
//bit;
- {0x486B, nullptr}, //"sprmCCpg" ;;word;
+ {NS_sprm::LN_CCpg, nullptr}, //"sprmCCpg" ;;word;
{0x486D, &SwWW8ImplReader::Read_Language}, //"sprmCRgLid0_80" chp.rglid[0];
//LID: for non-Far East text;
//word;
@@ -6001,10 +6001,10 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//LID: for Far East text;word;
{0x286F, &SwWW8ImplReader::Read_IdctHint}, //"sprmCIdctHint" chp.idctHint;
//IDCT: byte;
- {0x2E00, nullptr}, //"sprmPicBrcl" pic.brcl;brcl
+ {NS_sprm::LN_PicBrcl, nullptr}, //"sprmPicBrcl" pic.brcl;brcl
//(see PIC structure
//definition);byte;
- {0xCE01, nullptr}, //"sprmPicScale" pic.mx,
+ {NS_sprm::LN_PicScale, nullptr}, //"sprmPicScale" pic.mx,
//pic.my, pic.dxaCropleft,
//pic.dyaCropTop
//pic.dxaCropRight,
@@ -6023,7 +6023,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x3001, nullptr}, //"sprmSiHeadingPgn"
//sep.iHeadingPgn;heading
//number level;byte;
- {0xD202, &SwWW8ImplReader::Read_OLST}, //"sprmSOlstAnm" sep.olstAnm;
+ {NS_sprm::LN_SOlstAnm, &SwWW8ImplReader::Read_OLST}, //"sprmSOlstAnm" sep.olstAnm;
//OLST;variable length;
{0xF203, nullptr}, //"sprmSDxaColWidth"
//sep.rgdxaColWidthSpacing;
@@ -6047,20 +6047,20 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//# of cols - 1;word;
{0x900C, nullptr}, //"sprmSDxaColumns"
//sep.dxaColumns;dxa;word;
- {0x300D, nullptr}, //"sprmSFAutoPgn" sep.fAutoPgn;
+ {NS_sprm::LN_SFAutoPgn, nullptr}, //"sprmSFAutoPgn" sep.fAutoPgn;
//obsolete;byte;
{0x300E, nullptr}, //"sprmSNfcPgn" sep.nfcPgn;nfc;
//byte;
- {0xB00F, nullptr}, //"sprmSDyaPgn" sep.dyaPgn;dya;
+ {NS_sprm::LN_SDyaPgn, nullptr}, //"sprmSDyaPgn" sep.dyaPgn;dya;
//short;
- {0xB010, nullptr}, //"sprmSDxaPgn" sep.dxaPgn;dya;
+ {NS_sprm::LN_SDxaPgn, nullptr}, //"sprmSDxaPgn" sep.dxaPgn;dya;
//short;
{0x3011, nullptr}, //"sprmSFPgnRestart"
//sep.fPgnRestart;0 or 1;byte;
{0x3012, nullptr}, //"sprmSFEndnote" sep.fEndnote;
//0 or 1;byte;
{0x3013, nullptr}, //"sprmSLnc" sep.lnc;lnc;byte;
- {0x3014, nullptr}, //"sprmSGprfIhdt" sep.grpfIhdt;
+ {NS_sprm::LN_SGprfIhdt, nullptr}, //"sprmSGprfIhdt" sep.grpfIhdt;
//grpfihdt; byte;
{0x5015, nullptr}, //"sprmSNLnnMod" sep.nLnnMod;
//non-neg int.;word;
@@ -6079,7 +6079,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//pgn;word;
{0x301D, nullptr}, //"sprmSBOrientation"
//sep.dmOrientPage;dm;byte;
- //0x301E, ? ? ?, //"sprmSBCustomize"
+ //NS_sprm::LN_SBCustomize, ? ? ?, //"sprmSBCustomize"
{0xB01F, nullptr}, //"sprmSXaPage" sep.xaPage;xa;
//word;
{0xB020, nullptr}, //"sprmSYaPage" sep.yaPage;ya;
@@ -6096,14 +6096,14 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//sep.dzaGutter;dza;word;
{0x5026, nullptr}, //"sprmSDmPaperReq"
//sep.dmPaperReq;dm;word;
- {0xD227, nullptr}, //"sprmSPropRMark"
+ {NS_sprm::LN_SPropRMark, nullptr}, //"sprmSPropRMark"
//sep.fPropRMark,
//sep.ibstPropRMark,
//sep.dttmPropRMark ;complex;
//variable length always
//recorded as 7 bytes;
//0x3228, ? ? ?, //"sprmSFBiDi",
- //0x3229, ? ? ?, //"sprmSFFacingCol"
+ //NS_sprm::LN_SFFacingCol, ? ? ?, //"sprmSFFacingCol"
{0x322A, nullptr}, //"sprmSFRTLGutter", set to 1
//if gutter is on the right.
{0x702B, nullptr}, //"sprmSBrcTop80" sep.brcTop;BRC;
@@ -6140,7 +6140,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0xD605, nullptr}, //"sprmTTableBorders80"
//tap.rgbrcTable;complex;
//24 bytes;
- {0xD606, nullptr}, //"sprmTDefTable10"
+ {NS_sprm::LN_TDefTable10, nullptr}, //"sprmTDefTable10"
//tap.rgdxaCenter,
//tap.rgtc;complex; variable
//length;
@@ -6153,7 +6153,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x740A, nullptr}, //"sprmTTlp" tap.tlp;TLP;
//4 bytes;
//0x560B, ? ? ?, //"sprmTFBiDi"
- //0x740C, ? ? ?, //"sprmTHTMLProps"
+ //NS_sprm::LN_THTMLProps, ? ? ?, //"sprmTHTMLProps"
{0xD620, nullptr}, //"sprmTSetBrc80"
//tap.rgtc[].rgbrc;complex;
//5 bytes;
@@ -6172,19 +6172,19 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x5625, nullptr}, //"sprmTSplit"
//tap.fFirstMerged,
//tap.fMerged;complex ;word;
- {0xD626, nullptr}, //"sprmTSetBrc10"
+ {NS_sprm::LN_TSetBrc10, nullptr}, //"sprmTSetBrc10"
//tap.rgtc[].rgbrc;complex;
//5 bytes;
- {0x7627, nullptr}, //"sprmTSetShd80" tap.rgshd;
+ {NS_sprm::LN_TSetShd80, nullptr}, //"sprmTSetShd80" tap.rgshd;
//complex; 4 bytes;
- {0x7628, nullptr}, //"sprmTSetShdOdd80"
+ {NS_sprm::LN_TSetShdOdd80, nullptr}, //"sprmTSetShdOdd80"
//tap.rgshd;complex;4 bytes;
{0x7629, nullptr}, //"sprmTTextFlow"
//tap.rgtc[].fVertical
//tap.rgtc[].fBackward
//tap.rgtc[].fRotateFont
//0 or 10 or 10 or 1;word;
- //0xD62A, ? ? ? , //"sprmTDiagLine"
+ //NS_sprm::LN_TDiagLine, ? ? ? , //"sprmTDiagLine"
{0xD62B, nullptr}, //"sprmTVertMerge"
//tap.rgtc[].vertMerge;complex;
//variable length always
@@ -6193,7 +6193,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
//tap.rgtc[].vertAlign;complex
//variable length always
//recorded as 3 byte;
- {NS_sprm::LN_CFELayout, &SwWW8ImplReader::Read_DoubleLine_Rotate},
+ {NS_sprm::sprmCFELayout, &SwWW8ImplReader::Read_DoubleLine_Rotate},
{0x6649, nullptr}, //undocumented
{0xF614, nullptr}, //"sprmTTableWidth"
//recorded as 3 bytes;
@@ -6237,8 +6237,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
// subtable "sprmPFTtp"
{0x6815, nullptr}, //undocumented
{0x6816, nullptr}, //undocumented
- {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TextForeColor},
- {NS_sprm::LN_CCvUl, &SwWW8ImplReader::Read_UnderlineColor},
+ {NS_sprm::sprmCCv, &SwWW8ImplReader::Read_TextForeColor},
+ {NS_sprm::sprmCCvUl, &SwWW8ImplReader::Read_UnderlineColor},
{0xC64D, &SwWW8ImplReader::Read_ParaBackColor},
{0x6467, nullptr}, //undocumented
{0xF617, nullptr}, //undocumented
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 821252a23a1c..a8bc9a81eb40 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -448,13 +448,13 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
// between istd of base PAP and istd of PAP to be
// produced
{0x2403, { 1, L_FIX} }, // "sprmPJc" pap.jc;jc (justification);byte;
- {0x2404, { 1, L_FIX} }, // "sprmPFSideBySide" pap.fSideBySide;0 or 1;byte;
+ {NS_sprm::LN_PFSideBySide, { 1, L_FIX} }, // "sprmPFSideBySide" pap.fSideBySide;0 or 1;byte;
{0x2405, { 1, L_FIX} }, // "sprmPFKeep" pap.fKeep;0 or 1;byte;
{0x2406, { 1, L_FIX} }, // "sprmPFKeepFollow" pap.fKeepFollow;0 or 1;byte;
{0x2407, { 1, L_FIX} }, // "sprmPFPageBreakBefore" pap.fPageBreakBefore;
// 0 or 1
- {0x2408, { 1, L_FIX} }, // "sprmPBrcl" pap.brcl;brcl;byte;
- {0x2409, { 1, L_FIX} }, // "sprmPBrcp" pap.brcp;brcp;byte;
+ {NS_sprm::LN_PBrcl, { 1, L_FIX} }, // "sprmPBrcl" pap.brcl;brcl;byte;
+ {NS_sprm::LN_PBrcp, { 1, L_FIX} }, // "sprmPBrcp" pap.brcp;brcp;byte;
{0x260A, { 1, L_FIX} }, // "sprmPIlvl" pap.ilvl;ilvl;byte;
{0x460B, { 2, L_FIX} }, // "sprmPIlfo" pap.ilfo;ilfo (list index) ;short;
{0x240C, { 1, L_FIX} }, // "sprmPFNoLineNumb" pap.fNoLnn;0 or 1;byte;
@@ -477,12 +477,12 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x8419, { 2, L_FIX} }, // "sprmPDyaAbs" pap.dyaAbs;dya;word;
{0x841A, { 2, L_FIX} }, // "sprmPDxaWidth" pap.dxaWidth;dxa;word;
{0x261B, { 1, L_FIX} }, // "sprmPPc" pap.pcHorz, pap.pcVert;complex
- {0x461C, { 2, L_FIX} }, // "sprmPBrcTop10" pap.brcTop;BRC10;word;
- {0x461D, { 2, L_FIX} }, // "sprmPBrcLeft10" pap.brcLeft;BRC10;word;
- {0x461E, { 2, L_FIX} }, // "sprmPBrcBottom10" pap.brcBottom;BRC10;word;
- {0x461F, { 2, L_FIX} }, // "sprmPBrcRight10" pap.brcRight;BRC10;word;
- {0x4620, { 2, L_FIX} }, // "sprmPBrcBetween10" pap.brcBetween;BRC10;word;
- {0x4621, { 2, L_FIX} }, // "sprmPBrcBar10" pap.brcBar;BRC10;word;
+ {NS_sprm::LN_PBrcTop10, { 2, L_FIX} }, // "sprmPBrcTop10" pap.brcTop;BRC10;word;
+ {NS_sprm::LN_PBrcLeft10, { 2, L_FIX} }, // "sprmPBrcLeft10" pap.brcLeft;BRC10;word;
+ {NS_sprm::LN_PBrcBottom10, { 2, L_FIX} }, // "sprmPBrcBottom10" pap.brcBottom;BRC10;word;
+ {NS_sprm::LN_PBrcRight10, { 2, L_FIX} }, // "sprmPBrcRight10" pap.brcRight;BRC10;word;
+ {NS_sprm::LN_PBrcBetween10, { 2, L_FIX} }, // "sprmPBrcBetween10" pap.brcBetween;BRC10;word;
+ {NS_sprm::LN_PBrcBar10, { 2, L_FIX} }, // "sprmPBrcBar10" pap.brcBar;BRC10;word;
{0x4622, { 2, L_FIX} }, // "sprmPDxaFromText10" pap.dxaFromText;dxa;word;
{0x2423, { 1, L_FIX} }, // "sprmPWr" pap.wr;wr
{0x6424, { 4, L_FIX} }, // "sprmPBrcTop80" pap.brcTop;BRC;long;
@@ -499,27 +499,27 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x842F, { 2, L_FIX} }, // "sprmPDxaFromText" pap.dxaFromText;dxa;word;
{0x2430, { 1, L_FIX} }, // "sprmPFLocked" pap.fLocked;0 or 1;byte;
{0x2431, { 1, L_FIX} }, // "sprmPFWidowControl" pap.fWidowControl;0 or 1
- {0xC632, { 0, L_VAR} }, // "sprmPRuler" ;;variable length;
+ {NS_sprm::LN_PRuler, { 0, L_VAR} }, // "sprmPRuler" ;;variable length;
{0x2433, { 1, L_FIX} }, // "sprmPFKinsoku" pap.fKinsoku;0 or 1;byte;
{0x2434, { 1, L_FIX} }, // "sprmPFWordWrap" pap.fWordWrap;0 or 1;byte;
{0x2435, { 1, L_FIX} }, // "sprmPFOverflowPunct" pap.fOverflowPunct;0 or 1
{0x2436, { 1, L_FIX} }, // "sprmPFTopLinePunct" pap.fTopLinePunct;0 or 1
{0x2437, { 1, L_FIX} }, // "sprmPFAutoSpaceDE" pap.fAutoSpaceDE;0 or 1
{0x2438, { 1, L_FIX} }, // "sprmPFAutoSpaceDN" pap.fAutoSpaceDN;0 or 1
- {NS_sprm::LN_PWAlignFont, { 2, L_FIX} }, // "sprmPWAlignFont" pap.wAlignFont;iFa
+ {NS_sprm::sprmPWAlignFont, { 2, L_FIX} }, // "sprmPWAlignFont" pap.wAlignFont;iFa
{0x443A, { 2, L_FIX} }, // "sprmPFrameTextFlow" pap.fVertical pap.fBackward
// pap.fRotateFont;complex
- {0x243B, { 1, L_FIX} }, // "sprmPISnapBaseLine" obsolete: not applicable in
+ {NS_sprm::LN_PISnapBaseLine, { 1, L_FIX} }, // "sprmPISnapBaseLine" obsolete: not applicable in
// Word97 and later versions;
- {0xC63E, { 0, L_VAR} }, // "sprmPAnld" pap.anld;;variable length;
- {0xC63F, { 0, L_VAR} }, // "sprmPPropRMark" pap.fPropRMark;complex
+ {NS_sprm::LN_PAnld, { 0, L_VAR} }, // "sprmPAnld" pap.anld;;variable length;
+ {NS_sprm::LN_PPropRMark, { 0, L_VAR} }, // "sprmPPropRMark" pap.fPropRMark;complex
{0x2640, { 1, L_FIX} }, // "sprmPOutLvl" pap.lvl;has no effect if pap.istd
// is < 1 or is > 9
{0x2441, { 1, L_FIX} }, // "sprmPFBiDi" ;;byte;
{0x2443, { 1, L_FIX} }, // "sprmPFNumRMIns" pap.fNumRMIns;1 or 0;bit;
- {0x2444, { 1, L_FIX} }, // "sprmPCrLf" ;;byte;
+ {NS_sprm::LN_PCrLf, { 1, L_FIX} }, // "sprmPCrLf" ;;byte;
{0xC645, { 0, L_VAR} }, // "sprmPNumRM" pap.numrm;;variable length;
- {0x6645, { 4, L_FIX} }, // "sprmPHugePapx" fc in the data stream to locate
+ {NS_sprm::LN_PHugePapx, { 4, L_FIX} }, // "sprmPHugePapx" fc in the data stream to locate
// the huge grpprl
{0x6646, { 4, L_FIX} }, // "sprmPHugePapx" fc in the data stream to locate
// the huge grpprl
@@ -537,20 +537,20 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x4807, { 2, L_FIX} }, // "sprmCIdslRMark" chp.idslRMReason;an index to a
// table of strings defined in Word 6.0
// executables;short;
- {0xEA08, { 1, L_FIX} }, // "sprmCChs" chp.fChsDiff and chp.chse;
+ {NS_sprm::LN_CChs, { 1, L_FIX} }, // "sprmCChs" chp.fChsDiff and chp.chse;
{0x6A09, { 4, L_FIX} }, // "sprmCSymbol" chp.fSpec, chp.xchSym and
// chp.ftcSym
{0x080A, { 1, L_FIX} }, // "sprmCFOle2" chp.fOle2;1 or 0;bit;
- {0x480B, { 0, L_FIX} }, // "sprmCIdCharType" obsolete: not applicable in
+ {NS_sprm::LN_CIdCharType, { 0, L_FIX} }, // "sprmCIdCharType" obsolete: not applicable in
// Word97 and later versions;;;
{0x2A0C, { 1, L_FIX} }, // "sprmCHighlight" chp.fHighlight,
// chp.icoHighlight;ico (fHighlight is set to 1 iff
// ico is not 0)
- {0x680E, { 4, L_FIX} }, // "sprmCObjLocation" chp.fcObj;FC;long;
- {0x2A10, { 0, L_FIX} }, // "sprmCFFtcAsciSymb" ;;;
+ {NS_sprm::LN_CObjLocation, { 4, L_FIX} }, // "sprmCObjLocation" chp.fcObj;FC;long;
+ {NS_sprm::LN_CFFtcAsciSymb, { 0, L_FIX} }, // "sprmCFFtcAsciSymb" ;;;
{0x4A30, { 2, L_FIX} }, // "sprmCIstd" chp.istd;istd, see stylesheet def
{0xCA31, { 0, L_VAR} }, // "sprmCIstdPermute" chp.istd;permutation vector
- {0x2A32, { 0, L_VAR} }, // "sprmCDefault" whole CHP;none;variable length;
+ {NS_sprm::LN_CDefault, { 0, L_VAR} }, // "sprmCDefault" whole CHP;none;variable length;
{0x2A33, { 0, L_FIX} }, // "sprmCPlain" whole CHP;none;0;
{0x2A34, { 1, L_FIX} }, // "sprmCKcd" ;;;
{0x0835, { 1, L_FIX} }, // "sprmCFBold" chp.fBold;0,1, 128, or 129
@@ -561,16 +561,16 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x083A, { 1, L_FIX} }, // "sprmCFSmallCaps" chp.fSmallCaps;0,1, 128, or 129
{0x083B, { 1, L_FIX} }, // "sprmCFCaps" chp.fCaps;0,1, 128, or 129
{0x083C, { 1, L_FIX} }, // "sprmCFVanish" chp.fVanish;0,1, 128, or 129
- {0x4A3D, { 2, L_FIX} }, // "sprmCFtcDefault" ;ftc, only used internally
+ {NS_sprm::LN_CFtcDefault, { 2, L_FIX} }, // "sprmCFtcDefault" ;ftc, only used internally
{0x2A3E, { 1, L_FIX} }, // "sprmCKul" chp.kul;kul;byte;
- {0xEA3F, { 3, L_FIX} }, // "sprmCSizePos" chp.hps, chp.hpsPos;3 bytes;
+ {NS_sprm::LN_CSizePos, { 3, L_FIX} }, // "sprmCSizePos" chp.hps, chp.hpsPos;3 bytes;
{0x8840, { 2, L_FIX} }, // "sprmCDxaSpace" chp.dxaSpace;dxa;word;
- {0x4A41, { 2, L_FIX} }, // "sprmCLid" ;only used internally never stored
+ {NS_sprm::LN_CLid, { 2, L_FIX} }, // "sprmCLid" ;only used internally never stored
{0x2A42, { 1, L_FIX} }, // "sprmCIco" chp.ico;ico;byte;
{0x4A43, { 2, L_FIX} }, // "sprmCHps" chp.hps;hps
- {0x2A44, { 1, L_FIX} }, // "sprmCHpsInc" chp.hps;
+ {NS_sprm::LN_CHpsInc, { 1, L_FIX} }, // "sprmCHpsInc" chp.hps;
{0x4845, { 2, L_FIX} }, // "sprmCHpsPos" chp.hpsPos;hps;short; (doc wrong)
- {0x2A46, { 1, L_FIX} }, // "sprmCHpsPosAdj" chp.hpsPos;hps
+ {NS_sprm::LN_CHpsPosAdj, { 1, L_FIX} }, // "sprmCHpsPosAdj" chp.hpsPos;hps
{0xCA47, { 0, L_VAR} }, // "sprmCMajority" chp.fBold, chp.fItalic,
// chp.fSmallCaps, chp.fVanish, chp.fStrike,
// chp.fCaps, chp.rgftc, chp.hps, chp.hpsPos,
@@ -578,14 +578,14 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
// chp.rglid;complex;variable length, length byte
// plus size of following grpprl;
{0x2A48, { 1, L_FIX} }, // "sprmCIss" chp.iss;iss;byte;
- {0xCA49, { 0, L_VAR} }, // "sprmCHpsNew50" chp.hps;hps;variable width
- {0xCA4A, { 0, L_VAR} }, // "sprmCHpsInc1" chp.hps;complex
+ {NS_sprm::LN_CHpsNew50, { 0, L_VAR} }, // "sprmCHpsNew50" chp.hps;hps;variable width
+ {NS_sprm::LN_CHpsInc1, { 0, L_VAR} }, // "sprmCHpsInc1" chp.hps;complex
{0x484B, { 2, L_FIX} }, // "sprmCHpsKern" chp.hpsKern;hps;short;
- {0xCA4C, { 2, L_FIX} }, // "sprmCMajority50" chp.fBold, chp.fItalic,
+ {NS_sprm::LN_CMajority50, { 2, L_FIX} }, // "sprmCMajority50" chp.fBold, chp.fItalic,
// chp.fSmallCaps, chp.fVanish, chp.fStrike,
// chp.fCaps, chp.ftc, chp.hps, chp.hpsPos, chp.kul,
// chp.dxaSpace, chp.ico,;complex
- {0x4A4D, { 2, L_FIX} }, // "sprmCHpsMul" chp.hps;percentage to grow hps
+ {NS_sprm::LN_CHpsMul, { 2, L_FIX} }, // "sprmCHpsMul" chp.hps;percentage to grow hps
{0x484E, { 2, L_FIX} }, // "sprmCYsri" chp.ysri;ysri;short;
{0x4A4F, { 2, L_FIX} }, // "sprmCRgFtc0" chp.rgftc[0];ftc for ASCII text
{0x4A50, { 2, L_FIX} }, // "sprmCRgFtc1" chp.rgftc[1];ftc for Far East text
@@ -600,7 +600,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x0858, { 1, L_FIX} }, // "sprmCFEmboss" chp.fEmboss;1 or 0;bit;
{0x2859, { 1, L_FIX} }, // "sprmCSfxText" chp.sfxtText;text animation;byte;
{0x085A, { 1, L_FIX} }, // "sprmCFBiDi" ;;;
- {0x085B, { 1, L_FIX} }, // "sprmCFDiacColor" ;;;
+ {NS_sprm::LN_CFDiacColor, { 1, L_FIX} }, // "sprmCFDiacColor" ;;;
{0x085C, { 1, L_FIX} }, // "sprmCFBoldBi" ;;;
{0x085D, { 1, L_FIX} }, // "sprmCFItalicBi" ;;;
{0x4A5E, { 2, L_FIX} },
@@ -611,7 +611,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
// chp.ibstDispFieldRMark, chp.dttmDispFieldRMark ;
{0x4863, { 2, L_FIX} }, // "sprmCIbstRMarkDel" chp.ibstRMarkDel;index into
// sttbRMark;short;
- {NS_sprm::LN_CDttmRMarkDel, { 4, L_FIX} }, // chp.dttmRMarkDel;DTTM;long;
+ {NS_sprm::sprmCDttmRMarkDel, { 4, L_FIX} }, // chp.dttmRMarkDel;DTTM;long;
{0x6865, { 4, L_FIX} }, // "sprmCBrc80" chp.brc;BRC;long;
{0x4866, { 2, L_FIX} }, // "sprmCShd80" chp.shd;SHD;short;
{0x4867, { 2, L_FIX} }, // "sprmCIdslRMarkDel" chp.idslRMReasonDel;an index
@@ -619,12 +619,12 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
// executables;short;
{0x0868, { 1, L_FIX} }, // "sprmCFUsePgsuSettings"
// chp.fUsePgsuSettings;1 or 0
- {0x486B, { 2, L_FIX} }, // "sprmCCpg" ;;word;
+ {NS_sprm::LN_CCpg, { 2, L_FIX} }, // "sprmCCpg" ;;word;
{0x486D, { 2, L_FIX} }, // "sprmCRgLid0_80" chp.rglid[0];LID: for non-FE text
{0x486E, { 2, L_FIX} }, // "sprmCRgLid1_80" chp.rglid[1];LID: for Far East text
{0x286F, { 1, L_FIX} }, // "sprmCIdctHint" chp.idctHint;IDCT:
- {0x2E00, { 1, L_FIX} }, // "sprmPicBrcl" pic.brcl;brcl (see PIC definition)
- {0xCE01, { 0, L_VAR} }, // "sprmPicScale" pic.mx, pic.my, pic.dxaCropleft,
+ {NS_sprm::LN_PicBrcl, { 1, L_FIX} }, // "sprmPicBrcl" pic.brcl;brcl (see PIC definition)
+ {NS_sprm::LN_PicScale, { 0, L_VAR} }, // "sprmPicScale" pic.mx, pic.my, pic.dxaCropleft,
// pic.dyaCropTop pic.dxaCropRight,
// pic.dyaCropBottom;Complex
{0x6C02, { 4, L_FIX} }, // "sprmPicBrcTop80" pic.brcTop;BRC;long;
@@ -634,7 +634,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x3000, { 1, L_FIX} }, // "sprmScnsPgn" sep.cnsPgn;cns;byte;
{0x3001, { 1, L_FIX} }, // "sprmSiHeadingPgn" sep.iHeadingPgn;heading number
// level;byte;
- {0xD202, { 0, L_VAR} }, // "sprmSOlstAnm" sep.olstAnm;OLST;variable length;
+ {NS_sprm::LN_SOlstAnm, { 0, L_VAR} }, // "sprmSOlstAnm" sep.olstAnm;OLST;variable length;
{0xF203, { 3, L_FIX} }, // "sprmSDxaColWidth" sep.rgdxaColWidthSpacing;
{0xF204, { 3, L_FIX} }, // "sprmSDxaColSpacing" sep.rgdxaColWidthSpacing;
// complex
@@ -646,14 +646,14 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x300A, { 1, L_FIX} }, // "sprmSFTitlePage" sep.fTitlePage;0 or 1;byte;
{0x500B, { 2, L_FIX} }, // "sprmSCcolumns" sep.ccolM1;# of cols - 1;word;
{0x900C, { 2, L_FIX} }, // "sprmSDxaColumns" sep.dxaColumns;dxa;word;
- {0x300D, { 1, L_FIX} }, // "sprmSFAutoPgn" sep.fAutoPgn;obsolete;byte;
+ {NS_sprm::LN_SFAutoPgn, { 1, L_FIX} }, // "sprmSFAutoPgn" sep.fAutoPgn;obsolete;byte;
{0x300E, { 1, L_FIX} }, // "sprmSNfcPgn" sep.nfcPgn;nfc;byte;
- {0xB00F, { 2, L_FIX} }, // "sprmSDyaPgn" sep.dyaPgn;dya;short;
- {0xB010, { 2, L_FIX} }, // "sprmSDxaPgn" sep.dxaPgn;dya;short;
+ {NS_sprm::LN_SDyaPgn, { 2, L_FIX} }, // "sprmSDyaPgn" sep.dyaPgn;dya;short;
+ {NS_sprm::LN_SDxaPgn, { 2, L_FIX} }, // "sprmSDxaPgn" sep.dxaPgn;dya;short;
{0x3011, { 1, L_FIX} }, // "sprmSFPgnRestart" sep.fPgnRestart;0 or 1;byte;
{0x3012, { 1, L_FIX} }, // "sprmSFEndnote" sep.fEndnote;0 or 1;byte;
{0x3013, { 1, L_FIX} }, // "sprmSLnc" sep.lnc;lnc;byte;
- {0x3014, { 1, L_FIX} }, // "sprmSGprfIhdt" sep.grpfIhdt;grpfihdt
+ {NS_sprm::LN_SGprfIhdt, { 1, L_FIX} }, // "sprmSGprfIhdt" sep.grpfIhdt;grpfihdt
{0x5015, { 2, L_FIX} }, // "sprmSNLnnMod" sep.nLnnMod;non-neg int.;word;
{0x9016, { 2, L_FIX} }, // "sprmSDxaLnn" sep.dxaLnn;dxa;word;
{0xB017, { 2, L_FIX} }, // "sprmSDyaHdrTop" sep.dyaHdrTop;dya;word;
@@ -663,7 +663,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x501B, { 2, L_FIX} }, // "sprmSLnnMin" sep.lnnMin;lnn;word;
{0x501C, { 2, L_FIX} }, // "sprmSPgnStart" sep.pgnStart;pgn;word;
{0x301D, { 1, L_FIX} }, // "sprmSBOrientation" sep.dmOrientPage;dm;byte;
- {0x301E, { 1, L_FIX} }, // "sprmSBCustomize" ;;;
+ {NS_sprm::LN_SBCustomize, { 1, L_FIX} }, // "sprmSBCustomize" ;;;
{0xB01F, { 2, L_FIX} }, // "sprmSXaPage" sep.xaPage;xa;word;
{0xB020, { 2, L_FIX} }, // "sprmSYaPage" sep.yaPage;ya;word;
{0xB021, { 2, L_FIX} }, // "sprmSDxaLeft" sep.dxaLeft;dxa;word;
@@ -672,10 +672,10 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x9024, { 2, L_FIX} }, // "sprmSDyaBottom" sep.dyaBottom;dya;word;
{0xB025, { 2, L_FIX} }, // "sprmSDzaGutter" sep.dzaGutter;dza;word;
{0x5026, { 2, L_FIX} }, // "sprmSDmPaperReq" sep.dmPaperReq;dm;word;
- {0xD227, { 0, L_VAR} }, // "sprmSPropRMark" sep.fPropRMark,
+ {NS_sprm::LN_SPropRMark, { 0, L_VAR} }, // "sprmSPropRMark" sep.fPropRMark,
// sep.ibstPropRMark, sep.dttmPropRMark ;complex
{0x3228, { 1, L_FIX} }, // "sprmSFBiDi" ;;;
- {0x3229, { 1, L_FIX} }, // "sprmSFFacingCol" ;;;
+ {NS_sprm::LN_SFFacingCol, { 1, L_FIX} }, // "sprmSFFacingCol" ;;;
{0x322A, { 1, L_FIX} }, // "sprmSFRTLGutter", set to one if gutter is on
// right
{0x702B, { 4, L_FIX} }, // "sprmSBrcTop80" sep.brcTop;BRC;long;
@@ -697,30 +697,30 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x3404, { 1, L_FIX} }, // "sprmTTableHeader" tap.fTableHeader;1 or 0;byte;
{0x3466, { 1, L_FIX} }, // "sprmTFCantSplit90" tap.fCantSplit90;1 or 0;byte;
{0xD605, { 0, L_VAR} }, // "sprmTTableBorders80" tap.rgbrcTable;complex
- {0xD606, { 0, L_VAR} }, // "sprmTDefTable10" tap.rgdxaCenter,
+ {NS_sprm::LN_TDefTable10, { 0, L_VAR} }, // "sprmTDefTable10" tap.rgdxaCenter,
// tap.rgtc;complex
{0x9407, { 2, L_FIX} }, // "sprmTDyaRowHeight" tap.dyaRowHeight;dya;word;
{0xD608, { 0, L_VAR} }, // "sprmTDefTable" tap.rgtc;complex
{0xD609, { 0, L_VAR} }, // "sprmTDefTableShd80" tap.rgshd;complex
{0x740A, { 4, L_FIX} }, // "sprmTTlp" tap.tlp;TLP;4 bytes;
{0x560B, { 2, L_FIX} }, // "sprmTFBiDi" ;;;
- {0x740C, { 1, L_FIX} }, // "sprmTHTMLProps" ;;;
+ {NS_sprm::LN_THTMLProps, { 1, L_FIX} }, // "sprmTHTMLProps" ;;;
{0xD620, { 0, L_VAR} }, // "sprmTSetBrc80" tap.rgtc[].rgbrc;complex
{0x7621, { 4, L_FIX} }, // "sprmTInsert" tap.rgdxaCenter, tap.rgtc;complex
{0x5622, { 2, L_FIX} }, // "sprmTDelete" tap.rgdxaCenter, tap.rgtc;complex
{0x7623, { 4, L_FIX} }, // "sprmTDxaCol" tap.rgdxaCenter;complex
{0x5624, { 0, L_VAR} }, // "sprmTMerge" tap.fFirstMerged, tap.fMerged;
{0x5625, { 0, L_VAR} }, // "sprmTSplit" tap.fFirstMerged, tap.fMerged;
- {0xD626, { 0, L_VAR} }, // "sprmTSetBrc10" tap.rgtc[].rgbrc;complex
- {0x7627, { 0, L_VAR} }, // "sprmTSetShd80" tap.rgshd;complex
- {0x7628, { 0, L_VAR} }, // "sprmTSetShdOdd80" tap.rgshd;complex
+ {NS_sprm::LN_TSetBrc10, { 0, L_VAR} }, // "sprmTSetBrc10" tap.rgtc[].rgbrc;complex
+ {NS_sprm::LN_TSetShd80, { 0, L_VAR} }, // "sprmTSetShd80" tap.rgshd;complex
+ {NS_sprm::LN_TSetShdOdd80, { 0, L_VAR} }, // "sprmTSetShdOdd80" tap.rgshd;complex
{0x7629, { 4, L_FIX} }, // "sprmTTextFlow" tap.rgtc[].fVerticaltap,
// rgtc[].fBackwardtap, rgtc[].fRotateFont;0 or 10
// or 10 or 1;word;
- {0xD62A, { 1, L_FIX} }, // "sprmTDiagLine" ;;;
+ {NS_sprm::LN_TDiagLine, { 1, L_FIX} }, // "sprmTDiagLine" ;;;
{0xD62B, { 0, L_VAR} }, // "sprmTVertMerge" tap.rgtc[].vertMerge
{0xD62C, { 0, L_VAR} }, // "sprmTVertAlign" tap.rgtc[].vertAlign
- {NS_sprm::LN_CFELayout, { 0, L_VAR} },
+ {NS_sprm::sprmCFELayout, { 0, L_VAR} },
{0x6649, { 4, L_FIX} }, // undocumented
{0xF614, { 3, L_FIX} }, // undocumented
{0xD612, { 0, L_VAR} }, // "sprmTDefTableShd"
@@ -756,7 +756,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x9410, { 2, L_FIX} }, // undocumented
{0x6815, { 4, L_FIX} }, // undocumented
{0x6816, { 4, L_FIX} }, // undocumented
- {NS_sprm::LN_CCv, { 4, L_FIX} }, // text colour
+ {NS_sprm::sprmCCv, { 4, L_FIX} }, // text colour
{0xC64D, { 0, L_VAR} }, // undocumented, para back colour
{0x6467, { 4, L_FIX} }, // undocumented
{0x646B, { 4, L_FIX} }, // undocumented
@@ -1031,10 +1031,10 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
// sprmNoop, sprmNoop, sprmNoop, sprmNoop
0x0000,0x0000,0x0000,0x0000,
// sprmPIncLvl, sprmPJc, sprmPFSideBySide, sprmPFKeep
- 0x2402,0x2403,0x2404,0x2405,
+ 0x2402,0x2403,NS_sprm::LN_PFSideBySide,0x2405,
// sprmPFKeepFollow, sprmPFPageBreakBefore, sprmPBrcl,
// sprmPBrcp
- 0x2406,0x2407,0x2408,0x2409,
+ 0x2406,0x2407,NS_sprm::LN_PBrcl,NS_sprm::LN_PBrcp,
// sprmPIlvl, sprmNoop, sprmPFNoLineNumb, sprmNoop
0x260A,0x0000,0x240C,0x0000,
// sprmNoop, sprmNoop, sprmNoop, sprmNoop
@@ -1062,7 +1062,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
// sprmPFAutoSpaceDN, sprmNoop
0x2436,0x2437,0x2438,0x0000,
// sprmNoop, sprmPISnapBaseLine, sprmNoop, sprmNoop
- 0x0000,0x243B,0x000,0x0000,
+ 0x0000,NS_sprm::LN_PISnapBaseLine,0x000,0x0000,
// sprmNoop, sprmCFStrikeRM, sprmCFRMark, sprmCFFieldVanish
0x0000,0x0800,0x0801,0x0802,
// sprmNoop, sprmNoop, sprmNoop, sprmCFData
@@ -1082,7 +1082,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
// sprmNoop, sprmNoop, sprmCIco, sprmNoop,
0x0000,0x0000,0x2A42,0x0000,
// sprmCHpsInc, sprmNoop, sprmCHpsPosAdj, sprmNoop,
- 0x2A44,0x0000,0x2A46,0x0000,
+ NS_sprm::LN_CHpsInc,0x0000,NS_sprm::LN_CHpsPosAdj,0x0000,
// sprmCIss, sprmNoop, sprmNoop, sprmNoop,
0x2A48,0x0000,0x0000,0x0000,
// sprmNoop, sprmNoop, sprmNoop, sprmNoop,
@@ -1090,7 +1090,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
// sprmNoop, sprmNoop, sprmNoop, sprmCFDStrike,
0x0000,0x0000,0x0000,0x2A53,
// sprmCFImprint, sprmCFSpec, sprmCFObj, sprmPicBrcl,
- 0x0854,0x0855,0x0856,0x2E00,
+ 0x0854,0x0855,0x0856,NS_sprm::LN_PicBrcl,
// sprmPOutLvl, sprmPFBiDi, sprmNoop, sprmNoop,
0x2640,0x2441,0x0000,0x0000,
// sprmNoop, sprmNoop, sprmPPnbrRMarkNot
@@ -2368,7 +2368,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::Entry::operator<
bool IsReplaceAllSprm(sal_uInt16 nSpId)
{
- return (0x6645 == nSpId || 0x6646 == nSpId);
+ return (NS_sprm::LN_PHugePapx == nSpId || 0x6646 == nSpId);
}
bool IsExpandableSprm(sal_uInt16 nSpId)
generated by cgit (git 2.34.1) at 2025-02-25 02:48:01 +0000