From a440bb3f11f42b7a22624e9771dd8d9c57075f06 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 14 Sep 2016 07:01:54 -0700 Subject: Split CPDFXFA_Document apart [DO NOT COMMIT] This CL renames IXFA_DocProvider to IXFA_DocEnvironment to better describe the purpose. Then, CPDFXFA_Document has all of the IXFA_DocEnvironment methods removed and placed in CPDFXFA_DocEnvironment. The CPDFXFA_Document then has a CPDFXFA_DocEnvironment. This splits the code related to the document apart from the XFA callback methods to work with that document. Review-Url: https://codereview.chromium.org/2328573002 --- xfa/fwl/basewidget/fwl_editimp.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 104054f4e1..93f5dd8ac6 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -1640,8 +1640,9 @@ FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, if (!pXFAWidget) return FALSE; - IXFA_DocProvider* pDocProvider = pXFAWidget->GetDoc()->GetDocProvider(); - if (!pDocProvider) + IXFA_DocEnvironment* pDocEnvironment = + pXFAWidget->GetDoc()->GetDocEnvironment(); + if (!pDocEnvironment) return FALSE; if (bVisible) { @@ -1649,10 +1650,10 @@ FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, pXFAWidget->GetRotateMatrix(mt); CFX_RectF rt(*pRtAnchor); mt.TransformRect(rt); - pDocProvider->DisplayCaret(pXFAWidget, bVisible, &rt); + pDocEnvironment->DisplayCaret(pXFAWidget, bVisible, &rt); return TRUE; } - pDocProvider->DisplayCaret(pXFAWidget, bVisible, pRtAnchor); + pDocEnvironment->DisplayCaret(pXFAWidget, bVisible, pRtAnchor); return TRUE; } -- cgit v1.2.3