[Libreoffice-commits] core.git: sc/source

[Raymond Wells]

 sc/source/filter/oox/workbookfragment.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 571f49ffed792095fd41e2d07dbe30befa99a5b8
Author: Raymond Wells <rfw2nd at gmail.com>
Date:   Mon Sep 2 22:34:23 2013 +0200

    fdo#60889: FILEOPEN: Incorrect opening XLSX file (sharedStrings.xml)
    
    Change-Id: I2fc39999ecdb13eecc28e012debdeda811e98581
    Reviewed-on: https://gerrit.libreoffice.org/5763
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 6907d93..fc3c2aa 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