summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-08-16 17:26:23 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-17 18:28:34 +0000
commit9342b33ec0e2b43c0ee0b94bb70f2e981c263877 (patch)
tree519e4585c8897224b4e778230876988790fbeb2a /xfa/fwl
parentb5df8a5abc6ed986b7fb9c43103d188d32deb4e7 (diff)
downloadpdfium-9342b33ec0e2b43c0ee0b94bb70f2e981c263877.tar.xz
Remove redundant members in CFDE_TxtEdtEngine
This CL removes a bunch of redundant members from the text edit engine. The change information tracking was removed as most of it was unused or was used inconsistently. Change-Id: I92460594e46accff0b78e1183c8574fc83ce728a Reviewed-on: https://pdfium-review.googlesource.com/11275 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/cfwl_edit.cpp6
-rw-r--r--xfa/fwl/cfwl_edit.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 0045c36858..6d14ad2e3c 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -410,12 +410,12 @@ void CFWL_Edit::OnCaretChanged() {
}
}
-void CFWL_Edit::OnTextChanged(const FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo) {
+void CFWL_Edit::OnTextChanged(const CFX_WideString& prevText) {
if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VAlignMask)
UpdateVAlignment();
CFWL_EventTextChanged event(this);
- event.wsPrevText = ChangeInfo.wsPrevText;
+ event.wsPrevText = prevText;
DispatchEvent(&event);
LayoutScrollBar();
@@ -640,7 +640,6 @@ void CFWL_Edit::UpdateEditEngine() {
void CFWL_Edit::UpdateEditParams() {
FDE_TXTEDTPARAMS params;
- params.nHorzScale = 100;
params.fPlateWidth = m_rtEngine.width;
params.fPlateHeight = m_rtEngine.height;
if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_CombText)
@@ -714,7 +713,6 @@ void CFWL_Edit::UpdateEditParams() {
if (params.nLineCount <= 0)
params.nLineCount = 1;
params.fTabWidth = params.fFontSize * 1;
- params.wLineBreakChar = L'\n';
params.pEventSink = this;
m_EdtEngine.SetEditParams(params);
}
diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h
index 27fd205287..9915f05c00 100644
--- a/xfa/fwl/cfwl_edit.h
+++ b/xfa/fwl/cfwl_edit.h
@@ -92,7 +92,7 @@ class CFWL_Edit : public CFWL_Widget {
void SetOuter(CFWL_Widget* pOuter);
void OnCaretChanged();
- void OnTextChanged(const FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo);
+ void OnTextChanged(const CFX_WideString& prevText);
void OnSelChanged();
bool OnPageLoad(int32_t nPageIndex);
bool OnPageUnload(int32_t nPageIndex);