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
d220cc8c
Commit
d220cc8c
authored
Nov 09, 2017
by
Sergey Konovalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed stubs on writing tblLayout
parent
fa98f22e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
+4
-9
ASCOfficeDocxFile2/BinReader/Readers.h
ASCOfficeDocxFile2/BinReader/Readers.h
+3
-3
No files found.
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
View file @
d220cc8c
...
...
@@ -2340,7 +2340,7 @@ public:
{
return
Jc
.
empty
()
&&
TableInd
.
empty
()
&&
TableW
.
empty
()
&&
TableCellMar
.
empty
()
&&
TableBorders
.
empty
()
&&
Shd
.
empty
()
&&
tblpPr
.
empty
()
&&
Style
.
empty
()
&&
Look
.
empty
()
&&
tblPrChange
.
empty
()
&&
TableCellSpacing
.
empty
()
&&
RowBandSize
.
empty
()
&&
ColBandSize
.
empty
();
}
std
::
wstring
Write
(
bool
bBandSize
,
bool
bLayout
)
std
::
wstring
Write
(
)
{
std
::
wstring
sRes
;
sRes
+=
L"<w:tblPr>"
;
...
...
@@ -2364,13 +2364,8 @@ public:
sRes
+=
(
TableBorders
);
if
(
false
==
Shd
.
empty
())
sRes
+=
(
Shd
);
if
(
bLayout
)
{
if
(
false
==
Layout
.
empty
())
sRes
+=
(
Layout
);
else
if
(
g_nCurFormatVersion
<
4
)
sRes
+=
L"<w:tblLayout w:type=
\"
fixed
\"
/>"
;
}
if
(
false
==
Layout
.
empty
())
sRes
+=
(
Layout
);
if
(
false
==
TableCellMar
.
empty
())
sRes
+=
(
TableCellMar
);
if
(
false
==
Look
.
empty
())
...
...
@@ -2758,7 +2753,7 @@ public:
}
if
(
NULL
!=
tblPr
)
{
pCStringWriter
->
WriteString
(
tblPr
->
Write
(
false
,
true
));
pCStringWriter
->
WriteString
(
tblPr
->
Write
());
}
if
(
NULL
!=
tblGridChange
)
{
...
...
ASCOfficeDocxFile2/BinReader/Readers.h
View file @
d220cc8c
...
...
@@ -2826,7 +2826,7 @@ public:
{
CWiterTblPr
oWiterTblPr
;
oBinary_tblPrReader
.
Read_tblPrOut
(
length
,
&
oWiterTblPr
);
odocStyle
->
TablePr
=
oWiterTblPr
.
Write
(
true
,
false
);
odocStyle
->
TablePr
=
oWiterTblPr
.
Write
();
}
else
if
(
c_oSer_sts
::
Style_RowPr
==
type
)
{
...
...
@@ -2922,7 +2922,7 @@ public:
oBinary_tblPrReader
.
Read_tblPrOut
(
length
,
&
oWiterTblPr
);
if
(
false
==
oWiterTblPr
.
IsEmpty
())
ptblStylePr
->
Writer
.
WriteString
(
oWiterTblPr
.
Write
(
false
,
false
));
ptblStylePr
->
Writer
.
WriteString
(
oWiterTblPr
.
Write
());
}
else
if
(
c_oSerProp_tblStylePrType
::
TrPr
==
type
)
{
...
...
@@ -6851,7 +6851,7 @@ public:
{
CWiterTblPr
oWiterTblPr
;
oBinary_tblPrReader
.
Read_tblPrOut
(
length
,
&
oWiterTblPr
);
pCStringWriter
->
WriteString
(
oWiterTblPr
.
Write
(
false
,
true
));
pCStringWriter
->
WriteString
(
oWiterTblPr
.
Write
());
}
else
if
(
c_oSerDocTableType
::
tblGrid
==
type
)
{
...
...
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