From a6b54d999992d72b2d9ea33efec0b7d642ea9f2d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 12:21:12 +0800
Subject: [PATCH] update
---
jrj/project/business/BasicCode/Simple.Menu.Config.cpp | 8 ++++----
jrj/project/business/SO/Product.Select.SO.cpp | 6 +++---
jrj/project/business/Quote3.list3.cpp | 0
jrj/project/business/GDN3.list.cpp | 6 +++---
jrj/project/business/PO/business4.cpp | 0
jrj/project/business/GDN/SelectItem.New.GDN.cpp | 0
jrj/project/business/Enquiry/Entity.Product.Select.cpp | 4 ++--
jrj/project/vindexmenu.cpp | 2 +-
jrj/project/business/SystemSettings/Flow3.cpp | 2 +-
jrj/project/business/PO/PO.BatchPrecess.polist.cpp | 0
jrj/project/business/Enquiry.list.cpp | 4 ++--
jrj/project/business/Supplier/list.Owner.Supplier.cpp | 0
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/business/HR/AdministrativeDepartment.cpp | 6 +++---
jrj/project/business/Customer3.list.cpp | 0
jrj/project/business/Supplier3.list.cpp | 2 +-
jrj/project/business/HR/ManpowerFile.cpp | 2 +-
17 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/jrj/project/business/BasicCode/Simple.Menu.Config.cpp b/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
index 196ac87..7ab5ac8 100644
--- a/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
+++ b/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
@@ -180,7 +180,7 @@
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
HTREEITEM hItem = nmtv.itemNew.hItem;
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_gs.GetItemData(hItem);
+ KXMLDOMElement e = tv_gs.GetItemData(hItem);
//trace(L"%s", e.xml);
//xstring id = e.selectSingleNode(L"MenuID").text();
dw_list.AcceptText();
@@ -202,9 +202,9 @@
tv_gs.DeleteItem(xto);
return -1;
}
- KXMLDOMElement& fid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
+ KXMLDOMElement fid = tv_gs.GetItemData(xto);
HTREEITEM xpto =tv_gs.GetParentItem(xto);
- KXMLDOMElement& tid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
+ KXMLDOMElement tid = tv_gs.GetItemData(xto);
//trace(L"%s-------------------------%s",fid.xml,tid.xml);
xml x ;
@@ -229,7 +229,7 @@
//
HTREEITEM xpfrom =tv_gs.GetParentItem(xfrom);
//trace(L"%d", xpfrom);
- KXMLDOMElement& fe = *(KXMLDOMElement*)tv_gs.GetItemData(xpfrom);
+ KXMLDOMElement fe = tv_gs.GetItemData(xpfrom);
//trace(L"%s-------------------------%s",fe.xml,tid.xml);
KXMLDOMElement fe1 = fe.selectSingleNode(L"item[@guid='"+id1+L"']");
fe.removeChild(fe1);
diff --git a/jrj/project/business/Customer3.list.cpp b/jrj/project/business/Customer3.list.cpp
index d44f6ed..683fb4c 100644
--- a/jrj/project/business/Customer3.list.cpp
+++ b/jrj/project/business/Customer3.list.cpp
Binary files differ
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index e07aea8..670b9c1 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -196,7 +196,7 @@
xstring name = tv_folder.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder,hItem,e.getAttribute(L"no"));
return 1;
@@ -212,7 +212,7 @@
xstring name = tv_folder_pricebill.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder_pricebill.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder_pricebill.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder_pricebill.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder_pricebill,hItem,e.getAttribute(L"no"));
return 1;
diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 621b8de..b160594 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -1031,7 +1031,7 @@
{
while (true)
{
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
xstring str = e1.getAttribute(L"no");
if (str.find(L"Customer:") >= 0) return hItem;
hItem = tv_folder.GetParentItem(hItem);
@@ -1044,7 +1044,7 @@
{
hItem = LookupCustomerFolder(hItem);
if (hItem == 0) return L"";
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
xstring str = e1.getAttribute(L"no");
return str.mid(xstring(L"Customer:").length(), 9999);
}
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index 697323c..4727cfc 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/SelectItem.New.GDN.cpp b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
index e48891c..c06cc2c 100644
--- a/jrj/project/business/GDN/SelectItem.New.GDN.cpp
+++ b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 7477d8c..342c44f 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -113,7 +113,7 @@
xstring name = tv_folder.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!child)ExpandFolderItem(hItem, e.getAttribute(L"no"));
return 1;
@@ -207,7 +207,7 @@
if (!hItem) return 1;
}
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
xstring no = e1.getAttribute(L"no");
//xml x = 0;
//x = ViewObject::RetrieveData(myDataUrl,L"no",no,L"QueryTxt", m_QueryTxt,L"rows",rows);
@@ -241,7 +241,7 @@
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
xstring no = e1.getAttribute(L"no");
trace(L"\r\n" + no + L"\r\n" + m_QueryTxt);
diff --git a/jrj/project/business/HR/AdministrativeDepartment.cpp b/jrj/project/business/HR/AdministrativeDepartment.cpp
index 7556789..a613fc6 100644
--- a/jrj/project/business/HR/AdministrativeDepartment.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -124,7 +124,7 @@
if (!hItem ) return 1;
//int hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
xstring name = e.getAttribute(L"name");
xml x = 0;
xstring parentid = L"";
@@ -157,7 +157,7 @@
HTREEITEM child = tv_folder.GetChildItem(hItem);
if (!child) {
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!e.getAttribute(L"name")) {
xstring adid = e.selectSingleNode(L"adid").text();
xstring parentid = adid;
@@ -181,7 +181,7 @@
if (!hItem )
return 1;
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
xstring parentid = L"";//父级id
if (!e.getAttribute(L"name"))
parentid = e.selectSingleNode(L"adid").text();
diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index c3c5509..be4a0cd 100644
--- a/jrj/project/business/HR/ManpowerFile.cpp
+++ b/jrj/project/business/HR/ManpowerFile.cpp
@@ -201,7 +201,7 @@
if (!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
xstring no = e1.getAttribute(L"no");
xml x ;
diff --git a/jrj/project/business/PO/PO.BatchPrecess.polist.cpp b/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
index 44c40a7..49a1864 100644
--- a/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
+++ b/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
Binary files differ
diff --git a/jrj/project/business/PO/business4.cpp b/jrj/project/business/PO/business4.cpp
index 0a4b53f..cff6a3f 100644
--- a/jrj/project/business/PO/business4.cpp
+++ b/jrj/project/business/PO/business4.cpp
Binary files differ
diff --git a/jrj/project/business/Quote3.list3.cpp b/jrj/project/business/Quote3.list3.cpp
index f775bb3..1c7e939 100644
--- a/jrj/project/business/Quote3.list3.cpp
+++ b/jrj/project/business/Quote3.list3.cpp
Binary files differ
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index 9e1a98b..7ac9354 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -528,7 +528,7 @@
int ItemMaint()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement& e = tv_folder.GetItemData(hItem);
//xstring no = e.getAttribute(L"no");
//if(no==L"") return 1;
xstring guid = e.getAttribute(L"guid");
@@ -556,7 +556,7 @@
HTREEITEM hItem = tv_folder.GetSelectedItem();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement& e = tv_folder.GetItemData(hItem);
//alert(e.xml);
@@ -1044,7 +1044,7 @@
if (selectname != name)
{
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
xstring str = e1.getAttribute(L"no");
if (str.find(L"Customer1:") == 0 || str.find(L"Customer:") == 0 || str.find(L"SO:") == 0 || str.find(L"Quote:") == 0)
{
diff --git a/jrj/project/business/Supplier/list.Owner.Supplier.cpp b/jrj/project/business/Supplier/list.Owner.Supplier.cpp
index 7cb4c10..2d2bdf9 100644
--- a/jrj/project/business/Supplier/list.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/list.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier3.list.cpp b/jrj/project/business/Supplier3.list.cpp
index 6c3d5bb..6a7c199 100644
--- a/jrj/project/business/Supplier3.list.cpp
+++ b/jrj/project/business/Supplier3.list.cpp
@@ -130,7 +130,7 @@
//alert(L"1");
HTREEITEM h = tv_1.GetSelectedItem();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_1.GetItemData(h);
+ KXMLDOMElement e = tv_1.GetItemData(h);
xstring t = e.selectSingleNode(L"@type").text();
m_sType = t + L"";
diff --git a/jrj/project/business/SystemSettings/Flow3.cpp b/jrj/project/business/SystemSettings/Flow3.cpp
index 4ec66de..d03622e 100644
--- a/jrj/project/business/SystemSettings/Flow3.cpp
+++ b/jrj/project/business/SystemSettings/Flow3.cpp
@@ -333,7 +333,7 @@
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
HTREEITEM hItem = nmtv.itemNew.hItem;
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_1.GetItemData(hItem);
+ KXMLDOMElement e = tv_1.GetItemData(hItem);
flowid = e.getAttribute(L"flowID");
HCURSOR hCursor = xutil::SetCursorWait();
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 612ff34..8da9fdb 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -308,7 +308,7 @@
{
LPARAM pa = cbx_panelName.GetItemData(i);
if (!pa)return 1;
- KXMLDOMElement& hData = *(KXMLDOMElement*)pa;
+ KXMLDOMElement hData = pa;
string Name= hData.selectSingleNode(L"name").text();
string Image = L"15";
if(hData.selectSingleNode(L"image")) Image=hData.selectSingleNode(L"image").text();
--
Gitblit v1.9.3