Removing default params from CFX_Edit.

fpdfsdk/fxedit/include/fxet_edit.h

 // 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
 
 #ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_
 #define FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_
 
 #include <memory>
@@ skipping 12 matching lines @@
 class CFX_RenderDevice;
 class CFX_SystemHandler;
 class IFX_Edit_UndoItem;
 
 #define FX_EDIT_IsFloatZero(f) (f < 0.0001 && f > -0.0001)
 #define FX_EDIT_IsFloatEqual(fa, fb) FX_EDIT_IsFloatZero(fa - fb)
 #define FX_EDIT_IsFloatBigger(fa, fb) (fa > fb && !FX_EDIT_IsFloatEqual(fa, fb))
 #define FX_EDIT_IsFloatSmaller(fa, fb) \
   (fa < fb && !FX_EDIT_IsFloatEqual(fa, fb))
 
-enum REFRESH_PLAN_E { RP_ANALYSE, RP_NOANALYSE, RP_OPTIONAL };
-
 enum EDIT_PROPS_E {
   EP_LINELEADING,
   EP_LINEINDENT,
   EP_ALIGNMENT,
   EP_FONTINDEX,
   EP_FONTSIZE,
   EP_WORDCOLOR,
   EP_SCRIPTTYPE,
   EP_UNDERLINE,
   EP_CROSSOUT,
@@ skipping 301 matching lines @@
   CPVT_WordRange m_wrSel;
   CFX_WideString m_swText;
 };
 
 class CFXEU_InsertText : public CFX_Edit_UndoItem {
  public:
   CFXEU_InsertText(CFX_Edit* pEdit,
                    const CPVT_WordPlace& wpOldPlace,
                    const CPVT_WordPlace& wpNewPlace,
                    const CFX_WideString& swText,
-                   int32_t charset,
-                   const CPVT_SecProps* pSecProps,
-                   const CPVT_WordProps* pWordProps);
+                   int32_t charset);
   ~CFXEU_InsertText() override;
 
   // CFX_Edit_UndoItem
   void Redo() override;
   void Undo() override;
 
  private:
   CFX_Edit* m_pEdit;
 
   CPVT_WordPlace m_wpOld;
   CPVT_WordPlace m_wpNew;
   CFX_WideString m_swText;
   int32_t m_nCharset;
-  CPVT_SecProps m_SecProps;
-  CPVT_WordProps m_WordProps;
 };
 
 class CFX_Edit {
  public:
-  static CFX_ByteString GetEditAppearanceStream(
-      CFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
-      const CPVT_WordRange* pRange = nullptr,
-      FX_BOOL bContinuous = TRUE,
-      uint16_t SubWord = 0);
+  static CFX_ByteString GetEditAppearanceStream(CFX_Edit* pEdit,
+                                                const CFX_FloatPoint& ptOffset,
+                                                const CPVT_WordRange* pRange,
+                                                FX_BOOL bContinuous,
+                                                uint16_t SubWord);
   static CFX_ByteString GetSelectAppearanceStream(
       CFX_Edit* pEdit,
       const CFX_FloatPoint& ptOffset,
-      const CPVT_WordRange* pRange = nullptr);
+      const CPVT_WordRange* pRange);
   static void DrawEdit(CFX_RenderDevice* pDevice,
                        CFX_Matrix* pUser2Device,
                        CFX_Edit* pEdit,
                        FX_COLORREF crTextFill,
                        FX_COLORREF crTextStroke,
                        const CFX_FloatRect& rcClip,
                        const CFX_FloatPoint& ptOffset,
                        const CPVT_WordRange* pRange,
                        CFX_SystemHandler* pSystemHandler,
                        void* pFFLData);
@@ skipping 36 matching lines @@
   void SetNotify(CPWL_EditCtrl* pNotify);
   void SetOprNotify(CPWL_Edit* pOprNotify);
 
   // Returns an iterator for the contents. Should not be released.
   CFX_Edit_Iterator* GetIterator();
   CPDF_VariableText* GetVariableText();
   IPVT_FontMap* GetFontMap();
   void Initialize();
 
   // Set the bounding box of the text area.
-  void SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint = TRUE);
+  void SetPlateRect(const CFX_FloatRect& rect);
   void SetScrollPos(const CFX_FloatPoint& point);
 
   // Set the horizontal text alignment. (nFormat [0:left, 1:middle, 2:right])
-  void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE);
+  void SetAlignmentH(int32_t nFormat, FX_BOOL bPaint);
   // Set the vertical text alignment. (nFormat [0:left, 1:middle, 2:right])
-  void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE);
+  void SetAlignmentV(int32_t nFormat, FX_BOOL bPaint);
 
   // Set the substitution character for hidden text.
-  void SetPasswordChar(uint16_t wSubWord = '*', FX_BOOL bPaint = TRUE);
+  void SetPasswordChar(uint16_t wSubWord, FX_BOOL bPaint);
 
   // Set the maximum number of words in the text.
-  void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE);
-  void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE);
-  void SetCharSpace(FX_FLOAT fCharSpace = 0.0f, FX_BOOL bPaint = TRUE);
-  void SetHorzScale(int32_t nHorzScale = 100, FX_BOOL bPaint = TRUE);
-  void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE);
-  void SetMultiLine(FX_BOOL bMultiLine = TRUE, FX_BOOL bPaint = TRUE);
-  void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
-  void SetAutoFontSize(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
-  void SetAutoScroll(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
-  void SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint = TRUE);
-  void SetTextOverflow(FX_BOOL bAllowed = FALSE, FX_BOOL bPaint = TRUE);
+  void SetLimitChar(int32_t nLimitChar);
+  void SetCharArray(int32_t nCharArray);
+  void SetCharSpace(FX_FLOAT fCharSpace);
+  void SetMultiLine(FX_BOOL bMultiLine, FX_BOOL bPaint);
+  void SetAutoReturn(FX_BOOL bAuto, FX_BOOL bPaint);
+  void SetAutoFontSize(FX_BOOL bAuto, FX_BOOL bPaint);
+  void SetAutoScroll(FX_BOOL bAuto, FX_BOOL bPaint);
+  void SetFontSize(FX_FLOAT fFontSize);
+  void SetTextOverflow(FX_BOOL bAllowed, FX_BOOL bPaint);
   FX_BOOL IsRichText() const;
   void SetRichText(FX_BOOL bRichText = TRUE, FX_BOOL bPaint = TRUE);
   FX_BOOL SetRichFontSize(FX_FLOAT fFontSize);
   FX_BOOL SetRichFontIndex(int32_t nFontIndex);
   FX_BOOL SetRichTextColor(FX_COLORREF dwColor);
   FX_BOOL SetRichTextScript(CPDF_VariableText::ScriptType nScriptType);
   FX_BOOL SetRichTextBold(FX_BOOL bBold = TRUE);
   FX_BOOL SetRichTextItalic(FX_BOOL bItalic = TRUE);
   FX_BOOL SetRichTextUnderline(FX_BOOL bUnderline = TRUE);
   FX_BOOL SetRichTextCrossout(FX_BOOL bCrossout = TRUE);
   FX_BOOL SetRichTextCharSpace(FX_FLOAT fCharSpace);
   FX_BOOL SetRichTextHorzScale(int32_t nHorzScale = 100);
   FX_BOOL SetRichTextLineLeading(FX_FLOAT fLineLeading);
   FX_BOOL SetRichTextLineIndent(FX_FLOAT fLineIndent);
   FX_BOOL SetRichTextAlignment(int32_t nAlignment);
   void OnMouseDown(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
   void OnMouseMove(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl);
   void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl);
-  void SetText(const FX_WCHAR* text,
-               int32_t charset = DEFAULT_CHARSET,
-               const CPVT_SecProps* pSecProps = nullptr,
-               const CPVT_WordProps* pWordProps = nullptr);
-  FX_BOOL InsertWord(uint16_t word,
-                     int32_t charset = DEFAULT_CHARSET,
-                     const CPVT_WordProps* pWordProps = nullptr);
-  FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = nullptr,
-                       const CPVT_WordProps* pWordProps = nullptr);
+  void SetText(const FX_WCHAR* text);
+  FX_BOOL InsertWord(uint16_t word, int32_t charset);
+  FX_BOOL InsertReturn();
   FX_BOOL Backspace();
   FX_BOOL Delete();
   FX_BOOL Clear();
-  FX_BOOL InsertText(const FX_WCHAR* text,
-                     int32_t charset = DEFAULT_CHARSET,
-                     const CPVT_SecProps* pSecProps = nullptr,
-                     const CPVT_WordProps* pWordProps = nullptr);
+  FX_BOOL InsertText(const FX_WCHAR* text, int32_t charset);
   FX_BOOL Redo();
   FX_BOOL Undo();
   int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const;
   CPVT_WordPlace WordIndexToWordPlace(int32_t index) const;
   CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace GetSectionBeginPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const;
   int32_t GetCaret() const;
@@ skipping 29 matching lines @@
   FX_BOOL CanUndo() const;
   FX_BOOL CanRedo() const;
   FX_BOOL IsModified() const;
   CPVT_WordRange GetVisibleWordRange() const;
   void AddUndoItem(IFX_Edit_UndoItem* pUndoItem);
 
   FX_BOOL Empty();
 
   CPVT_WordPlace DoInsertText(const CPVT_WordPlace& place,
                               const FX_WCHAR* text,
-                              int32_t charset,
-                              const CPVT_SecProps* pSecProps,
-                              const CPVT_WordProps* pWordProps);
+                              int32_t charset);
   int32_t GetCharSetFromUnicode(uint16_t word, int32_t nOldCharset);
 
   int32_t GetTotalLines() const;
 
  private:
   friend class CFX_Edit_Iterator;
   friend class CFXEU_InsertWord;
   friend class CFXEU_InsertReturn;
   friend class CFXEU_Backspace;
   friend class CFXEU_Delete;
   friend class CFXEU_Clear;
   friend class CFXEU_InsertText;
 
   void SetSel(const CPVT_WordPlace& begin, const CPVT_WordPlace& end);
 
   void RearrangeAll();
   void RearrangePart(const CPVT_WordRange& range);
   void ScrollToCaret();
   void SetScrollInfo();
   void SetScrollPosX(FX_FLOAT fx);
   void SetScrollPosY(FX_FLOAT fy);
   void SetScrollLimit();
   void SetContentChanged();
 
-  void SetText(const FX_WCHAR* text,
-               int32_t charset,
-               const CPVT_SecProps* pSecProps,
-               const CPVT_WordProps* pWordProps,
-               FX_BOOL bAddUndo,
-               FX_BOOL bPaint);
   FX_BOOL InsertWord(uint16_t word,
                      int32_t charset,
                      const CPVT_WordProps* pWordProps,
                      FX_BOOL bAddUndo,
                      FX_BOOL bPaint);
   FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps,
                        const CPVT_WordProps* pWordProps,
                        FX_BOOL bAddUndo,
                        FX_BOOL bPaint);
   FX_BOOL Backspace(FX_BOOL bAddUndo, FX_BOOL bPaint);
   FX_BOOL Delete(FX_BOOL bAddUndo, FX_BOOL bPaint);
   FX_BOOL Clear(FX_BOOL bAddUndo, FX_BOOL bPaint);
   FX_BOOL InsertText(const FX_WCHAR* text,
                      int32_t charset,
-                     const CPVT_SecProps* pSecProps,
-                     const CPVT_WordProps* pWordProps,
                      FX_BOOL bAddUndo,
                      FX_BOOL bPaint);
   void PaintInsertText(const CPVT_WordPlace& wpOld,
                        const CPVT_WordPlace& wpNew);
 
   inline CFX_FloatPoint VTToEdit(const CFX_FloatPoint& point) const;
   inline CFX_FloatPoint EditToVT(const CFX_FloatPoint& point) const;
   inline CFX_FloatRect VTToEdit(const CFX_FloatRect& rect) const;
   inline CFX_FloatRect EditToVT(const CFX_FloatRect& rect) const;
 
-  void Refresh(REFRESH_PLAN_E ePlan,
-               const CPVT_WordRange* pRange1 = nullptr,
-               const CPVT_WordRange* pRange2 = nullptr);
+  void Refresh();
   void RefreshPushLineRects(const CPVT_WordRange& wr);
   void RefreshPushRandomRects(const CPVT_WordRange& wr);
 
   void SetCaret(const CPVT_WordPlace& place);
   void SetCaretInfo();
   void SetCaretOrigin();
 
   CPVT_WordRange GetLatinWordsRange(const CPVT_WordPlace& place) const;
   CPVT_WordRange CombineWordRange(const CPVT_WordRange& wr1,
                                   const CPVT_WordRange& wr2);
@@ skipping 76 matching lines @@
                            int32_t charset,
                            int32_t nFontIndex) override;
   int32_t GetDefaultFontIndex() override;
   FX_BOOL IsLatinWord(uint16_t word) override;
 
  private:
   IPVT_FontMap* m_pFontMap;
 };
 
 #endif  // FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_