Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fxfa / src / app / xfa_ffdocview.cpp
index dcf6c28..1532e28 100644 (file)
@@ -171,7 +171,7 @@ void CXFA_FFDocView::ShowNullTestMsg()
             pAppProvider->LoadString(XFA_IDS_ValidateLimit, wsLimit);\r
             if (!wsLimit.IsEmpty()) {\r
                 CFX_WideString wsTemp;\r
-                wsTemp.Format((FX_LPCWSTR)wsLimit, iRemain);\r
+                wsTemp.Format((const FX_WCHAR*)wsLimit, iRemain);\r
                 wsMsg += FX_WSTRC(L"\n") + wsTemp;\r
             }\r
         }\r
@@ -696,7 +696,7 @@ void CXFA_FFDocView::RunCalculateRecursive(int32_t& iIndex)
         AddCalculateNodeNotify(pCurAcc->GetNode());\r
         int32_t iRefCount = (int32_t)(uintptr_t)pCurAcc->GetNode()->GetUserData(XFA_CalcRefCount);\r
         iRefCount++;\r
-        pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (FX_LPVOID)(uintptr_t)iRefCount);\r
+        pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (void*)(uintptr_t)iRefCount);\r
         if (iRefCount > 11) {\r
             break;\r
         }\r
@@ -719,7 +719,7 @@ int32_t CXFA_FFDocView::RunCalculateWidgets()
     }\r
     for (int32_t i = 0; i < m_CalculateAccs.GetSize(); i++) {\r
         CXFA_WidgetAcc* pCurAcc = (CXFA_WidgetAcc*)m_CalculateAccs[i];\r
-        pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (FX_LPVOID)(uintptr_t)0);\r
+        pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (void*)(uintptr_t)0);\r
     }\r
     m_CalculateAccs.RemoveAll();\r
     return XFA_EVENTERROR_Sucess;\r