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
29b5fa51
Commit
29b5fa51
authored
Apr 24, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
f9a19bad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
+7
-2
ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
+9
-0
No files found.
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
View file @
29b5fa51
...
@@ -302,8 +302,13 @@ namespace DocFileFormat
...
@@ -302,8 +302,13 @@ namespace DocFileFormat
case
metroBlob
:
case
metroBlob
:
{
{
//встроенная неведомая хуйня
//встроенная неведомая хуйня
m_isEmbedded
=
true
;
m_isEmbedded
=
true
;
m_embeddedData
=
std
::
string
((
char
*
)
iter
->
opComplex
,
iter
->
op
);
m_embeddedData
=
std
::
string
((
char
*
)
iter
->
opComplex
,
iter
->
op
);
//if (ParseEmbeddedBlob( m_embeddedData, m_blobXml)) // todoooo
//{
// m_isEmbedded = false;
//}
}
break
;
}
break
;
//BORDERS
//BORDERS
case
borderBottomColor
:
case
borderBottomColor
:
...
...
ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
View file @
29b5fa51
...
@@ -156,6 +156,15 @@ namespace PPTX
...
@@ -156,6 +156,15 @@ namespace PPTX
}
}
}
}
}
}
if
(
pShape
->
nvSpPr
.
nvPr
.
ph
->
idx
.
IsInit
())
{
//not found in layout !! 100818_건강보험과_보건의료_김용익_최종.pptx
if
(
Master
.
IsInit
())
{
Master
->
GetLevelUp
(
pShape
);
}
}
}
}
}
}
virtual
std
::
wstring
GetMediaFullPathNameFromRId
(
const
OOX
::
RId
&
rid
)
const
virtual
std
::
wstring
GetMediaFullPathNameFromRId
(
const
OOX
::
RId
&
rid
)
const
...
...
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