@@ -401,26 +401,26 @@ discard block |
||
| 401 | 401 | case 'dl_close': |
| 402 | 402 | $config = $this->getConf('def_list_odt_export'); |
| 403 | 403 | if ($config != 'table') { |
| 404 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] != 2) { |
|
| 405 | - if ($config == 'listheader' && method_exists ($renderer, 'listheader_close')) { |
|
| 404 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) { |
|
| 405 | + if ($config == 'listheader' && method_exists($renderer, 'listheader_close')) { |
|
| 406 | 406 | $renderer->listheader_close(); |
| 407 | 407 | } else { |
| 408 | 408 | $renderer->listitem_close(); |
| 409 | 409 | } |
| 410 | 410 | } |
| 411 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 411 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 412 | 412 | $renderer->list_close(); |
| 413 | 413 | } else { |
| 414 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 414 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { |
|
| 415 | 415 | $properties = array(); |
| 416 | 416 | $properties ['border'] = 'none'; |
| 417 | 417 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 418 | 418 | $renderer->tablecell_close(); |
| 419 | 419 | } |
| 420 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 421 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 420 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 421 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 422 | 422 | $renderer->tablerow_close(1); |
| 423 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 423 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 424 | 424 | } |
| 425 | 425 | $renderer->table_close(); |
| 426 | 426 | } |
@@ -446,78 +446,78 @@ discard block |
||
| 446 | 446 | case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML. |
| 447 | 447 | switch ($this->getConf('def_list_odt_export')) { |
| 448 | 448 | case 'listheader': |
| 449 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 450 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 449 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 450 | + if (method_exists($renderer, 'listheader_close')) { |
|
| 451 | 451 | $renderer->listheader_close(); |
| 452 | 452 | } else { |
| 453 | 453 | $renderer->listitem_close(); |
| 454 | 454 | } |
| 455 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 455 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 456 | 456 | } |
| 457 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 458 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 457 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 458 | + if (method_exists($renderer, 'listheader_open')) { |
|
| 459 | 459 | $renderer->listheader_open(1); |
| 460 | 460 | } else { |
| 461 | 461 | $renderer->listitem_open(1); |
| 462 | 462 | } |
| 463 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 463 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 464 | 464 | } |
| 465 | 465 | break; |
| 466 | 466 | case 'table': |
| 467 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 467 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { |
|
| 468 | 468 | $properties = array(); |
| 469 | 469 | $properties ['border'] = 'none'; |
| 470 | 470 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 471 | 471 | $renderer->tablecell_close(); |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 474 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 475 | 475 | $renderer->tablerow_close(); |
| 476 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 476 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 477 | 477 | } |
| 478 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 478 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 479 | 479 | $renderer->tablerow_open(1); |
| 480 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 480 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 481 | 481 | } |
| 482 | 482 | $properties = array(); |
| 483 | 483 | $properties ['border'] = 'none'; |
| 484 | 484 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 485 | 485 | break; |
| 486 | 486 | default: |
| 487 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 487 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 488 | 488 | $renderer->listitem_close(); |
| 489 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 489 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 490 | 490 | } |
| 491 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 491 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 492 | 492 | $renderer->listitem_open(1); |
| 493 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 493 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 494 | 494 | } |
| 495 | 495 | break; |
| 496 | 496 | } |
| 497 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 1; |
|
| 498 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 497 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 1; |
|
| 498 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 499 | 499 | break; |
| 500 | 500 | case 'dd_open': |
| 501 | 501 | switch ($this->getConf('def_list_odt_export')) { |
| 502 | 502 | case 'listheader': |
| 503 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 504 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 503 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 504 | + if (method_exists($renderer, 'listheader_open')) { |
|
| 505 | 505 | $renderer->listheader_open(1); |
| 506 | 506 | } else { |
| 507 | 507 | $renderer->listitem_open(1); |
| 508 | 508 | } |
| 509 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 509 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 510 | 510 | } |
| 511 | 511 | break; |
| 512 | 512 | case 'table': |
| 513 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 513 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 514 | 514 | $renderer->tablerow_open(1); |
| 515 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 515 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 516 | 516 | } |
| 517 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 1) { |
|
| 517 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) { |
|
| 518 | 518 | $renderer->tablecell_close(); |
| 519 | 519 | } |
| 520 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 0) { |
|
| 520 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) { |
|
| 521 | 521 | $properties = array(); |
| 522 | 522 | $properties ['border'] = 'none'; |
| 523 | 523 | $renderer->_odtTableCellOpenUseProperties($properties); |
@@ -529,14 +529,14 @@ discard block |
||
| 529 | 529 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 530 | 530 | break; |
| 531 | 531 | default: |
| 532 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 532 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 533 | 533 | $renderer->listitem_open(1); |
| 534 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 534 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 535 | 535 | } |
| 536 | 536 | break; |
| 537 | 537 | } |
| 538 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
|
| 539 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 1; |
|
| 538 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; |
|
| 539 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 1; |
|
| 540 | 540 | break; |
| 541 | 541 | case 'dt_content_open': |
| 542 | 542 | switch ($this->getConf('def_list_odt_export')) { |
@@ -598,31 +598,31 @@ discard block |
||
| 598 | 598 | case 'dd_close': |
| 599 | 599 | switch ($this->getConf('def_list_odt_export')) { |
| 600 | 600 | case 'listheader': |
| 601 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 602 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 601 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 602 | + if (method_exists($renderer, 'listheader_close')) { |
|
| 603 | 603 | $renderer->listheader_close(); |
| 604 | 604 | } else { |
| 605 | 605 | $renderer->listitem_close(); |
| 606 | 606 | } |
| 607 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 607 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 608 | 608 | } |
| 609 | 609 | break; |
| 610 | 610 | case 'table': |
| 611 | 611 | $renderer->tablecell_close(); |
| 612 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 612 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 613 | 613 | $renderer->tablerow_close(1); |
| 614 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 614 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 615 | 615 | } |
| 616 | 616 | break; |
| 617 | 617 | default: |
| 618 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 618 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 619 | 619 | $renderer->listitem_close(1); |
| 620 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 620 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 621 | 621 | } |
| 622 | 622 | break; |
| 623 | 623 | } |
| 624 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
|
| 625 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 2; |
|
| 624 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; |
|
| 625 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 2; |
|
| 626 | 626 | break; |
| 627 | 627 | |
| 628 | 628 | case 'p_open': |