From ea03be1b12fccb6b4ee4667b06d827a6ed9f0721 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 07 四月 2025 11:38:38 +0800
Subject: [PATCH] update
---
jrj/xframe/xcontrol/xexcel.hpp | 4 ++--
jrj/project/business/Expense/SalaryslipImp.cpp | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jrj/project/business/Expense/SalaryslipImp.cpp b/jrj/project/business/Expense/SalaryslipImp.cpp
index a2d89ae..e65136b 100644
--- a/jrj/project/business/Expense/SalaryslipImp.cpp
+++ b/jrj/project/business/Expense/SalaryslipImp.cpp
Binary files differ
diff --git a/jrj/xframe/xcontrol/xexcel.hpp b/jrj/xframe/xcontrol/xexcel.hpp
index 5ebb436..e562cdc 100644
--- a/jrj/xframe/xcontrol/xexcel.hpp
+++ b/jrj/xframe/xcontrol/xexcel.hpp
@@ -50,9 +50,9 @@
{
return GetKExcel()->GetValidColumn();
}
- BSTR GetCellString(int row, int col)
+ xstring GetCellString(int row, int col)
{
- return GetKExcel()->GetCellString(row, col);
+ return xstring(GetKExcel()->GetCellString(row, col),true);
}
int SetICellString(int row, int col, const wchar_t* val)
{
--
Gitblit v1.9.3