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
bb791cb4
Commit
bb791cb4
authored
Oct 17, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
a2c22962
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+1
-1
XlsxSerializerCom/Reader/BinaryWriter.h
XlsxSerializerCom/Reader/BinaryWriter.h
+3
-3
XlsxSerializerCom/Writer/BinaryReader.h
XlsxSerializerCom/Writer/BinaryReader.h
+3
-3
No files found.
X2tConverter/build/Qt/X2tConverter.pro
View file @
bb791cb4
...
...
@@ -7,7 +7,7 @@
QT
-=
core
QT
-=
gui
VERSION
=
2.0
.
2.
399
VERSION
=
2.0
.
2.
400
DEFINES
+=
INTVER
=
$$
VERSION
TEMPLATE
=
app
...
...
XlsxSerializerCom/Reader/BinaryWriter.h
View file @
bb791cb4
...
...
@@ -1747,10 +1747,10 @@ namespace BinXlsxRW {
//из Drawing могут быть ссылки на объекты в VmlDrawing
OOX
::
CVmlDrawing
*
currentVmlDrawing
=
NULL
;
if
(
oWorksheet
.
m_oLegacyDrawingWorksheet
.
IsInit
()
&&
oWorksheet
.
m_oLegacyDrawingWorksheet
->
m_oId
.
IsInit
())
if
(
oWorksheet
.
m_oLegacyDrawing
.
IsInit
()
&&
oWorksheet
.
m_oLegacyDrawing
->
m_oId
.
IsInit
())
{
smart_ptr
<
OOX
::
File
>
oFileV
=
oWorksheet
.
Find
(
oWorksheet
.
m_oLegacyDrawingWorksheet
->
m_oId
->
GetValue
());
smart_ptr
<
OOX
::
File
>
oFileV
=
oWorksheet
.
Find
(
oWorksheet
.
m_oLegacyDrawing
->
m_oId
->
GetValue
());
if
(
oFileV
.
IsInit
()
&&
OOX
::
FileTypes
::
VmlDrawing
==
oFileV
->
type
())
{
currentVmlDrawing
=
(
OOX
::
CVmlDrawing
*
)
oFileV
.
operator
->
();
...
...
XlsxSerializerCom/Writer/BinaryReader.h
View file @
bb791cb4
...
...
@@ -1889,9 +1889,9 @@ namespace BinXlsxRW {
NSCommon
::
smart_ptr
<
OOX
::
File
>
pVmlDrawingFile
(
m_pCurVmlDrawing
);
m_pCurVmlDrawing
=
NULL
;
const
OOX
::
RId
oRId
=
m_pCurWorksheet
->
Add
(
pVmlDrawingFile
);
m_pCurWorksheet
->
m_oLegacyDrawingWorksheet
.
Init
();
m_pCurWorksheet
->
m_oLegacyDrawingWorksheet
->
m_oId
.
Init
();
m_pCurWorksheet
->
m_oLegacyDrawingWorksheet
->
m_oId
->
SetValue
(
oRId
.
get
());
m_pCurWorksheet
->
m_oLegacyDrawing
.
Init
();
m_pCurWorksheet
->
m_oLegacyDrawing
->
m_oId
.
Init
();
m_pCurWorksheet
->
m_oLegacyDrawing
->
m_oId
->
SetValue
(
oRId
.
get
());
}
smart_ptr
<
OOX
::
File
>
oCurFile
(
m_pCurWorksheet
);
...
...
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