From ed566acc9b4627e37d8ca254bd66362ffb45b2ba Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 09:33:28 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/total3/ViewTotalWin.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/jrj/project/total3/ViewTotalWin.cpp b/jrj/project/total3/ViewTotalWin.cpp
index e8e4699..768456e 100644
--- a/jrj/project/total3/ViewTotalWin.cpp
+++ b/jrj/project/total3/ViewTotalWin.cpp
@@ -15,11 +15,12 @@
{
public:
ViewTotalWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+public:
static ViewTotalWin* CreateInstance(void* implPtr, void* hWnd)
{
return new ViewTotalWin(implPtr, (HWND)hWnd);
}
-
+public:
xdwgrid dw_list;
xoffice dw_office;
xcell dw_cell;
@@ -118,7 +119,7 @@
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg arg1 ;
+ xaserverarg arg1 =GetArg();
arg1.AddArg(L"value", Content);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg1);
return 1;
@@ -135,7 +136,7 @@
if (argUrl != L"")
{
xaserverarg ar ;
- ar.setNativePointer(ar.CreateInstance());
+ //ar.setNativePointer(ar.CreateInstance());
ar.AddArg(L"argurl", argUrl);
if (argStr != L"")
ar.AddArg(L"arg", argStr);
@@ -191,7 +192,7 @@
for (int i = 1; i < dw.GetColumnCount(); i++)
{
xstring colname = dw.GetColumnName(i);
- if (str.find(L"!" + colname + L",L") >= 0)
+ if (str.find(L"!" + colname + L",") >= 0)
{
dw.SetColumnState((LPCTSTR)colname.c_str(), false);
}
@@ -494,7 +495,7 @@
{
KXMLDOMElement rpt = nlist.item(i);
xstring name = rpt.getAttribute(L"name");
- xc.AddItem( name, rpt);
+ xc.AddItem( name, rpt.ptr());
if (i == 0) xc.SetText(name);
if (i == 0) rptEle = rpt;
}
--
Gitblit v1.9.3