summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-14 21:49:19 -0700
committerLei Zhang <thestig@chromium.org>2015-08-14 21:49:19 -0700
commit62b2e912dc2a508972fbf01b25f7449c39ff1543 (patch)
tree47a244dc5891b2a338ca529b796e12994e642cbc /fpdfsdk
parentbdf72c353af5b8a34ef5efdeddfff36d2089a158 (diff)
downloadpdfium-62b2e912dc2a508972fbf01b25f7449c39ff1543.tar.xz
Merge to XFA: Use override in more classes in core/
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1292613003 . (cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f) Review URL: https://codereview.chromium.org/1296043002 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Edit.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h2
-rw-r--r--fpdfsdk/src/fxedit/fxet_edit.cpp4
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Edit.cpp2
4 files changed, 3 insertions, 7 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 0281d37ed7..c7430e5238 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -164,8 +164,6 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify {
FX_BOOL bLatin,
FX_BOOL bArabic) const;
- void AjustArabicWords(const CPVT_WordRange& wr);
-
public:
FX_BOOL IsProceedtoOnChar(FX_WORD nKeyCode, FX_DWORD nFlag);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 0845bb17d1..e66c15e5e7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -448,7 +448,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void CreateScrollBar(const PWL_CREATEPARAM& cp);
void CreateVScrollBar(const PWL_CREATEPARAM& cp);
- void AjustStyle();
+ void AdjustStyle();
void CreateMsgControl();
void DestroyMsgControl();
diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp
index efef2ca884..218ed16165 100644
--- a/fpdfsdk/src/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/src/fxedit/fxet_edit.cpp
@@ -2801,8 +2801,8 @@ FX_BOOL CFX_Edit::Clear(FX_BOOL bAddUndo, FX_BOOL bPaint) {
}
} else {
if (pIterator->GetWord(wordinfo)) {
- oldplace = m_pVT->AjustLineHeader(oldplace, TRUE);
- place = m_pVT->AjustLineHeader(place, TRUE);
+ oldplace = m_pVT->AdjustLineHeader(oldplace, TRUE);
+ place = m_pVT->AdjustLineHeader(place, TRUE);
AddEditUndoItem(new CFXEU_ClearRich(
this, oldplace, place, range, wordinfo.Word,
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index edefd7ecd2..3271c80fdb 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -1203,8 +1203,6 @@ CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place,
return range;
}
-void CPWL_Edit::AjustArabicWords(const CPVT_WordRange& wr) {}
-
void CPWL_Edit::GeneratePageObjects(
CPDF_PageObjects* pPageObjects,
const CPDF_Point& ptOffset,