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
a975cb82
Commit
a975cb82
authored
Jul 03, 2017
by
Alexey Golubev
Committed by
GitHub
Jul 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #32 from ONLYOFFICE/feature/lenas-fixes
Feature/lenas fixies
parents
122a5cd0
afcf6b07
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h
+5
-2
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.cpp
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.cpp
+1
-1
No files found.
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h
View file @
a975cb82
...
...
@@ -92,13 +92,16 @@ public:
bool
bResult
=
pInfo
->
ReadFromStream
(
&
oUserAtom
,
pStream
);
offsetToEdit
=
pInfo
->
m_oUser
.
m_nOffsetLastEdit
;
m_oCurrentUser
.
m_bIsEncrypt
=
pInfo
->
m_bEncrypt
;
if
(
bResult
==
false
)
{
delete
pInfo
;
if
(
pInfo
->
m_bEncrypt
)
return
false
;
else
continue
;
if
(
pInfo
->
m_bEncrypt
)
return
false
;
else
continue
;
}
m_arUsers
.
push_back
(
pInfo
);
...
...
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.cpp
View file @
a975cb82
...
...
@@ -116,7 +116,7 @@ bool CPPTFileReader::ReadPersists()
CFStreamPtr
pStream
=
GetDocumentStream
();
if
(
!
pStream
)
return
false
;
if
(
m_oDocumentInfo
.
ReadFromStream
(
&
m_oCurrentUser
,
pStream
->
stream_
)
==
false
)
return
false
;
return
m_oDocumentInfo
.
ReadFromStream
(
&
m_oCurrentUser
,
pStream
->
stream_
)
;
}
void
CPPTFileReader
::
ReadDocument
()
{
...
...
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