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
49939a7f
Commit
49939a7f
authored
Nov 25, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build error (macOS, clang)
parent
e690aa0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp
ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp
+3
-3
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+2
-2
No files found.
ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp
View file @
49939a7f
...
...
@@ -223,7 +223,7 @@ public:
const
std
::
pair
<
int
,
double
>
c
=
cols_
.
search
(
x_pt
);
const
std
::
pair
<
int
,
double
>
r
=
rows_
.
search
(
y_pt
);
xlsx_table_position
res
=
{
c
.
first
,
c
.
second
,
r
.
first
,
r
.
second
};
xlsx_table_position
res
=
{(
size_t
)
c
.
first
,
c
.
second
,
(
size_t
)
r
.
first
,
r
.
second
};
return
res
;
}
...
...
@@ -236,7 +236,7 @@ public:
r
=
rows_
.
search
(
offset_row
,
y_pt
);
xlsx_table_position
res
=
{
c
.
first
,
c
.
second
,
r
.
first
,
r
.
second
};
xlsx_table_position
res
=
{(
size_t
)
c
.
first
,
c
.
second
,
(
size_t
)
r
.
first
,
r
.
second
};
return
res
;
}
...
...
@@ -246,7 +246,7 @@ public:
std
::
pair
<
int
,
double
>
r
=
rows_
.
search
(
last_row
,
0
);
xlsx_table_position
res
=
{
c
.
first
,
c
.
second
,
r
.
first
,
r
.
second
};
xlsx_table_position
res
=
{(
size_t
)
c
.
first
,
c
.
second
,
(
size_t
)
r
.
first
,
r
.
second
};
return
res
;
}
...
...
X2tConverter/build/Qt/X2tConverter.pro
View file @
49939a7f
...
...
@@ -32,5 +32,5 @@ core_linux_32 {
DESTDIR
=
$$
DESTDIR
/
linux_32
}
core_mac
{
DESTDIR
=
$$
DESTDIR
/
mac
}
\ No newline at end of file
DESTDIR
=
$$
DESTDIR
/
mac_64
}
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