Trust the compiler to do array indexing and superclass promotion.

xfa/fgas/layout/fgas_rtfbreak.cpp

Index: xfa/fgas/layout/fgas_rtfbreak.cpp
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index 388a3be6f9247e48aad5d07db4da8fd8a27ae610..e1cb6d2784bafce95f27441c37c3e2fba80e8f8b 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -990,16 +990,14 @@ int32_t CFX_RTFBreak::GetBreakPos(CFX_RTFCharArray& tca,
       if (nNext == FX_CBP_SP) {
         eType = bSpaceBreak ? FX_LBT_DIRECT_BRK : FX_LBT_PROHIBITED_BRK;
       } else {
-        eType = *((const FX_LINEBREAKTYPE*)gs_FX_LineBreak_PairTable +
-                  (nCur << 5) + nNext);
+        eType = gs_FX_LineBreak_PairTable[nCur][nNext];
       }
     } else if (nCur == FX_CBP_TB) {

[Lei Zhang, 2016/06/10 21:40:47]

This block looks identical to the one above. Merge?

[Tom Sepez, 2016/06/10 21:56:57]

Not quite.  One sets bNeedBreak to !bSpaceBreak and the other sets it to
!bTabBreak. 

       bNeedBreak = !bTabBreak;
       if (nNext == FX_CBP_TB) {
         eType = bTabBreak ? FX_LBT_DIRECT_BRK : FX_LBT_PROHIBITED_BRK;
       } else {
-        eType = *((const FX_LINEBREAKTYPE*)gs_FX_LineBreak_PairTable +
-                  (nCur << 5) + nNext);
+        eType = gs_FX_LineBreak_PairTable[nCur][nNext];
       }
     } else if (bNumberBreak && nCur == FX_CBP_NU && nNext == FX_CBP_NU) {
       eType = FX_LBT_DIRECT_BRK;
@@ -1009,8 +1007,7 @@ int32_t CFX_RTFBreak::GetBreakPos(CFX_RTFCharArray& tca,
       if (nNext == FX_CBP_SP) {
         eType = FX_LBT_PROHIBITED_BRK;
       } else {
-        eType = *((const FX_LINEBREAKTYPE*)gs_FX_LineBreak_PairTable +
-                  (nCur << 5) + nNext);
+        eType = gs_FX_LineBreak_PairTable[nCur][nNext];
       }
     }
     if (bAllChars) {