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
de336e5f
Commit
de336e5f
authored
Nov 23, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/hotfix/v5.0.5' into develop
parents
82b3dbda
d1227f77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
X2tConverter/src/ASCConverters.cpp
X2tConverter/src/ASCConverters.cpp
+8
-0
X2tConverter/src/cextracttools.h
X2tConverter/src/cextracttools.h
+4
-0
No files found.
X2tConverter/src/ASCConverters.cpp
View file @
de336e5f
...
@@ -4177,6 +4177,14 @@ namespace NExtractTools
...
@@ -4177,6 +4177,14 @@ namespace NExtractTools
{
{
result
=
fromMscrypt
(
sFileFrom
,
sFileTo
,
sTempDir
,
oInputParams
);
result
=
fromMscrypt
(
sFileFrom
,
sFileTo
,
sTempDir
,
oInputParams
);
}
break
;
}
break
;
case
TCD_MSCRYPT2_RAW
:
{
result
=
mscrypt2oox
(
sFileFrom
,
sFileTo
,
sTempDir
,
oInputParams
);
}
break
;
case
TCD_2MSCRYPT_RAW
:
{
result
=
oox2mscrypt
(
sFileFrom
,
sFileTo
,
sTempDir
,
oInputParams
);
}
break
;
case
TCD_MSCRYPT2DOCT
:
case
TCD_MSCRYPT2DOCT
:
case
TCD_MSCRYPT2XLST
:
case
TCD_MSCRYPT2XLST
:
case
TCD_MSCRYPT2PPTT
:
case
TCD_MSCRYPT2PPTT
:
...
...
X2tConverter/src/cextracttools.h
View file @
de336e5f
...
@@ -165,6 +165,10 @@ namespace NExtractTools
...
@@ -165,6 +165,10 @@ namespace NExtractTools
TCD_MSCRYPT2XLST
,
TCD_MSCRYPT2XLST
,
TCD_MSCRYPT2PPTT
,
TCD_MSCRYPT2PPTT
,
TCD_MSCRYPT2BIN
,
TCD_MSCRYPT2BIN
,
TCD_MSCRYPT2_RAW
,
TCD_2MSCRYPT_RAW
,
//
//
TCD_HTML2DOCX
,
TCD_HTML2DOCX
,
TCD_HTML2DOCT
,
TCD_HTML2DOCT
,
...
...
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