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
e78fc0be
Commit
e78fc0be
authored
Dec 14, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x2t - fix users files
parent
d9986d09
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10572 additions
and
871 deletions
+10572
-871
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+891
-868
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
+2
-2
ASCOfficePPTXFile/Editor/Drawing/Elements.h
ASCOfficePPTXFile/Editor/Drawing/Elements.h
+1
-1
Common/3dParty/cryptopp/cryptlib.vcproj
Common/3dParty/cryptopp/cryptlib.vcproj
+9678
-0
No files found.
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
e78fc0be
This diff is collapsed.
Click to expand it.
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
View file @
e78fc0be
...
...
@@ -276,8 +276,8 @@ namespace NSBinPptxRW
std
::
wstring
GetVMLShapeXml
(
CPPTShape
*
pPPTShape
);
std
::
wstring
GetVMLShapeXml
(
PPTX
::
Logic
::
SpTreeElem
&
oElem
);
void
CheckBrushShape
(
PPTX
::
Logic
::
SpTreeElem
*
oElem
,
XmlUtils
::
CXmlNode
&
oNode
,
PPTShapes
::
ShapeType
eType
,
CPPTShape
*
pPPTShape
);
void
CheckPenShape
(
PPTX
::
Logic
::
SpTreeElem
*
oElem
,
XmlUtils
::
CXmlNode
&
oNode
,
PPTShapes
::
ShapeType
eType
,
CPPTShape
*
pPPTShape
);
void
CheckBrushShape
(
PPTX
::
Logic
::
SpTreeElem
*
oElem
,
XmlUtils
::
CXmlNode
&
oNode
,
CPPTShape
*
pPPTShape
);
void
CheckPenShape
(
PPTX
::
Logic
::
SpTreeElem
*
oElem
,
XmlUtils
::
CXmlNode
&
oNode
,
CPPTShape
*
pPPTShape
);
void
LoadCoordSize
(
XmlUtils
::
CXmlNode
&
oNode
,
::
CShapePtr
pShape
);
void
LoadCoordPos
(
XmlUtils
::
CXmlNode
&
oNode
,
::
CShapePtr
pShape
);
...
...
ASCOfficePPTXFile/Editor/Drawing/Elements.h
View file @
e78fc0be
...
...
@@ -591,7 +591,7 @@ namespace NSPresentationEditor
#else
std
::
wstring
ConvertPPTtoPPTX
(
CPPTShape
*
pPPTShape
,
const
NSGuidesVML
::
CFormParam
&
pCoef
,
bool
bIsNamespace
=
false
)
{
if
(
pPPTShape
->
m_eType
==
PPTShapes
::
sptCRect
||
pPPTShape
->
m_eType
==
PPTShapes
::
sptCFrame
)
if
(
pPPTShape
->
m_eType
==
PPTShapes
::
sptCRect
||
pPPTShape
->
m_eType
==
PPTShapes
::
sptCFrame
||
pPPTShape
->
m_eType
==
PPTShapes
::
sptCTextBox
)
{
if
(
bIsNamespace
)
{
...
...
Common/3dParty/cryptopp/cryptlib.vcproj
0 → 100644
View file @
e78fc0be
This diff is collapsed.
Click to expand it.
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