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
a70087e1
Commit
a70087e1
authored
Aug 09, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no base 64 data
parent
c3da9a66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1178 additions
and
1163 deletions
+1178
-1163
DesktopEditor/doctrenderer/doctrenderer.cpp
DesktopEditor/doctrenderer/doctrenderer.cpp
+1165
-1158
DesktopEditor/doctrenderer/nativecontrol.h
DesktopEditor/doctrenderer/nativecontrol.h
+13
-5
No files found.
DesktopEditor/doctrenderer/doctrenderer.cpp
View file @
a70087e1
...
@@ -425,6 +425,8 @@ namespace NSDoctRenderer
...
@@ -425,6 +425,8 @@ namespace NSDoctRenderer
NSFile
::
CFileBinary
oFile
;
NSFile
::
CFileBinary
oFile
;
if
(
true
==
oFile
.
CreateFileW
(
pParams
->
m_strDstFilePath
))
if
(
true
==
oFile
.
CreateFileW
(
pParams
->
m_strDstFilePath
))
{
if
(
pNative
->
m_sHeader
.
find
(
";v10;"
)
==
std
::
string
::
npos
)
{
{
oFile
.
WriteFile
((
BYTE
*
)
pNative
->
m_sHeader
.
c_str
(),
(
DWORD
)
pNative
->
m_sHeader
.
length
());
oFile
.
WriteFile
((
BYTE
*
)
pNative
->
m_sHeader
.
c_str
(),
(
DWORD
)
pNative
->
m_sHeader
.
length
());
...
@@ -435,6 +437,11 @@ namespace NSDoctRenderer
...
@@ -435,6 +437,11 @@ namespace NSDoctRenderer
oFile
.
WriteFile
((
BYTE
*
)
pDst64
,
(
DWORD
)
nDstLen
);
oFile
.
WriteFile
((
BYTE
*
)
pDst64
,
(
DWORD
)
nDstLen
);
RELEASEARRAYOBJECTS
(
pDst64
);
RELEASEARRAYOBJECTS
(
pDst64
);
}
else
{
oFile
.
WriteFile
(
pData
,
(
DWORD
)
pNative
->
m_nSaveBinaryLen
);
}
oFile
.
CloseFile
();
oFile
.
CloseFile
();
}
}
}
}
...
...
DesktopEditor/doctrenderer/nativecontrol.h
View file @
a70087e1
...
@@ -674,12 +674,20 @@ public:
...
@@ -674,12 +674,20 @@ public:
m_nLen
=
read_int2
(
pData
,
nCur
,
nLen
);
m_nLen
=
read_int2
(
pData
,
nCur
,
nLen
);
if
(
nVersion
<
10
)
{
m_pData
=
new
BYTE
[
m_nLen
];
m_pData
=
new
BYTE
[
m_nLen
];
m_pDataCur
=
m_pData
;
m_pDataCur
=
m_pData
;
read_base64_2
(
pData
,
nCur
,
nLen
);
read_base64_2
(
pData
,
nCur
,
nLen
);
delete
[]
pData
;
delete
[]
pData
;
}
else
{
m_nLen
=
nLen
;
m_pData
=
(
BYTE
*
)
pData
;
m_pDataCur
=
m_pData
+
m_nLen
;
}
return
nVersion
;
return
nVersion
;
}
}
...
...
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