suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0001614: Provide proper Error Message for corrupt xml files

Browse Source
This commit is contained in:
wmayer 2014-07-16 19:12:19 +02:00
parent a5c8529b53
commit c6af002ab5
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/ApplicationPy.cpp
View File

@ -29,6 +29,8 @@
# include <QPrinter> # include <QPrinter>
#endif #endif
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/TranscodingException.hpp>
#include "Application.h" #include "Application.h"
#include "BitmapFactory.h" #include "BitmapFactory.h"
@ -529,6 +531,17 @@ PyObject* Application::sActivateWorkbenchHandler(PyObject * /*self*/, PyObject *
PyErr_SetString(PyExc_Exception, e.what()); PyErr_SetString(PyExc_Exception, e.what());
return 0; return 0;
} }
catch (const XERCES_CPP_NAMESPACE_QUALIFIER TranscodingException& e) {
std::stringstream err;
char *pMsg = XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode(e.getMessage());
err << "Transcoding exception raised in activateWorkbench.\n"
<< "Check if your user configuration file is valid.\n"
<< " Exception message:"
<< pMsg;
XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release(&pMsg);
PyErr_SetString(PyExc_RuntimeError, "Transcoding exception in Xerces-c: ");
return 0;
}
catch (...) { catch (...) {
PyErr_SetString(PyExc_Exception, "Unknown C++ exception raised in activateWorkbench"); PyErr_SetString(PyExc_Exception, "Unknown C++ exception raised in activateWorkbench");
return 0; return 0;