Merge to XFA: Add missing operators for CFX_xxxString combo patch.