#17 Report Export: fix odd interpretation of values such as 1-2

CRM/CiviExportExcel/Utils/Report.php

@@ -193,11 +193,12 @@ class CRM_CiviExportExcel_Utils_Report extends CRM_Core_Page {
           }
         }
 
-        $objPHPExcel->getActiveSheet()->setCellValue($cells[$col] . $line, $value);
-        self::addValueLengthToColumnWidths($value, $cells[$col], $widths);
-
         // Cell formats
+        $has_format = FALSE;
+
         if (CRM_Utils_Array::value('type', $form->_columnHeaders[$v]) & CRM_Utils_Type::T_DATE) {
+          $has_format = TRUE;
+
           $objPHPExcel->getActiveSheet()
             ->getStyle($cells[$col] . $line)
             ->getNumberFormat()
@@ -209,11 +210,23 @@ class CRM_CiviExportExcel_Utils_Report extends CRM_Core_Page {
           $objPHPExcel->getActiveSheet()->getColumnDimension($cells[$col])->setAutoSize(true);
         }
         elseif (CRM_Utils_Array::value('type', $form->_columnHeaders[$v]) & CRM_Utils_Type::T_MONEY) {
+          $has_format = TRUE;
+
           $objPHPExcel->getActiveSheet()->getStyle($cells[$col])
             ->getNumberFormat()
             ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_GENERAL);
         }
 
+        if ($has_format || is_numeric($value) || is_float($value)) {
+          $objPHPExcel->getActiveSheet()->getCell($cells[$col] . $line)->setValue($value);
+        }
+        else {
+          // extensions/civiexportexcel#17 To avoid odd interpretations, such as "1-2" being interpreted as an address
+          $objPHPExcel->getActiveSheet()->getCell($cells[$col] . $line)->setValueExplicit($value, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING2);
+        }
+
+        self::addValueLengthToColumnWidths($value, $cells[$col], $widths);
+
         $col++;
       }