Merge pull request #189 from tkirda/master

guyonroche · web-flow · commit 68838a18657e · 2016-10-10T09:31:31.000+01:00
Do not escape xml characters when using shared strings
diff --git a/lib/utils/shared-strings.js b/lib/utils/shared-strings.js
@@ -22,8 +22,6 @@
  */
 "use strict";
 
-var utils = require("./utils");
-
 var SharedStrings = module.exports = function() {
     this._values = [];
     this._totalRefs = 0;
@@ -46,7 +44,6 @@ SharedStrings.prototype = {
     },
     
     add: function(value) {
-        value = utils.xmlEncode(value);
         var index = this._hash[value];
         if (index === undefined) {
             index = this._hash[value] = this._values.length;
diff --git a/spec/integration/workbook-xlsx-writer.spec.js b/spec/integration/workbook-xlsx-writer.spec.js
@@ -186,6 +186,24 @@ describe('WorkbookWriter', function() {
         });
     });
 
+    it('does not escape special xml characters', function () {
+      var wb = new Excel.stream.xlsx.WorkbookWriter({filename: TEST_FILE_NAME, useSharedStrings: true});
+      var ws = wb.addWorksheet('blort');
+      var xmlCharacters = 'xml characters: & < > "';
+
+      ws.getCell('A1').value = xmlCharacters;
+
+      return wb.commit()
+        .then(function() {
+          var wb2 = new Excel.Workbook();
+          return wb2.xlsx.readFile(TEST_FILE_NAME);
+        })
+        .then(function(wb2) {
+          var ws2 = wb2.getWorksheet('blort');
+          expect(ws2.getCell('A1').value).to.equal(xmlCharacters);
+        });
+    });
+
     it('serializes and deserializes dataValidations', function() {
       var options = {filename: TEST_FILE_NAME};
       var wb = testUtils.createTestBook(new Excel.stream.xlsx.WorkbookWriter(options),'xlsx', ['dataValidations']);
