diff options
author | Raymond Wells <rfw2nd@gmail.com> | 2013-09-02 22:34:23 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-23 02:13:10 +0000 |
commit | 571f49ffed792095fd41e2d07dbe30befa99a5b8 (patch) | |
tree | ed17752c824f2e1392d0619c6ce1caaeef317f47 | |
parent | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (diff) |
fdo#60889: FILEOPEN: Incorrect opening XLSX file (sharedStrings.xml)
Change-Id: I2fc39999ecdb13eecc28e012debdeda811e98581
Reviewed-on: https://gerrit.libreoffice.org/5763
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 6907d93d4b50..fc3c2aa3e857 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -213,7 +213,8 @@ void WorkbookFragment::finalizeImport() // read the shared string table substream (requires finalized styles buffer) OUString aSstFragmentPath = getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "sharedStrings" ) ); if( !aSstFragmentPath.isEmpty() ) - importOoxFragment( new SharedStringsFragment( *this, aSstFragmentPath ) ); + if (!importOoxFragment( new SharedStringsFragment( *this, aSstFragmentPath ) )) + importOoxFragment(new SharedStringsFragment(*this, aSstFragmentPath.replaceFirst("sharedStrings","SharedStrings"))); xGlobalSegment->setPosition( 0.75 ); // read the connections substream |