From c954eddf5760891110c6fd7913de0b9e0ba6f0a2 Mon Sep 17 00:00:00 2001
From: Paolo Agostinetto <paul.ago@gmail.com>
Date: Mon, 20 Feb 2017 21:02:04 +0100
Subject: [PATCH] Ods reader: fix sheet count and added a test for sheet names

---
 src/PhpSpreadsheet/Reader/Ods.php            |   4 +++-
 tests/PhpSpreadsheetTests/Reader/OdsTest.php |  21 +++++++++++++++----
 tests/data/Reader/Ods/data.ods               | Bin 11764 -> 11764 bytes
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index 2d44ee6c..e5c9c600 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -435,7 +435,9 @@ class Ods extends BaseReader implements IReader
                 }
 
                 // Create sheet
-                $spreadsheet->createSheet();
+                if($worksheetID > 0){
+                    $spreadsheet->createSheet(); // First sheet is added by default
+                }
                 $spreadsheet->setActiveSheetIndex($worksheetID);
 
                 if ($worksheetName) {
diff --git a/tests/PhpSpreadsheetTests/Reader/OdsTest.php b/tests/PhpSpreadsheetTests/Reader/OdsTest.php
index 1b53278a..e71f52fd 100644
--- a/tests/PhpSpreadsheetTests/Reader/OdsTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/OdsTest.php
@@ -13,9 +13,7 @@ use PhpOffice\PhpSpreadsheet\Reader\Ods;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 
 /*
- * @todo Fix sheet name (is not imported correctly)
- * @todo Sheets count is incorrect
- * @todo The class doesn't read the bold/italic/underline properties
+ * @todo The class doesn't read the bold/italic/underline properties (rich text)
  */
 class OdsTest extends \PHPUnit_Framework_TestCase
 {
@@ -61,13 +59,28 @@ class OdsTest extends \PHPUnit_Framework_TestCase
         return $this->spreadsheetData;
     }
 
+    public function testReadFileProperties()
+    {
+        $filename = __DIR__ . '/../../data/Reader/Ods/data.ods';
+
+        // Load into this instance
+        $reader = new Ods();
+
+        // Test "listWorksheetNames" method
+
+        $this->assertEquals([
+            "Sheet1",
+            "Second Sheet",
+        ], $reader->listWorksheetNames($filename));
+    }
+
     public function testLoadWorksheets()
     {
         $spreadsheet = $this->loadDataFile();
 
         $this->assertInstanceOf('PhpOffice\PhpSpreadsheet\Spreadsheet', $spreadsheet);
 
-//        $this->assertCount(1, $spreadsheet->getAllSheets());
+        $this->assertEquals(2, $spreadsheet->getSheetCount());
 
         $firstSheet = $spreadsheet->getSheet(0);
         $this->assertInstanceOf('PhpOffice\PhpSpreadsheet\Worksheet', $firstSheet);
diff --git a/tests/data/Reader/Ods/data.ods b/tests/data/Reader/Ods/data.ods
index 5f58d457a42c0a1c5655d6d4b889402425b25a5a..3171eb6b7e31487b89848a91b89cae9adaa7ad35 100644
GIT binary patch
delta 1162
zcmewo{Uw?wz?+#xgn@yBf#LeXi9A6}*B5R~xXTZuCff@r)ZY(&WF=C!zn=B-b!#uj
zquk1GL|RzGV;8bU-glDrI%e`xMbrMz>-<}XUR}Gk_Cm$?b1%9toBTZY@@4tH$ud<R
zQ{O(kBxKa5k(o6$Iab>-DVSYw`^w(6_b%Gsntm-_yu{AkEXU#spN+>6!FHz;ntN2H
z3*YO=H{aSYk&RX6BO7DA+!NkJ^A-Fj^CBNVedCs*BNv(MA~*Y%6UY8Qz4c+MA74Fb
zn3}gUX#Mrm7w_H;nLWv}=<}?u^!+BTntwAjVg#&(C0D=tm1()}npd=Xe9N*`TgwV>
z*w(#H%2xPS-oo<b(2XhE4lm61^_`WYBN+3yXV$cB@2;B)AGyfm-0YYT7+-(;u84H}
zJr|b@-M@?eNIi)?aJ@k9io$(mcb!WMvY$U!XJ7nXu}FO7y!mtIT>ErLzVd**(~-vP
z7b?C7Lw{L!UGpg0=quO$FzbQJo+nM7Oc`q@@J%hRlxkA@v!#LO#Cw^)rJbBlmj)Y&
z3v|ioykY4HE_1gOGU8m8sd)acNWS9#dJTb{{*qOTTo`hGNpwoTI`G6hBA|@ntfKIV
zu-17W>ckf)UH-E4Ki3D|=mn}h7u*|mNIqQoj(y+f?Flb$9qilG^3>r@l4?!+tz}LD
z>m44jd)ay~5;^rkpoFPlf=h34%zbmV1FZ`W?dy!YEqo{D!qxD$Nsnw7i#R)MnU=ul
z<L)OfS+hGWg{ySMg{es@zhY*(yzl&@d2znbUofHWwYf@2n33`M<UZkU#^%XVB9Zmw
zk?}n2cfTH5=V!Le{33ho-l}3tvwuhIH>dBocKzPv!(U$AK3wu5>RSKRwUL?4FRxzs
zR`9^af3JDZ!i#nL<RtdCe^@A&e)z3Nbpp@VUvGEZmiGU8G38F|_jlD_qrK(7>fJ3X
zH_E)<qt^X1rKT*`_S*7kw{xD^?{hic|7rF6q*F>j>$m=64e(~?U~~VRG@FHip;(21
z0XdORJ}9a*d7Ta)7b4wHHWX75Dap^zNlGlzM^Wn|Y6i**Euz*S3aD(dte6mlX#%2r
zfMzM^@F1IYP}Bk@ldA=h;o#r^=B~~B;<k)Hsm*>8rtBcPRsJv=i1t!@0v0#W2nErT
z+cm*v@6~kSxV|vR3*?c>oLWX8sX85*$&p$jK=+HVLGtY6RoXI)PLmt8g(qj|h=A05
z(3Y9}5~wCml!u3rNrVBGyC<L3l40BcR{2*;8l)1W^(|099m-)+7MtuSCWERAXdGkY
zWL_OjsQpY6#U@`ARlrchbXsikdNDDPg2cSk9AGFytcG}f@(CSqpfKs0gG{m31&3;}
KF4&(db-e-CK<bnL

delta 1152
zcmewo{Uw?wz?+#xgn@yBfnn#|i9A6}JLhgpxXTZuCff@r)aM32vJ&}MSI>HRefgB8
zE^)UTnjGBgb~$lxs^iYpki5KP@{&D2UgzIB^y=ERwHGSl-S%7fPJTXTp51fHlMBV;
zugU4@Dn9O*v@Fc>+EyVIvr>V=*|%=IlKs21HuG<x<MZN_!)?xQ4>Y^T6l%20Ipker
z`LOp#SunRmX21c#e1Qk`j`sx0ntx4rGtD&aT%OCZM-xrmo@`vH+wwvB>8Gr%R&jG>
zf}c&({#vzH=I&kJt(r5H&DXE2_~sov<<k7NL#!K(CvIG|ZvM2#*=x6yesaxN6_qXC
ze)sWqy=`od>fJpY^m}|Wtz~vyyRziuF`<K3&#%bLd|el7>?m{Az(j&Y?CaM0yS^Jg
zKJ|5Jxpqna)OyEztTnvPop?Xl79COI-BngsS7cBnuT(zq)z6zJGj;X<Ol1F~>>{(H
z&F_*(%+mdfGkR0RZ$BxNSjXmf$XjoQO2aj-mjRX2mn&u*^5;I$@aNpc_~|nO;;dAQ
z85f>7c*yU7MQZsJWyQ$}v&25#@&73HslT3S;_oR7)xB5_EbE`RV<Df<z82P0_6ssb
zjX9w&INz5uY8m;)|60#*e*<gOA&y#>j@g3qUe!IYuIHY%PWFw4cLd)N-LOODD{{41
zzH+hDEx58-#cN>?pQAbhyXO^)<6mo&8Db=~-pqcn)%M_7*4Wxq4b6MTUWP0#*_>hr
zN}f!SKe#>HZCOA&SFEPnqVGLUe4Tdxr@Zj*{0Aofdu*-}5@uw4Jh@M}o3U}Slt^TK
zdSpBg``xdH*7=z&Gr!0lySJ*?((GSvecJhgwd?mTZ-04pd;7}^Ti3|1j^2EU?egk{
zZyz40oL7}E;k@{7jjcfy|3hcnb8WXLemfxX>g(;o?dJ1dEk3zp_q)5_Uu~ae_bPVR
z+jl9K_DTAReLnf)&8@06{<_<5o~f_t?2~^Qe*fqcrOo>!vi|Z0c(Zeq-M*<Yn}va)
zScQQBIgwAkE@s3AN$)_W(&WEdJY0w@FnN!tH7N1V6|(?Q`alKJVnPt635Wt|k<&rZ
z0#Z~U3RW~1$jsH^0~^S}!2!%uoB73U8G#x%`$?FxgXmWI!)zehOYI3*+(07~L{Dzl
z1e?EC(}iQ_+#oNI^Cxp^8G)o4bYvz+YKctVpd$oxIZ%kvVe%_2O+k=i1|%Rq`Hq(2
z<a?rmJd8{t46v*{*;Y%2X{+euwPFgW;w!Xe7~fB>*H#Bv1mrNOicPi`lR;GkvMqWt
zw~i)E(PXj7aiVC7KsKBdn;fmB#s=~F<P$pJKxEQ22kEocH3Lz_x?q2<)b$1cQ~TZ_