Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
3fc3f715
Commit
3fc3f715
authored
Aug 28, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
5465c123
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
X2tConverter/src/ASCConverters.cpp
X2tConverter/src/ASCConverters.cpp
+6
-4
No files found.
X2tConverter/src/ASCConverters.cpp
View file @
3fc3f715
...
...
@@ -605,11 +605,13 @@ namespace NExtractTools
m_oCXlsxSerializer
.
setFontDir
(
sFontPath1
);
std
::
wstring
sToTemp
=
sTemp
+
FILE_SEPARATOR_STR
+
_T
(
"output.csv"
);
CString
sMediaPath
;
// will be filled by 'CreateXlsxFolders' method
CString
sEmbedPath
;
// will be filled by 'CreateXlsxFolders' method
m_oCXlsxSerializer
.
CreateXlsxFolders
(
std_string2string
(
params
.
getXmlOptions
()),
std_string2string
(
sTemp
),
sMediaPath
,
sEmbedPath
);
CString
sEmbedPath
;
// will be filled by 'CreateXlsxFolders' method
CString
sXmlOptions
=
std_string2string
(
params
.
getXmlOptions
());
m_oCXlsxSerializer
.
CreateXlsxFolders
(
sXmlOptions
,
std_string2string
(
sTemp
),
sMediaPath
,
sEmbedPath
);
nRes
=
m_oCXlsxSerializer
.
loadFromFile
(
std_string2string
(
sTargetBin
),
std_string2string
(
sToTemp
),
std_string2string
(
params
.
getXmlOptions
()),
sMediaPath
,
sEmbedPath
)
?
nRes
:
AVS_FILEUTILS_ERROR_CONVERT
;
nRes
=
m_oCXlsxSerializer
.
loadFromFile
(
std_string2string
(
sTargetBin
),
std_string2string
(
sToTemp
),
sXmlOptions
,
sMediaPath
,
sEmbedPath
)
?
nRes
:
AVS_FILEUTILS_ERROR_CONVERT
;
//пишем в Temp и копируем, чтобы не возникало лишних файлов рядом с sTo, а лучше перейти на отдельный метод
if
(
SUCCEEDED_X2T
(
nRes
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment