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
b3a83ad6
Commit
b3a83ad6
authored
Jul 20, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
8d4e78ed
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
0 deletions
+26
-0
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
+2
-0
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.cpp
...File2/source/XlsXlsxConverter/xlsx_conversion_context.cpp
+7
-0
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.h
...lsFile2/source/XlsXlsxConverter/xlsx_conversion_context.h
+1
-0
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
...iceXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
+15
-0
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.h
...fficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.h
+1
-0
No files found.
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
View file @
b3a83ad6
...
@@ -357,6 +357,8 @@ void XlsConverter::convert(XLS::WorkbookStreamObject* woorkbook)
...
@@ -357,6 +357,8 @@ void XlsConverter::convert(XLS::WorkbookStreamObject* woorkbook)
xls_global_info
->
current_sheet
=
-
1
;
xls_global_info
->
current_sheet
=
-
1
;
xlsx_context
->
start_table
(
xls_global_info
->
sheets_names
.
size
()
>
i
?
xls_global_info
->
sheets_names
[
i
]
:
L"ChartSheet_"
+
std
::
to_wstring
(
count_chart_sheets
));
xlsx_context
->
start_table
(
xls_global_info
->
sheets_names
.
size
()
>
i
?
xls_global_info
->
sheets_names
[
i
]
:
L"ChartSheet_"
+
std
::
to_wstring
(
count_chart_sheets
));
xlsx_context
->
set_chart_view
();
XLS
::
ChartSheetSubstream
*
chart
=
dynamic_cast
<
XLS
::
ChartSheetSubstream
*>
(
woorkbook
->
m_arWorksheetSubstream
[
i
].
get
());
XLS
::
ChartSheetSubstream
*
chart
=
dynamic_cast
<
XLS
::
ChartSheetSubstream
*>
(
woorkbook
->
m_arWorksheetSubstream
[
i
].
get
());
convert_chart_sheet
(
chart
);
convert_chart_sheet
(
chart
);
...
...
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.cpp
View file @
b3a83ad6
...
@@ -104,6 +104,13 @@ bool xlsx_conversion_context::start_table(const std::wstring & name)
...
@@ -104,6 +104,13 @@ bool xlsx_conversion_context::start_table(const std::wstring & name)
return
true
;
return
true
;
}
}
void
xlsx_conversion_context
::
set_chart_view
()
{
if
(
sheets_
.
empty
())
return
;
get_table_context
().
set_chart_view
();
}
void
xlsx_conversion_context
::
set_state
(
const
std
::
wstring
&
state
)
void
xlsx_conversion_context
::
set_state
(
const
std
::
wstring
&
state
)
{
{
if
(
state
.
empty
())
return
;
if
(
state
.
empty
())
return
;
...
...
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.h
View file @
b3a83ad6
...
@@ -66,6 +66,7 @@ public:
...
@@ -66,6 +66,7 @@ public:
bool
start_table
(
const
std
::
wstring
&
name
);
bool
start_table
(
const
std
::
wstring
&
name
);
void
set_state
(
const
std
::
wstring
&
state
);
void
set_state
(
const
std
::
wstring
&
state
);
void
set_chart_view
();
void
end_table
();
void
end_table
();
void
start_chart
();
void
start_chart
();
...
...
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
View file @
b3a83ad6
...
@@ -61,6 +61,21 @@ void xlsx_table_context::start_table(const std::wstring & name)
...
@@ -61,6 +61,21 @@ void xlsx_table_context::start_table(const std::wstring & name)
tables_state_
.
push_back
(
table_state_ptr
(
new
table_state
(
context_
)));
tables_state_
.
push_back
(
table_state_ptr
(
new
table_state
(
context_
)));
}
}
void
xlsx_table_context
::
set_chart_view
()
{
CP_XML_WRITER
(
context_
.
current_sheet
().
sheetViews
())
{
CP_XML_NODE
(
L"sheetViews"
)
{
CP_XML_NODE
(
L"sheetView"
)
{
CP_XML_ATTR
(
L"showGridLines"
,
0
);
CP_XML_ATTR
(
L"workbookViewId"
,
0
);
}
}
}
}
void
xlsx_table_context
::
end_table
()
void
xlsx_table_context
::
end_table
()
{
{
if
(
!
get_drawing_context
().
empty
())
if
(
!
get_drawing_context
().
empty
())
...
...
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.h
View file @
b3a83ad6
...
@@ -60,6 +60,7 @@ public:
...
@@ -60,6 +60,7 @@ public:
public:
public:
void
start_table
(
const
std
::
wstring
&
name
);
void
start_table
(
const
std
::
wstring
&
name
);
void
set_chart_view
();
void
end_table
();
void
end_table
();
xlsx_drawing_context
&
get_drawing_context
();
xlsx_drawing_context
&
get_drawing_context
();
...
...
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