diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
| commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
| tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /fpdfsdk/src/javascript/global.cpp | |
| parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
| download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz | |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'fpdfsdk/src/javascript/global.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/global.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index f139380b20..06e147eb15 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -134,17 +134,17 @@ void global_alternate::Initial(CPDFDoc_Environment* pApp) UpdateGlobalPersistentVariables(); } -FX_BOOL global_alternate::QueryProperty(FX_LPCWSTR propname) +FX_BOOL global_alternate::QueryProperty(const FX_WCHAR* propname) { return CFX_WideString(propname) != L"setPersistent"; } -FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CFX_WideString& sError) +FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError) { js_global_data* pData = NULL; CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname); - if (m_mapGlobal.Lookup(sPropName, (FX_LPVOID&)pData)) + if (m_mapGlobal.Lookup(sPropName, (void*&)pData)) { pData->bDeleted = TRUE; return TRUE; @@ -153,7 +153,7 @@ FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CF return FALSE; } -FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS_PropValue& vp, CFX_WideString& sError) +FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError) { if (vp.IsSetting()) { @@ -202,7 +202,7 @@ FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS js_global_data* pData = NULL; CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname); - if (m_mapGlobal.Lookup(sPropName, (FX_LPVOID&)pData)) + if (m_mapGlobal.Lookup(sPropName, (void*&)pData)) { if (pData) { @@ -266,7 +266,7 @@ FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& CFX_ByteString sName = params[0].ToCFXByteString(); js_global_data* pData = NULL; - if (m_mapGlobal.Lookup(sName, (FX_LPVOID&)pData)) + if (m_mapGlobal.Lookup(sName, (void*&)pData)) { if (pData && !pData->bDeleted) { @@ -337,7 +337,7 @@ void global_alternate::CommitGlobalPersisitentVariables() { CFX_ByteString name; js_global_data* pData = NULL; - m_mapGlobal.GetNextAssoc(pos, name, (FX_LPVOID&)pData); + m_mapGlobal.GetNextAssoc(pos, name, (void*&)pData); if (pData) { @@ -491,7 +491,7 @@ void global_alternate::DestroyGlobalPersisitentVariables() { CFX_ByteString name; js_global_data* pData = NULL; - m_mapGlobal.GetNextAssoc(pos, name, (FX_LPVOID&)pData); + m_mapGlobal.GetNextAssoc(pos, name, (void*&)pData); delete pData; } @@ -499,13 +499,13 @@ void global_alternate::DestroyGlobalPersisitentVariables() } -FX_BOOL global_alternate::SetGlobalVariables(FX_LPCSTR propname, int nType, +FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType, double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent) { if (propname == NULL) return FALSE; js_global_data* pTemp = NULL; - m_mapGlobal.Lookup(propname, (FX_LPVOID&)pTemp); + m_mapGlobal.Lookup(propname, (void*&)pTemp); if (pTemp) { @@ -597,7 +597,7 @@ FX_BOOL global_alternate::SetGlobalVariables(FX_LPCSTR propname, int nType, return FALSE; } - m_mapGlobal.SetAt(propname, (FX_LPVOID)pNewData); + m_mapGlobal.SetAt(propname, (void*)pNewData); return TRUE; } |