kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fixes 0003521: Import of csv file into Spreadsheet does not work if the path contains non ASCII characters

Browse Source
This commit is contained in:
wmayer
2018-09-24 22:16:48 +02:00
parent 1b7708a391
commit 511ddfffa1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Spreadsheet/App/Sheet.cpp
View File

@@ -35,8 +35,10 @@
#include <App/DynamicProperty.h>
#include <App/FeaturePythonPyImp.h>
#include <Base/Exception.h>
#include <Base/FileInfo.h>
#include <Base/Placement.h>
#include <Base/Reader.h>
#include <Base/Stream.h>
#include <Base/Writer.h>
#include <Base/Tools.h>
#include "Sheet.h"
@@ -140,7 +142,8 @@ void Sheet::clearAll()
bool Sheet::importFromFile(const std::string &filename, char delimiter, char quoteChar, char escapeChar)
{
std::ifstream file;
Base::FileInfo fi(filename);
Base::ifstream file(fi);
int row = 0;
PropertySheet::AtomicPropertyChange signaller(cells);

10
src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
View File

@@ -73,17 +73,19 @@ public:
private:
Py::Object open(const Py::Tuple& args)
{
const char* Name;
char* Name;
const char* DocName=0;
if (!PyArg_ParseTuple(args.ptr(), "s|s",&Name,&DocName))
if (!PyArg_ParseTuple(args.ptr(), "et|s","utf-8",&Name,&DocName))
throw Py::Exception();
std::string EncodedName = std::string(Name);
PyMem_Free(Name);
try {
Base::FileInfo file(Name);
Base::FileInfo file(EncodedName);
App::Document *pcDoc = App::GetApplication().newDocument(DocName ? DocName : QT_TR_NOOP("Unnamed"));
Spreadsheet::Sheet *pcSheet = static_cast<Spreadsheet::Sheet *>(pcDoc->addObject("Spreadsheet::Sheet", file.fileNamePure().c_str()));
pcSheet->importFromFile(Name, '\t', '"', '\\');
pcSheet->importFromFile(EncodedName, '\t', '"', '\\');
pcSheet->execute();
}
catch (const Base::Exception& e) {