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
dd6ac185
Commit
dd6ac185
authored
Feb 28, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix - remove tmp pptx folder
parent
9825b6e3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
X2tConverter/src/ASCConverters.cpp
X2tConverter/src/ASCConverters.cpp
+5
-4
X2tConverter/src/ASCConverters.h
X2tConverter/src/ASCConverters.h
+1
-1
No files found.
X2tConverter/build/Qt/X2tConverter.pri
View file @
dd6ac185
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.3.44
1
VERSION = 2.0.3.44
4
DEFINES += INTVER=$$VERSION
TARGET = x2t
...
...
X2tConverter/src/ASCConverters.cpp
View file @
dd6ac185
...
...
@@ -366,9 +366,9 @@ namespace NExtractTools
else
return
AVS_FILEUTILS_ERROR_CONVERT
;
}
return
pptx_dir2pptt_bin
(
sTempUnpackedPPTX
,
sTo
,
params
);
return
pptx_dir2pptt_bin
(
sTempUnpackedPPTX
,
sTo
,
sTemp
,
params
);
}
int
pptx_dir2pptt_bin
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
InputParams
&
params
)
int
pptx_dir2pptt_bin
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
)
{
// convert unzipped pptx to unzipped pptt
CPPTXFile
*
pptx_file
=
new
CPPTXFile
(
NULL
,
NULL
,
NULL
,
NULL
);
...
...
@@ -377,6 +377,7 @@ namespace NExtractTools
if
(
pptx_file
)
{
pptx_file
->
put_TempDirectory
(
sTemp
);
pptx_file
->
SetFontDir
(
params
.
getFontPath
());
nRes
=
(
S_OK
==
pptx_file
->
OpenFileToPPTY
(
sFrom
,
sTo
))
?
nRes
:
AVS_FILEUTILS_ERROR_CONVERT
;
...
...
@@ -2192,7 +2193,7 @@ namespace NExtractTools
}
else
if
(
AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION
==
nFormatTo
)
{
nRes
=
pptx_dir2pptt_bin
(
sFrom
,
sTo
,
params
);
nRes
=
pptx_dir2pptt_bin
(
sFrom
,
sTo
,
sTemp
,
params
);
}
else
{
...
...
@@ -2200,7 +2201,7 @@ namespace NExtractTools
NSDirectory
::
CreateDirectory
(
sPpttDir
);
std
::
wstring
sTFile
=
sPpttDir
+
FILE_SEPARATOR_STR
+
_T
(
"Editor.bin"
);
nRes
=
pptx_dir2pptt_bin
(
sFrom
,
sTFile
,
params
);
nRes
=
pptx_dir2pptt_bin
(
sFrom
,
sTFile
,
sTemp
,
params
);
if
(
SUCCEEDED_X2T
(
nRes
))
{
nRes
=
fromPpttBin
(
sTFile
,
sTo
,
nFormatTo
,
sTemp
,
sThemeDir
,
bFromChanges
,
bPaid
,
params
);
...
...
X2tConverter/src/ASCConverters.h
View file @
dd6ac185
...
...
@@ -63,7 +63,7 @@ namespace NExtractTools
int
xlst2xlsx
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
bool
bFromChanges
,
const
std
::
wstring
&
sThemeDir
,
InputParams
&
params
);
int
pptx2pptt_bin
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
);
int
pptx_dir2pptt_bin
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
InputParams
&
params
);
int
pptx_dir2pptt_bin
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
);
int
pptx2pptt
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
InputParams
&
params
);
int
pptt_bin2pptx
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sTo
,
const
std
::
wstring
&
sTemp
,
bool
bFromChanges
,
const
std
::
wstring
&
sThemeDir
,
InputParams
&
params
);
int
pptt_bin2pptx_dir
(
const
std
::
wstring
&
sFrom
,
const
std
::
wstring
&
sToResult
,
const
std
::
wstring
&
sTo
,
bool
bFromChanges
,
const
std
::
wstring
&
sThemeDir
,
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