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
dfe4541f
Commit
dfe4541f
authored
Aug 08, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
3fa3a52c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ASCOfficeOdfFile/src/odf/search_table_cell.cpp
ASCOfficeOdfFile/src/odf/search_table_cell.cpp
+4
-4
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficeOdfFile/src/odf/search_table_cell.cpp
View file @
dfe4541f
...
@@ -201,8 +201,8 @@ public:
...
@@ -201,8 +201,8 @@ public:
virtual
void
visit
(
const
table_table_row
&
val
)
virtual
void
visit
(
const
table_table_row
&
val
)
{
{
unsigned
int
repeated
=
val
.
table_table_row_
attlist_
.
table_number_rows_repeated_
;
unsigned
int
repeated
=
val
.
attlist_
.
table_number_rows_repeated_
;
std
::
wstring
defaultCellStyle
=
val
.
table_table_row_
attlist_
.
table_default_cell_style_name_
.
get_value_or
(
L""
);
std
::
wstring
defaultCellStyle
=
val
.
attlist_
.
table_default_cell_style_name_
.
get_value_or
(
L""
);
if
(
visit_rows
(
repeated
,
defaultCellStyle
))
if
(
visit_rows
(
repeated
,
defaultCellStyle
))
{
{
...
@@ -212,7 +212,7 @@ public:
...
@@ -212,7 +212,7 @@ public:
virtual
void
visit
(
const
table_table_cell
&
val
)
virtual
void
visit
(
const
table_table_cell
&
val
)
{
{
unsigned
int
repeated
=
val
.
table_table_cell_
attlist_
.
table_number_columns_repeated_
;
unsigned
int
repeated
=
val
.
attlist_
.
table_number_columns_repeated_
;
std
::
wstring
defaultColumnStyle
,
defaultRowStyle
;
std
::
wstring
defaultColumnStyle
,
defaultRowStyle
;
if
(
visit_cells
(
repeated
,
defaultColumnStyle
,
defaultRowStyle
))
if
(
visit_cells
(
repeated
,
defaultColumnStyle
,
defaultRowStyle
))
{
{
...
@@ -224,7 +224,7 @@ public:
...
@@ -224,7 +224,7 @@ public:
virtual
void
visit
(
const
table_covered_table_cell
&
val
)
virtual
void
visit
(
const
table_covered_table_cell
&
val
)
{
{
unsigned
int
repeated
=
val
.
table_table_cell_
attlist_
.
table_number_columns_repeated_
;
unsigned
int
repeated
=
val
.
attlist_
.
table_number_columns_repeated_
;
std
::
wstring
defaultColumnStyle
,
defaultRowStyle
;
std
::
wstring
defaultColumnStyle
,
defaultRowStyle
;
if
(
repeated
<
2
)
if
(
repeated
<
2
)
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
dfe4541f
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
QT -= core
QT -= core
QT -= gui
QT -= gui
VERSION = 2.4.47
1
.0
VERSION = 2.4.47
2
.0
DEFINES += INTVER=$$VERSION
DEFINES += INTVER=$$VERSION
TARGET = x2t
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