summaryrefslogtreecommitdiff
path: root/xfa/src/fwl
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-03-01 11:34:03 -0800
committerTom Sepez <tsepez@chromium.org>2016-03-01 11:34:03 -0800
commit50dfc4a7068e8e08105f7b9a3945136e7246e677 (patch)
treea292ef9ae17bfabcb20c94505320dc6c5f6e6258 /xfa/src/fwl
parent23835e3eadc276e4235cbb0a56c8e19ebf7a58f9 (diff)
downloadpdfium-50dfc4a7068e8e08105f7b9a3945136e7246e677.tar.xz
Replace FX_LPCRECT typedef with underlying types
Helps with transparency. Also remove default args and use override consistently in the affected methods. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1751093002 .
Diffstat (limited to 'xfa/src/fwl')
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_editimp.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 4cbf92ba7b..74c7ef21fe 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -866,7 +866,7 @@ FX_BOOL CFWL_EditImp::On_PageLoad(IFDE_TxtEdtEngine* pEdit,
IFDE_TxtEdtPage* pPage = pEdtEngine->GetPage(nPageIndex);
if (!pPage)
return FALSE;
- pPage->LoadPage();
+ pPage->LoadPage(nullptr, nullptr);
return TRUE;
}
FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine* pEdit,
@@ -876,7 +876,7 @@ FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine* pEdit,
IFDE_TxtEdtPage* pPage = pEdtEngine->GetPage(nPageIndex);
if (!pPage)
return FALSE;
- pPage->UnloadPage();
+ pPage->UnloadPage(nullptr);
return TRUE;
}
@@ -1186,23 +1186,23 @@ void CFWL_EditImp::UpdateEditParams() {
params.pEventSink = this;
m_pEdtEngine->SetEditParams(params);
}
+
void CFWL_EditImp::UpdateEditLayout() {
- if (m_pEdtEngine->GetTextLength() <= 0) {
- m_pEdtEngine->SetTextByStream(NULL);
- }
+ if (m_pEdtEngine->GetTextLength() <= 0)
+ m_pEdtEngine->SetTextByStream(nullptr);
+
IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
- if (pPage) {
- pPage->UnloadPage();
- pPage = NULL;
- }
+ if (pPage)
+ pPage->UnloadPage(nullptr);
+
m_pEdtEngine->StartLayout();
- m_pEdtEngine->DoLayout(NULL);
+ m_pEdtEngine->DoLayout(nullptr);
m_pEdtEngine->EndLayout();
pPage = m_pEdtEngine->GetPage(0);
- if (pPage) {
- pPage->LoadPage();
- }
+ if (pPage)
+ pPage->LoadPage(nullptr, nullptr);
}
+
FX_BOOL CFWL_EditImp::UpdateOffset() {
CFX_RectF rtCaret;
m_pEdtEngine->GetCaretRect(rtCaret);