summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LedgerSMB/Template/ODS.pm14
-rw-r--r--UI/am-list-accounts.odst5
2 files changed, 16 insertions, 3 deletions
diff --git a/LedgerSMB/Template/ODS.pm b/LedgerSMB/Template/ODS.pm
index 144762e8..414e732a 100644
--- a/LedgerSMB/Template/ODS.pm
+++ b/LedgerSMB/Template/ODS.pm
@@ -81,8 +81,17 @@ sub preprocess {
sub _worksheet_handler {
$rowcount = -1;
$currcol = 0;
- my $sheet = $ods->getTable(0, $_->{att}->{rows}, $_->{att}->{columns});
- $ods->renameTable($sheet, $_->{att}->{name});
+ my $rows = $_->{att}->{rows};
+ my $columns = $_->{att}->{columns};
+ $rows ||= 1000;
+ $columns ||= 52;
+ my $sheet;
+ if ($_->is_first_child) {
+ $sheet = $ods->getTable(0, $rows, $columns);
+ $ods->renameTable($sheet, $_->{att}->{name});
+ } else {
+ $sheet = $ods->appendTable($_->{att}->{name}, $rows, $columns);
+ }
}
sub _row_handler {
@@ -727,7 +736,6 @@ sub _format_handler {
sub _format_cleanup_handler {
my ($t, $format) = @_;
shift @style_stack;
- $t->purge;
}
sub _ods_process {
diff --git a/UI/am-list-accounts.odst b/UI/am-list-accounts.odst
index 350ea8a9..163fc054 100644
--- a/UI/am-list-accounts.odst
+++ b/UI/am-list-accounts.odst
@@ -38,4 +38,9 @@
</row>
<?lsmb END ?>
</worksheet>
+ <worksheet name="test2" rows='3' columns='1'>
+ <row><cell text='1' type='number' /></row>
+ <row><cell text='2' type='number' /></row>
+ <row><formula text='sum(A1:A2)' type='formula' /></row>
+ </worksheet>
</workbook>