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
67a849f1
Commit
67a849f1
authored
Feb 09, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #34016
parent
15800296
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
+7
-6
No files found.
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
View file @
67a849f1
...
...
@@ -158,13 +158,15 @@ namespace PPTX
std
::
map
<
std
::
wstring
,
smart_ptr
<
OOX
::
File
>>::
const_iterator
pPair
=
map
.
find
(
normPath
);
if
(
bIsSlide
&&
(
pRelation
->
Type
()
==
OOX
::
FileTypes
::
HyperLink
))
if
(
bIsSlide
&&
(
pRelation
->
Type
()
==
OOX
::
FileTypes
::
HyperLink
||
pRelation
->
Type
()
==
OOX
::
Presentation
::
FileTypes
::
Slide
))
{
// + external audio, video ...
normPath
=
pRelation
->
Target
();
long
percent
=
Event
->
GetPercent
();
smart_ptr
<
OOX
::
File
>
file
=
smart_ptr
<
OOX
::
File
>
(
new
OOX
::
HyperLink
(
pRelation
->
Target
()))
;
smart_ptr
<
OOX
::
File
>
file
;
file
=
smart_ptr
<
OOX
::
File
>
(
new
OOX
::
HyperLink
(
pRelation
->
Target
()));
normPath
=
pRelation
->
Target
();
Add
(
pRelation
->
rId
(),
file
);
}
...
...
@@ -201,8 +203,7 @@ namespace PPTX
//на презентация с hyperlink выходим при достижении 100%. Проценты считаются от количества обработанных файлов, а hyperlink не файл(Ligninger_og_uligheder.pptx)
if
(
m_bCancelled
)
{
m_bCancelled
=
true
;
break
;
break
;
}
}
}
...
...
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