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
5109acb8
Commit
5109acb8
authored
Dec 05, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "DocFormatReader - users file fix"
This reverts commit
cbc4a5d3
.
parent
cbc4a5d3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp
ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp
+2
-2
ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
+0
-2
ASCOfficeOdfFile/src/odf/style_table_properties.cpp
ASCOfficeOdfFile/src/odf/style_table_properties.cpp
+3
-3
No files found.
ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp
View file @
5109acb8
...
@@ -87,8 +87,8 @@ namespace DocFileFormat
...
@@ -87,8 +87,8 @@ namespace DocFileFormat
case
sprmOldTDefTable
:
case
sprmOldTDefTable
:
case
sprmTDefTable
:
case
sprmTDefTable
:
{
{
//table definition
//table definition
SprmTDefTable
tDef
(
iter
->
Arguments
,
iter
->
argumentsSize
);
SprmTDefTable
tDef
(
iter
->
Arguments
,
iter
->
argumentsSize
);
//Workaround for retrieving the indent of the table:
//Workaround for retrieving the indent of the table:
//In some files there is a indent but no sprmTWidthIndent is set.
//In some files there is a indent but no sprmTWidthIndent is set.
...
...
ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
View file @
5109acb8
...
@@ -866,14 +866,12 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
...
@@ -866,14 +866,12 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
if
(
attlists_
.
rel_size_
.
style_rel_width_
)
if
(
attlists_
.
rel_size_
.
style_rel_width_
)
{
{
int
type
=
attlists_
.
rel_size_
.
style_rel_width_
->
get_type
();
int
type
=
attlists_
.
rel_size_
.
style_rel_width_
->
get_type
();
if
(
type
==
odf_types
::
percent_or_scale
::
Percent
)
if
(
type
==
odf_types
::
percent_or_scale
::
Percent
)
drawing
.
pctWidth
=
attlists_
.
rel_size_
.
style_rel_width_
->
get_percent
().
get_value
();
drawing
.
pctWidth
=
attlists_
.
rel_size_
.
style_rel_width_
->
get_percent
().
get_value
();
}
}
if
(
attlists_
.
rel_size_
.
style_rel_height_
)
if
(
attlists_
.
rel_size_
.
style_rel_height_
)
{
{
int
type
=
attlists_
.
rel_size_
.
style_rel_height_
->
get_type
();
int
type
=
attlists_
.
rel_size_
.
style_rel_height_
->
get_type
();
if
(
type
==
odf_types
::
percent_or_scale
::
Percent
)
if
(
type
==
odf_types
::
percent_or_scale
::
Percent
)
drawing
.
pctHeight
=
attlists_
.
rel_size_
.
style_rel_height_
->
get_percent
().
get_value
();
drawing
.
pctHeight
=
attlists_
.
rel_size_
.
style_rel_height_
->
get_percent
().
get_value
();
}
}
...
...
ASCOfficeOdfFile/src/odf/style_table_properties.cpp
View file @
5109acb8
...
@@ -115,17 +115,17 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
...
@@ -115,17 +115,17 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
if
(
style_rel_width_
)
if
(
style_rel_width_
)
{
{
int
w_w
=
(
int
)(
0.5
+
50.0
*
style_rel_width_
->
get_value
());
int
w_w
=
(
int
)(
0.5
+
50.0
*
style_rel_width_
->
get_value
());
_tblPr
<<
L"<w:tblW w:type=
\"
pct
\"
w:w=
\"
"
<<
w_w
<<
"
\"
/>"
;
_tblPr
<<
L"<w:tblW w:type=
\"
pct
\"
w:w=
\"
"
<<
w_w
<<
"
\"
/>"
;
}
}
else
if
(
style_width_
)
else
if
(
style_width_
)
{
{
int
w_w
=
(
int
)(
0.5
+
20.0
*
style_width_
->
get_value_unit
(
length
::
pt
));
int
w_w
=
(
int
)(
0.5
+
20.0
*
style_width_
->
get_value_unit
(
length
::
pt
));
if
(
w_w
>
31680
)
w_w
=
31680
;
if
(
w_w
>
31680
)
w_w
=
31680
;
_tblPr
<<
L"<w:tblW w:type=
\"
dxa
\"
w:w=
\"
"
<<
w_w
<<
"
\"
/>"
;
_tblPr
<<
L"<w:tblW w:type=
\"
dxa
\"
w:w=
\"
"
<<
w_w
<<
"
\"
/>"
;
}
}
else
else
{
{
_tblPr
<<
L"<w:tblW w:type=
\"
pct
\"
w:w=
\"
5000
\"
/>"
;
_tblPr
<<
L"<w:tblW w:type=
\"
pct
\"
w:w=
\"
5000
\"
/>"
;
}
}
if
(
common_break_attlist_
.
fo_break_before_
)
if
(
common_break_attlist_
.
fo_break_before_
)
...
...
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