Related: tdf#152425 Use ww::sti enum instead of respective number literals

Simplifies reading and checking its correctness greatly.

Change-Id: I16253f324cbafac6cb526ab195a7257530abe0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143827
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 49 insertions, 50 deletions

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index f251f41cff15..b6c198b03378 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -204,67 +204,66 @@ sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat )
     sal_uInt16 nRet = ww::stiUser;    // user style as default
     sal_uInt16 nPoolId = rFormat.GetPoolFormatId();
     if( nPoolId == RES_POOLCOLL_STANDARD )
-        nRet = 0;
+        nRet = ww::stiNormal;
     else if( nPoolId >= RES_POOLCOLL_HEADLINE1 &&
              nPoolId <= RES_POOLCOLL_HEADLINE9 )
-        nRet = static_cast< sal_uInt16 >(nPoolId + 1 - RES_POOLCOLL_HEADLINE1);
+        nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiLevFirst - RES_POOLCOLL_HEADLINE1);
     else if( nPoolId >= RES_POOLCOLL_TOX_IDX1 &&
              nPoolId <= RES_POOLCOLL_TOX_IDX3 )
-        nRet = static_cast< sal_uInt16 >(nPoolId + 10 - RES_POOLCOLL_TOX_IDX1);
+        nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiIndexFirst - RES_POOLCOLL_TOX_IDX1);
     else if( nPoolId >= RES_POOLCOLL_TOX_CNTNT1 &&
              nPoolId <= RES_POOLCOLL_TOX_CNTNT5 )
-        nRet = static_cast< sal_uInt16 >(nPoolId + 19 - RES_POOLCOLL_TOX_CNTNT1);
+        nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiToc1 - RES_POOLCOLL_TOX_CNTNT1);
     else if( nPoolId >= RES_POOLCOLL_TOX_CNTNT6 &&
              nPoolId <= RES_POOLCOLL_TOX_CNTNT9 )
-        nRet = static_cast< sal_uInt16 >(nPoolId + 24 - RES_POOLCOLL_TOX_CNTNT6);
+        nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiToc6 - RES_POOLCOLL_TOX_CNTNT6);
     else
         switch( nPoolId )
         {
-        case RES_POOLCOLL_FOOTNOTE:         nRet = 29;  break;
-        case RES_POOLCOLL_MARGINAL:         nRet = 30;  break;
-        case RES_POOLCOLL_HEADER:           nRet = 31;  break;
-        case RES_POOLCOLL_FOOTER:           nRet = 32;  break;
-        case RES_POOLCOLL_TOX_IDXH:         nRet = 33;  break;
-        case RES_POOLCOLL_LABEL:            nRet = 34;  break;
-        case RES_POOLCOLL_LABEL_DRAWING:    nRet = 35;  break;
-        case RES_POOLCOLL_ENVELOPE_ADDRESS: nRet = 36;  break;
-        case RES_POOLCOLL_SEND_ADDRESS:     nRet = 37;  break;
-        case RES_POOLCOLL_ENDNOTE:          nRet = 43;  break;
-        case RES_POOLCOLL_TOX_AUTHORITIESH: nRet = 44;  break;
-        case RES_POOLCOLL_TOX_CNTNTH:       nRet = 46;  break;
-        case RES_POOLCOLL_BULLET_LEVEL1:    nRet = 48;  break;
-        case RES_POOLCOLL_LISTS_BEGIN:      nRet = 47;  break;
-        case RES_POOLCOLL_NUM_LEVEL1:       nRet = 49;  break;
-        case RES_POOLCOLL_BULLET_LEVEL2:    nRet = 54;  break;
-        case RES_POOLCOLL_BULLET_LEVEL3:    nRet = 55;  break;
-        case RES_POOLCOLL_BULLET_LEVEL4:    nRet = 56;  break;
-        case RES_POOLCOLL_BULLET_LEVEL5:    nRet = 57;  break;
-        case RES_POOLCOLL_NUM_LEVEL2:       nRet = 58;  break;
-        case RES_POOLCOLL_NUM_LEVEL3:       nRet = 59;  break;
-        case RES_POOLCOLL_NUM_LEVEL4:       nRet = 60;  break;
-        case RES_POOLCOLL_NUM_LEVEL5:       nRet = 61;  break;
-        case RES_POOLCOLL_DOC_TITLE:        nRet = 62;  break;
-        case RES_POOLCOLL_DOC_APPENDIX:     nRet = 63;  break;
-        case RES_POOLCOLL_SIGNATURE:        nRet = 64;  break;
-        case RES_POOLCOLL_TEXT:             nRet = 66;  break;
-        case RES_POOLCOLL_TEXT_MOVE:        nRet = 67;  break;
-        case RES_POOLCOLL_BULLET_NONUM1:    nRet = 68;  break;
-        case RES_POOLCOLL_BULLET_NONUM2:    nRet = 69;  break;
-        case RES_POOLCOLL_BULLET_NONUM3:    nRet = 70;  break;
-        case RES_POOLCOLL_BULLET_NONUM4:    nRet = 71;  break;
-        case RES_POOLCOLL_BULLET_NONUM5:    nRet = 72;  break;
-        case RES_POOLCOLL_DOC_SUBTITLE:     nRet = 74;  break;
-        case RES_POOLCOLL_GREETING:         nRet = 75;  break;
-        case RES_POOLCOLL_TEXT_IDENT:       nRet = 77;  break;
-
-        case RES_POOLCHR_FOOTNOTE_ANCHOR:   nRet = 38;  break;
-        case RES_POOLCHR_ENDNOTE_ANCHOR:    nRet = 42;  break;
-        case RES_POOLCHR_INET_NORMAL:       nRet = 85;  break;
-        case RES_POOLCHR_INET_VISIT:        nRet = 86;  break;
-        case RES_POOLCHR_HTML_STRONG:       nRet = 87;  break;
-        case RES_POOLCHR_HTML_EMPHASIS:     nRet = 88;  break;
-        case RES_POOLCHR_LINENUM:           nRet = 40;  break;
-        case RES_POOLCHR_PAGENO:            nRet = 41;  break;
+        case RES_POOLCOLL_FOOTNOTE:         nRet = ww::stiFootnoteText;      break;
+        case RES_POOLCOLL_MARGINAL:         nRet = ww::stiAtnText;           break;
+        case RES_POOLCOLL_HEADER:           nRet = ww::stiHeader;            break;
+        case RES_POOLCOLL_FOOTER:           nRet = ww::stiFooter;            break;
+        case RES_POOLCOLL_TOX_IDXH:         nRet = ww::stiIndexHeading;      break;
+        case RES_POOLCOLL_LABEL:            nRet = ww::stiCaption;           break;
+        case RES_POOLCOLL_LABEL_DRAWING:    nRet = ww::stiToCaption;         break;
+        case RES_POOLCOLL_ENVELOPE_ADDRESS: nRet = ww::stiEnvAddr;           break;
+        case RES_POOLCOLL_SEND_ADDRESS:     nRet = ww::stiEnvRet;            break;
+        case RES_POOLCHR_FOOTNOTE_ANCHOR:   nRet = ww::stiFootnoteRef;       break;
+        case RES_POOLCHR_LINENUM:           nRet = ww::stiLnn;               break;
+        case RES_POOLCHR_PAGENO:            nRet = ww::stiPgn;               break;
+        case RES_POOLCHR_ENDNOTE_ANCHOR:    nRet = ww::stiEdnRef;            break;
+        case RES_POOLCOLL_ENDNOTE:          nRet = ww::stiEdnText;           break;
+        case RES_POOLCOLL_TOX_AUTHORITIESH: nRet = ww::stiToa;               break;
+        case RES_POOLCOLL_TOX_CNTNTH:       nRet = ww::stiToaHeading;        break;
+        case RES_POOLCOLL_LISTS_BEGIN:      nRet = ww::stiList;              break;
+        case RES_POOLCOLL_BULLET_LEVEL1:    nRet = ww::stiListBullet;        break;
+        case RES_POOLCOLL_NUM_LEVEL1:       nRet = ww::stiListNumber;        break;
+        case RES_POOLCOLL_BULLET_LEVEL2:    nRet = ww::stiListBullet2;       break;
+        case RES_POOLCOLL_BULLET_LEVEL3:    nRet = ww::stiListBullet3;       break;
+        case RES_POOLCOLL_BULLET_LEVEL4:    nRet = ww::stiListBullet4;       break;
+        case RES_POOLCOLL_BULLET_LEVEL5:    nRet = ww::stiListBullet5;       break;
+        case RES_POOLCOLL_NUM_LEVEL2:       nRet = ww::stiListNumber2;       break;
+        case RES_POOLCOLL_NUM_LEVEL3:       nRet = ww::stiListNumber3;       break;
+        case RES_POOLCOLL_NUM_LEVEL4:       nRet = ww::stiListNumber4;       break;
+        case RES_POOLCOLL_NUM_LEVEL5:       nRet = ww::stiListNumber5;       break;
+        case RES_POOLCOLL_DOC_TITLE:        nRet = ww::stiTitle;             break;
+        case RES_POOLCOLL_DOC_APPENDIX:     nRet = ww::stiClosing;           break;
+        case RES_POOLCOLL_SIGNATURE:        nRet = ww::stiSignature;         break;
+        case RES_POOLCOLL_TEXT:             nRet = ww::stiBodyText;          break;
+        case RES_POOLCOLL_TEXT_MOVE:        nRet = ww::stiBodyTextInd1;      break;
+        case RES_POOLCOLL_BULLET_NONUM1:    nRet = ww::stiListCont;          break;
+        case RES_POOLCOLL_BULLET_NONUM2:    nRet = ww::stiListCont2;         break;
+        case RES_POOLCOLL_BULLET_NONUM3:    nRet = ww::stiListCont3;         break;
+        case RES_POOLCOLL_BULLET_NONUM4:    nRet = ww::stiListCont4;         break;
+        case RES_POOLCOLL_BULLET_NONUM5:    nRet = ww::stiListCont5;         break;
+        case RES_POOLCOLL_DOC_SUBTITLE:     nRet = ww::stiSubtitle;          break;
+        case RES_POOLCOLL_GREETING:         nRet = ww::stiSalutation;        break;
+        case RES_POOLCOLL_TEXT_IDENT:       nRet = ww::stiBodyText1I;        break;
+        case RES_POOLCHR_INET_NORMAL:       nRet = ww::stiHyperlink;         break;
+        case RES_POOLCHR_INET_VISIT:        nRet = ww::stiHyperlinkFollowed; break;
+        case RES_POOLCHR_HTML_STRONG:       nRet = ww::stiStrong;            break;
+        case RES_POOLCHR_HTML_EMPHASIS:     nRet = ww::stiEmphasis;          break;
         }
     return nRet;
 }