Rename CFX_ByteTextBuf::GetByteString() to AsStringC().

fpdfsdk/fxedit/fxet_pageobjs.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pathobject.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_textobject.h"
@@ skipping 216 matching lines @@
 
               pDevice->DrawPath(&pathSelBK, pUser2Device, NULL, crSelBK, 0,
                                 FXFILL_WINDING);
             }
           }
 
           if (bContinuous) {
             if (place.LineCmp(oldplace) != 0 || word.nFontIndex != nFontIndex ||
                 crOldFill != crCurFill) {
               if (sTextBuf.GetLength() > 0) {
-                DrawTextString(pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x,
-                                                       ptBT.y + ptOffset.y),
-                               pFontMap->GetPDFFont(nFontIndex), fFontSize,
-                               pUser2Device, sTextBuf.GetByteString(),
-                               crOldFill, crTextStroke, nHorzScale);
+                DrawTextString(
+                    pDevice,
+                    CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
+                    pFontMap->GetPDFFont(nFontIndex), fFontSize, pUser2Device,
+                    sTextBuf.AsStringC(), crOldFill, crTextStroke, nHorzScale);
 
                 sTextBuf.Clear();
               }
               nFontIndex = word.nFontIndex;
               ptBT = word.ptWord;
               crOldFill = crCurFill;
             }
 
             sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word,
                                          SubWord)
                             .AsStringC();
           } else {
             DrawTextString(
                 pDevice, CFX_FloatPoint(word.ptWord.x + ptOffset.x,
                                         word.ptWord.y + ptOffset.y),
                 pFontMap->GetPDFFont(word.nFontIndex), fFontSize, pUser2Device,
                 GetPDFWordString(pFontMap, word.nFontIndex, word.Word, SubWord),
                 crCurFill, crTextStroke, nHorzScale);
           }
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         DrawTextString(
             pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
             pFontMap->GetPDFFont(nFontIndex), fFontSize, pUser2Device,
-            sTextBuf.GetByteString(), crOldFill, crTextStroke, nHorzScale);
+            sTextBuf.AsStringC(), crOldFill, crTextStroke, nHorzScale);
       }
     }
   }
 
   pDevice->RestoreState();
 }
 
 void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
                             IFX_Edit* pEdit,
@@ skipping 61 matching lines @@
             pDevice->DrawPath(&pathSelBK, pUser2Device, NULL, crSelBK, 0,
                               FXFILL_WINDING);
           }
 
           if (place.LineCmp(oldplace) != 0 ||
               word.WordProps.fCharSpace > 0.0f ||
               word.WordProps.nHorzScale != 100 ||
               FXSYS_memcmp(&word.WordProps, &wp, sizeof(CPVT_WordProps)) != 0 ||
               crOld != crCurText) {
             if (sTextBuf.GetLength() > 0) {
-              DrawTextString(pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x,
-                                                     ptBT.y + ptOffset.y),
-                             pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize,
-                             pUser2Device, sTextBuf.GetByteString(), crOld, 0,
-                             wp.nHorzScale);
+              DrawTextString(
+                  pDevice,
+                  CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
+                  pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize,
+                  pUser2Device, sTextBuf.AsStringC(), crOld, 0, wp.nHorzScale);
 
               sTextBuf.Clear();
             }
             wp = word.WordProps;
             ptBT = word.ptWord;
             crOld = crCurText;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex,
                                        word.Word, 0)
@@ skipping 20 matching lines @@
           }
 
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         DrawTextString(
             pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
             pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, pUser2Device,
-            sTextBuf.GetByteString(), crOld, 0, wp.nHorzScale);
+            sTextBuf.AsStringC(), crOld, 0, wp.nHorzScale);
       }
     }
   }
 
   pDevice->RestoreState();
 }
 
 static void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder,
                                  FX_COLORREF crFill,
                                  const CFX_FloatRect& rcFill) {
@@ skipping 83 matching lines @@
 
         CPVT_Word word;
         if (pIterator->GetWord(word)) {
           if (place.LineCmp(oldplace) != 0 ||
               nOldFontIndex != word.nFontIndex) {
             if (sTextBuf.GetLength() > 0) {
               ObjArray.Add(AddTextObjToPageObjects(
                   pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
                   fFontSize, 0.0f, 100,
                   CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-                  sTextBuf.GetByteString()));
+                  sTextBuf.AsStringC()));
 
               sTextBuf.Clear();
             }
 
             ptBT = word.ptWord;
             nOldFontIndex = word.nFontIndex;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0)
                           .AsStringC();
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         ObjArray.Add(AddTextObjToPageObjects(
             pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
             fFontSize, 0.0f, 100,
             CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-            sTextBuf.GetByteString()));
+            sTextBuf.AsStringC()));
       }
     }
   }
 }
 
 void IFX_Edit::GenerateRichPageObjects(
     CPDF_PageObjectHolder* pObjectHolder,
     IFX_Edit* pEdit,
     const CFX_FloatPoint& ptOffset,
     const CPVT_WordRange* pRange,
@@ skipping 30 matching lines @@
           if (place.LineCmp(oldplace) != 0 ||
               word.WordProps.fCharSpace > 0.0f ||
               word.WordProps.nHorzScale != 100 ||
               FXSYS_memcmp(&word.WordProps, &wp, sizeof(CPVT_WordProps)) != 0 ||
               crOld != crCurText) {
             if (sTextBuf.GetLength() > 0) {
               ObjArray.Add(AddTextObjToPageObjects(
                   pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
                   wp.fFontSize, wp.fCharSpace, wp.nHorzScale,
                   CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-                  sTextBuf.GetByteString()));
+                  sTextBuf.AsStringC()));
 
               sTextBuf.Clear();
             }
 
             wp = word.WordProps;
             ptBT = word.ptWord;
             crOld = crCurText;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex,
@@ skipping 22 matching lines @@
 
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         ObjArray.Add(AddTextObjToPageObjects(
             pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
             wp.fFontSize, wp.fCharSpace, wp.nHorzScale,
             CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-            sTextBuf.GetByteString()));
+            sTextBuf.AsStringC()));
       }
     }
   }
 }
 
 void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder,
                                         IFX_Edit* pEdit,
                                         const CFX_FloatPoint& ptOffset,
                                         const CPVT_WordRange* pRange,
                                         FX_COLORREF color) {
@@ skipping 17 matching lines @@
           rcUnderline.left += ptOffset.x;
           rcUnderline.right += ptOffset.x;
           rcUnderline.top += ptOffset.y;
           rcUnderline.bottom += ptOffset.y;
           AddRectToPageObjects(pObjectHolder, color, rcUnderline);
         }
       }
     }
   }
 }