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
d5026d01
Commit
d5026d01
authored
Mar 06, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
623fe254
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
+1
-1
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
+5
-1
No files found.
ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
View file @
d5026d01
...
@@ -110,7 +110,7 @@ namespace utils {
...
@@ -110,7 +110,7 @@ namespace utils {
{
{
if
(
!
a_
.
empty
())
if
(
!
a_
.
empty
())
{
{
return
boost
::
lexical_cast
<
int
>
(
a_
.
length
())
-
1
;
return
boost
::
lexical_cast
<
int
>
(
a_
)
-
1
;
}
}
else
else
return
0
;
return
0
;
...
...
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
View file @
d5026d01
...
@@ -1764,6 +1764,10 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
...
@@ -1764,6 +1764,10 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
{
{
convert
(
oox_anchor
->
m_oGroupShape
.
GetPointer
());
convert
(
oox_anchor
->
m_oGroupShape
.
GetPointer
());
}
}
else
if
(
oox_anchor
->
m_oGraphicFrame
.
IsInit
())
{
OoxConverter
::
convert
(
oox_anchor
->
m_oGraphicFrame
.
GetPointer
());
}
}
}
void
XlsxConverter
::
convert
(
OOX
::
Spreadsheet
::
CDrawing
*
oox_drawing
)
void
XlsxConverter
::
convert
(
OOX
::
Spreadsheet
::
CDrawing
*
oox_drawing
)
...
...
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