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
fe1d4863
Commit
fe1d4863
authored
Dec 08, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
db202320
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
+7
-7
ASCOfficeOdfFile/src/docx/oox_drawing.h
ASCOfficeOdfFile/src/docx/oox_drawing.h
+1
-1
ASCOfficeOdfFile/src/docx/pptx_drawing.cpp
ASCOfficeOdfFile/src/docx/pptx_drawing.cpp
+5
-5
No files found.
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
View file @
fe1d4863
...
...
@@ -426,7 +426,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
}
}
void
_oox_drawing
::
serialize_xfrm
(
std
::
wostream
&
strm
,
const
std
::
wstring
&
name_space
)
void
_oox_drawing
::
serialize_xfrm
(
std
::
wostream
&
strm
,
const
std
::
wstring
&
name_space
,
bool
always_position
)
{
CP_XML_WRITER
(
strm
)
{
...
...
@@ -470,16 +470,16 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam
CP_XML_NODE
(
L"a:off"
)
{
//if (inGroup
)
if
(
inGroup
||
always_position
)
{
CP_XML_ATTR
(
L"x"
,
x
);
CP_XML_ATTR
(
L"y"
,
y
);
}
//
else
//
{
//
CP_XML_ATTR(L"x", 0);
//
CP_XML_ATTR(L"y", 0);
//
}
else
{
CP_XML_ATTR
(
L"x"
,
0
);
CP_XML_ATTR
(
L"y"
,
0
);
}
}
if
(
cx
>
0
||
cy
>
0
)
...
...
ASCOfficeOdfFile/src/docx/oox_drawing.h
View file @
fe1d4863
...
...
@@ -81,7 +81,7 @@ namespace oox {
virtual
void
serialize
(
std
::
wostream
&
strm
)
=
0
;
void
serialize_shape
(
std
::
wostream
&
strm
);
void
serialize_xfrm
(
std
::
wostream
&
strm
,
const
std
::
wstring
&
namespace_
=
L"a"
);
void
serialize_xfrm
(
std
::
wostream
&
strm
,
const
std
::
wstring
&
namespace_
=
L"a"
,
bool
always_position
=
false
);
void
serialize_bodyPr
(
std
::
wostream
&
strm
,
const
std
::
wstring
&
namespace_
=
L"a"
);
};
...
...
ASCOfficeOdfFile/src/docx/pptx_drawing.cpp
View file @
fe1d4863
...
...
@@ -107,7 +107,7 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE
(
L"p:spPr"
)
{
val
.
serialize_xfrm
(
CP_XML_STREAM
());
val
.
serialize_xfrm
(
CP_XML_STREAM
()
,
L"a"
,
true
);
CP_XML_NODE
(
L"a:prstGeom"
)
{
...
...
@@ -170,7 +170,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
if
(
!
bNoRect
)
{
val
.
serialize_xfrm
(
CP_XML_STREAM
());
val
.
serialize_xfrm
(
CP_XML_STREAM
()
,
L"a"
,
true
);
val
.
serialize_shape
(
CP_XML_STREAM
());
oox_serialize_ln
(
CP_XML_STREAM
(),
val
.
additional
);
...
...
@@ -198,7 +198,7 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE
(
L"p:cNvGraphicFramePr"
);
CP_XML_NODE
(
L"p:nvPr"
);
}
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
);
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
,
true
);
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
...
...
@@ -235,7 +235,7 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE
(
L"p:cNvGraphicFramePr"
);
CP_XML_NODE
(
L"p:nvPr"
);
}
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
);
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
,
true
);
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
...
...
@@ -276,7 +276,7 @@ void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE
(
L"p:cNvGraphicFramePr"
);
CP_XML_NODE
(
L"p:nvPr"
);
}
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
);
val
.
serialize_xfrm
(
CP_XML_STREAM
(),
L"p"
,
true
);
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
...
...
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