Skip to content

Commit be8c444

Browse files
author
MarkBaker
committed
More minor tweaks
1 parent aea156f commit be8c444

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).
1717
This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators.
1818

1919
- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532)
20+
- Limited support for Xls Reader to handle Conditional Formatting:
21+
22+
Ranges and Rules are read, but style is currently limited to font size, weight and color.
2023

2124
### Changed
2225

src/PhpSpreadsheet/Reader/Xls.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
88
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
99
use PhpOffice\PhpSpreadsheet\NamedRange;
10-
use PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
1110
use PhpOffice\PhpSpreadsheet\Reader\Xls\ConditionalFormatting;
1211
use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\CellFont;
1312
use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -8069,14 +8068,13 @@ private function getCFFontStyle(string $options, Style $style): void
80698068
$style->getFont()->setSize($fontSize / 20); // Convert twips to points
80708069
}
80718070

8072-
80738071
$bold = self::getUInt2d($options, 72) === 700; // 400 = normal, 700 = bold
80748072
$style->getFont()->setBold($bold);
80758073

80768074
$color = self::getInt4d($options, 80);
80778075

80788076
if ($color !== -1) {
8079-
$style->getFont()->getColor()->setRGB(Color::map($color, $this->palette, $this->version)['rgb']);
8077+
$style->getFont()->getColor()->setRGB(Xls\Color::map($color, $this->palette, $this->version)['rgb']);
80808078
}
80818079
}
80828080

Binary file not shown.

0 commit comments

Comments
 (0)