xfa/fxfa/parser/xfa_script.h - Issue 2019333006: Replace void* with CFXJSE_HostObect and make wrapped objects inherit from it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fxfa/parser/xfa_script.h

Issue 2019333006: Replace void* with CFXJSE_HostObect and make wrapped objects inherit from it (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Another blown merge Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: xfa/fxfa/parser/xfa_script.h

diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h

index 350588f8b5272ca334b68e3943447d058e54fff1..da348f7a36fb0a62139cfee2c59c288561cb825d 100644

--- a/xfa/fxfa/parser/xfa_script.h

+++ b/xfa/fxfa/parser/xfa_script.h

@@ -48,8 +48,8 @@ class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {

void GetAttributeObject(CXFA_ObjArray& objArray) {

for (int32_t i = 0; i < GetSize(); i++) {

- CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(GetAt(i), NULL);

- objArray.Add(pObject);

+ objArray.Add(

+ static_cast<CXFA_Object*>(FXJSE_Value_ToObject(GetAt(i), nullptr)));

}

« no previous file with comments | « xfa/fxfa/parser/xfa_object.h ('k') | xfa/fxfa/parser/xfa_script_imp.cpp » ('j') | no next file with comments »