github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*OfficeAutomation: Removed MessageBox() calls thanks to ratah

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4286 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2011-12-09 13:22:26 +00:00
parent ce8421d351
commit 623f2ef65d
2 changed files with 10 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bazaar/OfficeAutomation/OfficeAutomation.cpp
View file

@ -176,7 +176,7 @@ bool Ole::Invoke(int autoType, VARIANT *pvResult, IDispatch *pDisp, String name,
va_start(marker, cArgs);
if(!pDisp) {
MessageBox(NULL, t_("OfficeAutomation internal error. ObjectOle included is null"), t_("Error"), 0x10010);
LOG("OfficeAutomation internal error. ObjectOle included is null");
return false;
}
// Variables used
@ -195,8 +195,8 @@ bool Ole::Invoke(int autoType, VARIANT *pvResult, IDispatch *pDisp, String name,
// Get DISPID for name passed
hr = pDisp->GetIDsOfNames(IID_NULL, (LPOLESTR *)&ptName, 1, LOCALE_USER_DEFAULT, &dispID);
if(FAILED(hr)) {
sprintf(buf, t_("OfficeAutomation internal error. Command \"%s\" not found for object or problem when running it"), szName);
MessageBox(NULL, buf, t_("Ole error"), 0x10010);
sprintf(buf, "OfficeAutomation internal error. Command \"%s\" not found for object or problem when running it", szName);
LOG(buf);
return false;
}
VARIANT *pArgs = new VARIANT[cArgs+1]; // Allocate memory for arguments
@ -218,8 +218,8 @@ bool Ole::Invoke(int autoType, VARIANT *pvResult, IDispatch *pDisp, String name,
delete [] pArgs;
if(FAILED(hr)) {
//sprintf(buf, "IDispatch::Invoke(\"%s\"=%08lx) failed w/err 0x%08lx", szName, dispID, hr);
//MessageBox(NULL, buf, "Ole::Invoke()", 0x10010);
sprintf(buf, "IDispatch::Invoke(\"%s\"=%08lx) failed w/err 0x%08lx", szName, dispID, hr);
LOG(buf);
return false;
}
return true;
@ -229,14 +229,14 @@ ObjectOle Ole::CreateObject(String application) {
CLSID clsid;
HRESULT hr = CLSIDFromProgID(application.ToWString(), &clsid); // Get CLSID for our server
if(FAILED(hr)) {
//::MessageBox(NULL, "CLSIDFromProgID() failed", "Error", 0x10010);
LOG("CLSIDFromProgID() failed");
return NULL;
}
ObjectOle app;
// Start server and get IDispatch
hr = CoCreateInstance(clsid, NULL, CLSCTX_LOCAL_SERVER, IID_IDispatch, (void **)&app);
if(FAILED(hr)) {
::MessageBox(NULL, t_("OfficeAutomation internal error. Application not registered properly"), t_("Error"), 0x10010);
LOG("OfficeAutomation internal error. Application not registered properly");
return NULL;
}
return app;
@ -399,7 +399,7 @@ MSSheet::MSSheet() {
App = Ole::CreateObject("Excel.Application");
if (!(Books = Ole::GetObject(App, "Workbooks"))) {
::MessageBox(NULL, t_("Excel workbooks not loaded properly"), t_("Error"), 0x10010);
LOG("Excel workbooks not loaded properly");
return;
}
}
@ -1134,7 +1134,7 @@ MSDoc::MSDoc() {
App = Ole::CreateObject("Word.Application");
if (!(Docs = Ole::GetObject(App, "Documents"))) {
::MessageBox(NULL, t_("Word document not loaded properly"), t_("Error"), 0x10010);
LOG("Word document not loaded properly");
return;
}
}

30
bazaar/OfficeAutomation/OfficeAutomation.t
View file

@ -1,31 +1,3 @@
#ifdef _MSC_VER
#pragma setlocale("C")
#endif
// OfficeAutomation.cpp
T_("OfficeAutomation internal error. ObjectOle included is null")
esES("Error interno en OfficeAutomation. ObjectOle incluido es nulo")
T_("Error")
esES("Error")
T_("OfficeAutomation internal error. Command \"%s\" not found for object o"
"r problem when running it")
esES("Error interno en OfficeAutomation. Orden \"%s\" no encontrada para obj"
"eto o problema al ejecutarla")
T_("Ole error")
esES("Error en Ole")
T_("OfficeAutomation internal error. Application not registered properly")
esES("Error interno en OfficeAutomation. Aplicaci\303\263n no registrada cor"
"rectamente")
T_("Excel workbooks not loaded properly")
esES("Libro de Excel no abierto correctamente")
T_("Word document not loaded properly")
esES("Documento de Word no abierto correctamente")
#endif