From a884bedf92234db986cd7d031b0849d223162a6b Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 8 Jul 2014 19:03:58 +0000 Subject: [PATCH] fpspreadsheet: Fix zip/xml path delimiter issue for ooxml making fps-written xlsx files unreadable by Libre/OpenOffice (see //forum.lazarus.freepascal.org/index.php/topic,25110.0.html) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3299 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/xlsxooxml.pas | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas index 1982c5b38..0da01d645 100755 --- a/components/fpspreadsheet/xlsxooxml.pas +++ b/components/fpspreadsheet/xlsxooxml.pas @@ -107,15 +107,15 @@ const { OOXML Directory structure constants } OOXML_PATH_TYPES = '[Content_Types].xml'; - OOXML_PATH_RELS = '_rels' + PathDelim; - OOXML_PATH_RELS_RELS = '_rels' + PathDelim + '.rels'; - OOXML_PATH_XL = 'xl' + PathDelim; - OOXML_PATH_XL_RELS = 'xl' + PathDelim + '_rels' + PathDelim; - OOXML_PATH_XL_RELS_RELS = 'xl' + PathDelim + '_rels' + PathDelim + 'workbook.xml.rels'; - OOXML_PATH_XL_WORKBOOK = 'xl' + PathDelim + 'workbook.xml'; - OOXML_PATH_XL_STYLES = 'xl' + PathDelim + 'styles.xml'; - OOXML_PATH_XL_STRINGS = 'xl' + PathDelim + 'sharedStrings.xml'; - OOXML_PATH_XL_WORKSHEETS = 'xl' + PathDelim + 'worksheets' + PathDelim; + OOXML_PATH_RELS = '_rels/'; + OOXML_PATH_RELS_RELS = '_rels/.rels'; + OOXML_PATH_XL = 'xl/'; + OOXML_PATH_XL_RELS = 'xl/_rels/'; + OOXML_PATH_XL_RELS_RELS = 'xl/_rels/workbook.xml.rels'; + OOXML_PATH_XL_WORKBOOK = 'xl/workbook.xml'; + OOXML_PATH_XL_STYLES = 'xl/styles.xml'; + OOXML_PATH_XL_STRINGS = 'xl/sharedStrings.xml'; + OOXML_PATH_XL_WORKSHEETS = 'xl/worksheets/'; { OOXML schemas constants } SCHEMAS_TYPES = 'http://schemas.openxmlformats.org/package/2006/content-types';