Merge to XFA: Remove header files that only have includes.

fpdfsdk/src/pdfwindow/PWL_Edit.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 "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxcrt/fx_xml.h"
-#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
-
-/* ---------------------------- CPWL_Edit ------------------------------ */
+#include "public/fpdf_fwlevent.h"
 
 CPWL_Edit::CPWL_Edit()
     : m_pFillerNotify(NULL), m_pSpellCheck(NULL), m_bFocus(FALSE) {
   m_pFormFiller = NULL;
 }
 
 CPWL_Edit::~CPWL_Edit() {
   ASSERT(m_bFocus == FALSE);
 }
 
@@ skipping 65 matching lines @@
   if (CPWL_ScrollBar* pVSB = GetVScrollBar()) {
     if (pVSB->IsVisible()) {
       rcClient.right -= PWL_SCROLLBAR_WIDTH;
     }
   }
 
   return rcClient;
 }
 
 void CPWL_Edit::SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat,
-                                FX_BOOL bPaint /* = TRUE*/) {
+                                FX_BOOL bPaint) {
   m_pEdit->SetAlignmentH((int32_t)nFormat, bPaint);
 }
 
 void CPWL_Edit::SetAlignFormatV(PWL_EDIT_ALIGNFORMAT_V nFormat,
-                                FX_BOOL bPaint /* = TRUE*/) {
+                                FX_BOOL bPaint) {
   m_pEdit->SetAlignmentV((int32_t)nFormat, bPaint);
 }
 
 FX_BOOL CPWL_Edit::CanSelectAll() const {
   return GetSelectWordRange() != m_pEdit->GetWholeWordRange();
 }
 
 FX_BOOL CPWL_Edit::CanClear() const {
   return !IsReadOnly() && m_pEdit->IsSelected();
 }
@@ skipping 999 matching lines @@
                                             FX_BOOL bArabic) const {
   CPVT_WordRange range;
 
   if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) {
     CPVT_Word wordinfo;
     CPVT_WordPlace wpStart(place), wpEnd(place);
     pIterator->SetAt(place);
 
     if (bLatin) {
       while (pIterator->NextWord()) {
-        if (pIterator->GetWord(wordinfo) &&
-            FX_EDIT_ISLATINWORD(wordinfo.Word)) {
-          wpEnd = pIterator->GetAt();
-          continue;
-        } else
+        if (!pIterator->GetWord(wordinfo) ||
+            !FX_EDIT_ISLATINWORD(wordinfo.Word)) {
           break;
-      };
+        }
+
+        wpEnd = pIterator->GetAt();
+      }
     } else if (bArabic) {
       while (pIterator->NextWord()) {
-        if (pIterator->GetWord(wordinfo) && PWL_ISARABICWORD(wordinfo.Word)) {
-          wpEnd = pIterator->GetAt();
-          continue;
-        } else
+        if (!pIterator->GetWord(wordinfo) || !PWL_ISARABICWORD(wordinfo.Word))
           break;
-      };
+
+        wpEnd = pIterator->GetAt();
+      }
     }
 
     pIterator->SetAt(place);
 
     if (bLatin) {
       do {
-        if (pIterator->GetWord(wordinfo) &&
-            FX_EDIT_ISLATINWORD(wordinfo.Word)) {
-          continue;
-        } else {
-          wpStart = pIterator->GetAt();
+        if (!pIterator->GetWord(wordinfo) ||
+            !FX_EDIT_ISLATINWORD(wordinfo.Word)) {
           break;
         }
+
+        wpStart = pIterator->GetAt();
       } while (pIterator->PrevWord());
     } else if (bArabic) {
       do {
-        if (pIterator->GetWord(wordinfo) && PWL_ISARABICWORD(wordinfo.Word)) {
-          continue;
-        } else {
-          wpStart = pIterator->GetAt();
+        if (!pIterator->GetWord(wordinfo) || !PWL_ISARABICWORD(wordinfo.Word))
           break;
-        }
+
+        wpStart = pIterator->GetAt();
       } while (pIterator->PrevWord());
     }
 
     range.Set(wpStart, wpEnd);
   }
 
   return range;
 }
 
 void CPWL_Edit::GeneratePageObjects(
     CPDF_PageObjects* pPageObjects,
     const CPDF_Point& ptOffset,
     CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
   IFX_Edit::GeneratePageObjects(
       pPageObjects, m_pEdit, ptOffset, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       ObjArray);
 }
 
 void CPWL_Edit::GeneratePageObjects(CPDF_PageObjects* pPageObjects,
                                     const CPDF_Point& ptOffset) {
   CFX_ArrayTemplate<CPDF_TextObject*> ObjArray;
   IFX_Edit::GeneratePageObjects(
       pPageObjects, m_pEdit, ptOffset, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       ObjArray);
 }