From be8c4449514507cc1baeca72ab89fde10a36d7c0 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Sat, 19 Mar 2022 16:15:48 +0100 Subject: [PATCH] More minor tweaks --- CHANGELOG.md | 3 +++ src/PhpSpreadsheet/Reader/Xls.php | 4 +--- .../Reader/XLS/CF_Expression_Comparisons.xls | Bin 26624 -> 26624 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dc40f8a..b8aa5771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org). This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators. - Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532) +- Limited support for Xls Reader to handle Conditional Formatting: + + Ranges and Rules are read, but style is currently limited to font size, weight and color. ### Changed diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php index 5e287472..0b2d17a8 100644 --- a/src/PhpSpreadsheet/Reader/Xls.php +++ b/src/PhpSpreadsheet/Reader/Xls.php @@ -7,7 +7,6 @@ use PhpOffice\PhpSpreadsheet\Cell\DataType; use PhpOffice\PhpSpreadsheet\Cell\DataValidation; use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\NamedRange; -use PhpOffice\PhpSpreadsheet\Reader\Xls\Color; use PhpOffice\PhpSpreadsheet\Reader\Xls\ConditionalFormatting; use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\CellFont; use PhpOffice\PhpSpreadsheet\RichText\RichText; @@ -8069,14 +8068,13 @@ class Xls extends BaseReader $style->getFont()->setSize($fontSize / 20); // Convert twips to points } - $bold = self::getUInt2d($options, 72) === 700; // 400 = normal, 700 = bold $style->getFont()->setBold($bold); $color = self::getInt4d($options, 80); if ($color !== -1) { - $style->getFont()->getColor()->setRGB(Color::map($color, $this->palette, $this->version)['rgb']); + $style->getFont()->getColor()->setRGB(Xls\Color::map($color, $this->palette, $this->version)['rgb']); } } diff --git a/tests/data/Reader/XLS/CF_Expression_Comparisons.xls b/tests/data/Reader/XLS/CF_Expression_Comparisons.xls index 34487aa882c7aaf3c6ff1dd19e290a3bc1e3bc2b..c9c8fe42203346b8a04ec8df3054fa0898ce5b6e 100644 GIT binary patch delta 1457 zcmb_bT}TvB6h3!nciq{Y9cNbEpRk;*EKqmX2hF5tM@x{fu*f2M5G%4G2&`UPBYhOh zqe)pL1p45Ewrf3vV9;ZN7J)tV;A3P^P=Uq5bY}LBTd@^H7v`LE&-a~g&bi#%yTp2z z*i4szNnx}3F~B|{%AVtd5F@J#rTA9xQ#9@jqwEx|To`NZ$Xg0G7yvlHB!|7bf8OrN zZ^xacEXjE5V9t>*!K|fa>Thz{`Z|w-k^@3NYJ|O>eD#dWl+?|BGcR3P2Mgk&Clm>i z_!mP1n5Dp6&S`B0N+F0wLG%ts6Jm%IF8WN{DgH@kupm0cbqd$o=!b%}c87merrx@} zlNgi&sQKKHVj9nyby!tLeWN~b-m-xD)6*LHyY;^skb5pu7A%!BcjZ*D=#e9X`n;Sc&1PkDxbj(@nnr%fR zpyRkdgq5Xn%Qu$g{DEN3cZG8PN;v0_mgM|-&cDj}L!3Xs`A;~1jPs{C{~6~mbN(vl z8=Suoh~o+BXNA{&=5-#TNh zPRcF#SZ&aa)w@Pa@AS}>G~Yowoi-qqN*S7_i3M`rUvsD`Wq7kV9=8;VIGju-*A;AO zp0gB0WJ<}962yL0!K@U;Q-R|YCsG5RZW!=TBYX+uJ-|Q$!AGG1hRciMZWZ+JZj^dno8ddT1&Z z^iZfiZK(%QN)_zEHc@&Js~{*^uoMNM9=s@e(qaWI!aB3bOjL4cJBQgf@B7~O-kW{9 z*(H))BC~xGIfs^%r28Fbe<3wF9s^Z(z_B9O?DjiWRMlaO0DucvP*gSkJ?DR|@(K@nW%YFH~P#SEP?&!Cnx3S}`37npy$nW(QMIxEv$`8D~si@0#rXU15z zA9e!Z0X5ii-%or116-I?%Aq%kXj(C;!WBQ;hs!d#&Rkh^rl?asmZQ2_u7(XO)7mbp zcZrHS{bnpkn{zt7rt1^_2|u{Uof<;e=Wihj>m}yloHuZonsI<94#$g6De5bs34m;r zqdr`vsK!yDU#PPJlbRXxb5z`Op~p&0Q#8O)8oLl*i1XTH9M)Qhj&s^kcmLbxX`GC< zPMxVDSXY(7@o+m1R)jEPw&SaC2nQo0*lUC^5^YAs2;huy5IxZlu7pRfn)@BffN>q$ zV{yD>c39KX({_{9<6|$IrqAVaHl$K1JCR5zWqj)YKKy3v!o}z@{H%A%jtXi4t7zQ| za;rPUt%gc&r3LS+;Ef92fZ&Y_URwo^T^78Dg0~`g=LOHydBnQlB}BHzf_Gf-Qehr( zQt%{^?Y3?WIbDwW4!|fIh2oOv(+dPNkl0JM!IqgFq7y<-G4RmOF#$3_l5N}R*Z7{& zcCf=HrG~bsMW@T=Ww9xxr!AFLx3L!U+o~sZ@*3wGPDrOe5v*-oRC?-xUJAf`{(Ix1 zCV$)w@FoAOquUc?qYw1@09ct=ZPnMXpQe{O*v+!l)>?Q1)VQ$MYShPwO&bEBckHa2 zc&MuhUpk>0=+w8V&S`vCU+!8bxqTOjlD)9nzt-`NNO?VTHkdo|vy$w||2pL* Fe*mN6FWUeB