Commit 7ce0184
committed
Don't Interfere with SelectedCells And Other Changes
Xls Reader processing Conditionals interferes with the previously established SelectedCells. Make sure that value is restored.
StopIfTrue should always be set for Xls spreadsheet.
Set NoFormatSet to true unless any of Font, Fill, or Borders is specified in Conditional Style.
In my notes for PR #3372, I mentioned that I could not include some Xls tests because of errors in the software at that time. This PR fixes those errors, so I am adding the missing test, and making the equivalent Xlsx test more comprehensive.1 parent 313dcc5 commit 7ce0184
File tree
4 files changed
+88
-4
lines changed- src/PhpSpreadsheet/Reader
- tests
- PhpSpreadsheetTests/Reader
- Xlsx
- Xls
- data/Reader/XLS
4 files changed
+88
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
703 | 703 | | |
704 | 704 | | |
705 | 705 | | |
| 706 | + | |
706 | 707 | | |
707 | 708 | | |
708 | 709 | | |
| |||
910 | 911 | | |
911 | 912 | | |
912 | 913 | | |
913 | | - | |
| 914 | + | |
914 | 915 | | |
915 | 916 | | |
916 | 917 | | |
| |||
1112 | 1113 | | |
1113 | 1114 | | |
1114 | 1115 | | |
| 1116 | + | |
| 1117 | + | |
| 1118 | + | |
1115 | 1119 | | |
1116 | 1120 | | |
1117 | 1121 | | |
| |||
4376 | 4380 | | |
4377 | 4381 | | |
4378 | 4382 | | |
4379 | | - | |
| 4383 | + | |
4380 | 4384 | | |
4381 | 4385 | | |
4382 | 4386 | | |
| 4387 | + | |
4383 | 4388 | | |
4384 | 4389 | | |
4385 | 4390 | | |
| |||
4421 | 4426 | | |
4422 | 4427 | | |
4423 | 4428 | | |
| 4429 | + | |
| 4430 | + | |
4424 | 4431 | | |
4425 | 4432 | | |
4426 | 4433 | | |
| |||
7410 | 7417 | | |
7411 | 7418 | | |
7412 | 7419 | | |
| 7420 | + | |
7413 | 7421 | | |
7414 | 7422 | | |
7415 | 7423 | | |
| |||
7429 | 7437 | | |
7430 | 7438 | | |
7431 | 7439 | | |
| 7440 | + | |
7432 | 7441 | | |
7433 | 7442 | | |
7434 | 7443 | | |
| |||
7441 | 7450 | | |
7442 | 7451 | | |
7443 | 7452 | | |
| 7453 | + | |
7444 | 7454 | | |
7445 | 7455 | | |
7446 | 7456 | | |
7447 | 7457 | | |
7448 | 7458 | | |
7449 | 7459 | | |
| 7460 | + | |
7450 | 7461 | | |
7451 | 7462 | | |
7452 | 7463 | | |
| |||
7474 | 7485 | | |
7475 | 7486 | | |
7476 | 7487 | | |
7477 | | - | |
| 7488 | + | |
7478 | 7489 | | |
7479 | 7490 | | |
7480 | 7491 | | |
| |||
7604 | 7615 | | |
7605 | 7616 | | |
7606 | 7617 | | |
7607 | | - | |
| 7618 | + | |
7608 | 7619 | | |
7609 | 7620 | | |
7610 | 7621 | | |
| 7622 | + | |
7611 | 7623 | | |
7612 | 7624 | | |
| 7625 | + | |
7613 | 7626 | | |
7614 | 7627 | | |
7615 | 7628 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
36 | 61 | | |
37 | 62 | | |
38 | 63 | | |
| |||
Binary file not shown.
0 commit comments