Merge pull request #54 from eaolson/issue53

Fix for issue 53
This commit is contained in:
mortenbra 2018-06-18 08:26:52 +02:00 committed by GitHub
commit 8e0a0e9e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1624,9 +1624,9 @@ ts timestamp := systimestamp;
loop loop
t_xxx := t_xxx || '<autoFilter ref="' || t_xxx := t_xxx || '<autoFilter ref="' ||
alfan_col( nvl( workbook.sheets( s ).autofilters( a ).column_start, t_col_min ) ) || alfan_col( nvl( workbook.sheets( s ).autofilters( a ).column_start, t_col_min ) ) ||
nvl( workbook.sheets( s ).autofilters( a ).row_start, workbook.sheets( s ).rows.first() ) || ':' || to_char( nvl( workbook.sheets( s ).autofilters( a ).row_start, workbook.sheets( s ).rows.first() )) || ':' ||
alfan_col( coalesce( workbook.sheets( s ).autofilters( a ).column_end, workbook.sheets( s ).autofilters( a ).column_start, t_col_max ) ) || alfan_col( coalesce( workbook.sheets( s ).autofilters( a ).column_end, workbook.sheets( s ).autofilters( a ).column_start, t_col_max ) ) ||
nvl( workbook.sheets( s ).autofilters( a ).row_end, workbook.sheets( s ).rows.last() ) || '"/>'; to_char( nvl( workbook.sheets( s ).autofilters( a ).row_end, workbook.sheets( s ).rows.last() )) || '"/>';
end loop; end loop;
if workbook.sheets( s ).mergecells.count() > 0 if workbook.sheets( s ).mergecells.count() > 0
then then
@ -1694,7 +1694,7 @@ ts timestamp := systimestamp;
t_xxx := t_xxx || '<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>'; t_xxx := t_xxx || '<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>';
if workbook.sheets( s ).comments.count() > 0 if workbook.sheets( s ).comments.count() > 0
then then
t_xxx := t_xxx || '<legacyDrawing r:id="rId' || ( workbook.sheets( s ).hyperlinks.count() + 1 ) || '"/>'; t_xxx := t_xxx || '<legacyDrawing r:id="rId' || to_char( workbook.sheets( s ).hyperlinks.count() + 1 ) || '"/>';
end if; end if;
-- --
t_xxx := t_xxx || '</worksheet>'; t_xxx := t_xxx || '</worksheet>';