| Index: core/fxcrt/fx_basic_util.cpp
|
| diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
|
| index be5200fc6fc1d47d9435010a12c2f8e3b1f9eb64..63f184cb1b7facc6998c9eb175c3c93ee9865802 100644
|
| --- a/core/fxcrt/fx_basic_util.cpp
|
| +++ b/core/fxcrt/fx_basic_util.cpp
|
| @@ -17,87 +17,6 @@
|
| #include <algorithm>
|
| #include <cctype>
|
|
|
| -#ifdef PDF_ENABLE_XFA
|
| -CFX_PrivateData::CFX_PrivateData() {}
|
| -
|
| -CFX_PrivateData::~CFX_PrivateData() {
|
| - ClearAll();
|
| -}
|
| -void FX_PRIVATEDATA::FreeData() {
|
| - if (!m_pData) {
|
| - return;
|
| - }
|
| - if (m_bSelfDestruct) {
|
| - delete static_cast<CFX_Deletable*>(m_pData);
|
| - } else if (m_pCallback) {
|
| - m_pCallback(m_pData);
|
| - }
|
| -}
|
| -void CFX_PrivateData::AddData(void* pModuleId,
|
| - void* pData,
|
| - PD_CALLBACK_FREEDATA callback,
|
| - FX_BOOL bSelfDestruct) {
|
| - if (!pModuleId) {
|
| - return;
|
| - }
|
| - FX_PRIVATEDATA* pList = m_DataList.GetData();
|
| - int count = m_DataList.GetSize();
|
| - for (int i = 0; i < count; i++) {
|
| - if (pList[i].m_pModuleId == pModuleId) {
|
| - pList[i].FreeData();
|
| - pList[i].m_pData = pData;
|
| - pList[i].m_pCallback = callback;
|
| - return;
|
| - }
|
| - }
|
| - FX_PRIVATEDATA data = {pModuleId, pData, callback, bSelfDestruct};
|
| - m_DataList.Add(data);
|
| -}
|
| -void CFX_PrivateData::SetPrivateData(void* pModuleId,
|
| - void* pData,
|
| - PD_CALLBACK_FREEDATA callback) {
|
| - AddData(pModuleId, pData, callback, FALSE);
|
| -}
|
| -void CFX_PrivateData::SetPrivateObj(void* pModuleId, CFX_Deletable* pObj) {
|
| - AddData(pModuleId, pObj, NULL, TRUE);
|
| -}
|
| -FX_BOOL CFX_PrivateData::RemovePrivateData(void* pModuleId) {
|
| - if (!pModuleId) {
|
| - return FALSE;
|
| - }
|
| - FX_PRIVATEDATA* pList = m_DataList.GetData();
|
| - int count = m_DataList.GetSize();
|
| - for (int i = 0; i < count; i++) {
|
| - if (pList[i].m_pModuleId == pModuleId) {
|
| - m_DataList.RemoveAt(i);
|
| - return TRUE;
|
| - }
|
| - }
|
| - return FALSE;
|
| -}
|
| -void* CFX_PrivateData::GetPrivateData(void* pModuleId) {
|
| - if (!pModuleId) {
|
| - return NULL;
|
| - }
|
| - FX_PRIVATEDATA* pList = m_DataList.GetData();
|
| - int count = m_DataList.GetSize();
|
| - for (int i = 0; i < count; i++) {
|
| - if (pList[i].m_pModuleId == pModuleId) {
|
| - return pList[i].m_pData;
|
| - }
|
| - }
|
| - return NULL;
|
| -}
|
| -void CFX_PrivateData::ClearAll() {
|
| - FX_PRIVATEDATA* pList = m_DataList.GetData();
|
| - int count = m_DataList.GetSize();
|
| - for (int i = 0; i < count; i++) {
|
| - pList[i].FreeData();
|
| - }
|
| - m_DataList.RemoveAll();
|
| -}
|
| -#endif // PDF_ENABLE_XFA
|
| -
|
| void FX_atonum(const CFX_ByteStringC& strc, FX_BOOL& bInteger, void* pData) {
|
| if (strc.Find('.') == -1) {
|
| bInteger = TRUE;
|
|
|