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
52fe741f
Commit
52fe741f
authored
Feb 08, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #34018
parent
8c2e1738
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
+1
-8
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
View file @
52fe741f
...
...
@@ -165,15 +165,8 @@ namespace PPTX
smart_ptr
<
OOX
::
File
>
file
=
smart_ptr
<
OOX
::
File
>
(
new
OOX
::
HyperLink
(
pRelation
->
Target
()));
bool
res
=
Event
->
Progress
(
0
,
percent
+
m_lPercent
);
Add
(
pRelation
->
rId
(),
file
);
if
(
res
||
m_bCancelled
)
{
m_bCancelled
=
true
;
break
;
}
}
else
{
...
...
@@ -194,7 +187,7 @@ namespace PPTX
Add
(
pRelation
->
rId
(),
file
);
smart_ptr
<
FileContainer
>
pContainer
=
file
.
smart_dynamic_cast
<
FileContainer
>
();
bool
res
=
Event
->
Progress
(
0
,
percent
+
m_lPercent
);
Event
->
Progress
(
0
,
percent
+
m_lPercent
);
if
(
pContainer
.
IsInit
())
{
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
52fe741f
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.3.43
5
VERSION = 2.0.3.43
6
DEFINES += INTVER=$$VERSION
TARGET = x2t
...
...
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