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
52908908
Commit
52908908
authored
Nov 22, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linux build
parent
24d9b99a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
+1
-1
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+1
-1
ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp
+2
-1
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
View file @
52908908
...
...
@@ -1308,7 +1308,7 @@ std::wstring NSPresentationEditor::CShapeWriter::ConvertShape()
m_oWriter
.
WriteString
(
std
::
wstring
(
L"</a:xfrm>"
));
}
CBaseShapePtr
&
shape
=
m_pShapeElement
->
m_pShape
->
getBaseShape
();
CBaseShapePtr
shape
=
m_pShapeElement
->
m_pShape
->
getBaseShape
();
if
(
m_pShapeElement
->
m_pShape
->
m_lDrawType
&
c_ShapeDrawType_Graphic
||
shape
->
m_bCustomShape
)
{
...
...
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
52908908
...
...
@@ -1848,7 +1848,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
std
::
map
<
std
::
wstring
,
CShapePtr
>::
iterator
pPair
=
m_mapShapeTypes
.
find
(
strType
);
if
(
m_mapShapeTypes
.
end
()
!=
pPair
)
{
CBaseShapePtr
&
base_shape_type
=
pPair
->
second
->
getBaseShape
();
CBaseShapePtr
base_shape_type
=
pPair
->
second
->
getBaseShape
();
CPPTShape
*
ppt_shape_type
=
dynamic_cast
<
CPPTShape
*>
(
base_shape_type
.
get
());
pPPTShape
=
new
CPPTShape
();
...
...
ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp
View file @
52908908
...
...
@@ -1116,7 +1116,8 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
//Custom
if
(
!
m_aPVerticles
.
empty
()
||
!
m_aPSegmentInfo
.
empty
())
{
CPPTShape
*
custom_shape
=
CPPTShape
::
CreateByType
((
PPTShapes
::
ShapeType
)
m_nShapeType
);
CBaseShapePtr
base_shape
=
CPPTShape
::
CreateByType
((
PPTShapes
::
ShapeType
)
m_nShapeType
);
CPPTShape
*
custom_shape
=
dynamic_cast
<
CPPTShape
*>
(
base_shape
.
get
());
if
(
custom_shape
)
{
custom_shape
->
m_bCustomShape
=
true
;
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
52908908
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.4.48
8
.0
VERSION = 2.4.48
9
.0
DEFINES += INTVER=$$VERSION
TARGET = x2t
...
...
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