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
6c97cc11
Commit
6c97cc11
authored
Aug 30, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
ccdec36c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
22 deletions
+41
-22
X2tConverter/src/ASCConverters.cpp
X2tConverter/src/ASCConverters.cpp
+41
-22
No files found.
X2tConverter/src/ASCConverters.cpp
View file @
6c97cc11
...
...
@@ -1301,7 +1301,10 @@ namespace NExtractTools
//decrypt to sTo
ECMACryptReader
cryptReader
;
if
(
cryptReader
.
DecryptOfficeFile
(
sFrom
,
sTo
,
params
.
getPassword
())
==
false
)
return
AVS_FILEUTILS_ERROR_CONVERT_PASSWORD
;
{
if
(
params
.
getPassword
().
empty
())
return
AVS_FILEUTILS_ERROR_CONVERT_DRM
;
else
return
AVS_FILEUTILS_ERROR_CONVERT_PASSWORD
;
}
return
S_OK
;
}
...
...
@@ -1341,36 +1344,52 @@ namespace NExtractTools
int
fromMscrypt
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
)
{
std
::
wstring
sResultDecryptFile
=
sTemp
+
FILE_SEPARATOR_STR
+
L"uncrypt_file.oox"
;
int
nRes
=
mscrypt2oox
(
sFrom
,
sResultDecryptFile
,
sTemp
,
params
);
if
(
SUCCEEDED_X2T
(
nRes
))
COfficeFileFormatChecker
OfficeFileFormatChecker
;
if
(
OfficeFileFormatChecker
.
isOfficeFile
(
sFrom
))
{
COfficeFileFormatChecker
OfficeFileFormatChecker
;
if
(
OfficeFileFormatChecker
.
isOfficeFile
(
sResultDecryptFile
))
if
(
OfficeFileFormatChecker
.
nFileType
==
AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO
)
{
switch
(
OfficeFileFormatChecker
.
nFileType
)
int
nRes
=
mscrypt2oox
(
sFrom
,
sResultDecryptFile
,
sTemp
,
params
);
if
(
SUCCEEDED_X2T
(
nRes
))
{
case
AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX
:
{
return
fromDocument
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX
,
sTemp
,
params
);
}
break
;
case
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
:
{
return
fromSpreadsheet
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
,
sTemp
,
params
);
}
break
;
case
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX
:
case
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPSX
:
COfficeFileFormatChecker
OfficeFileFormatChecker
;
if
(
OfficeFileFormatChecker
.
isOfficeFile
(
sResultDecryptFile
))
{
return
fromPresentation
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX
,
sTemp
,
params
);
}
break
;
switch
(
OfficeFileFormatChecker
.
nFileType
)
{
case
AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX
:
{
return
fromDocument
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX
,
sTemp
,
params
);
}
break
;
case
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
:
{
return
fromSpreadsheet
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
,
sTemp
,
params
);
}
break
;
case
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX
:
case
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPSX
:
{
return
fromPresentation
(
sResultDecryptFile
,
AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX
,
sTemp
,
params
);
}
break
;
}
}
}
else
if
(
AVS_FILEUTILS_ERROR_CONVERT_DRM
==
nRes
&&
!
params
.
getDontSaveAdditional
())
{
copyOrigin
(
sFrom
,
sTo
);
}
}
else
{
copyOrigin
(
sFrom
,
sTo
);
}
}
else
if
(
AVS_FILEUTILS_ERROR_CONVERT_DRM
==
nRes
&&
!
params
.
getDontSaveAdditional
())
else
{
copyOrigin
(
sFrom
,
sTo
)
;
return
AVS_FILEUTILS_ERROR_CONVERT_UNKNOWN_FORMAT
;
}
return
nRes
;
}
//html
int
html2doct_dir
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
)
...
...
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