[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

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

New commits:
commit c3d9bbfea750aedb3030d5bcf61c2ed65ac2ac7d
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 23 15:04:49 2015 +0200

    TableRef: finalize database ranges before defined names
    
    Change-Id: I7ea0646c531c8aa2a5e33baa147e08628e65c17d
    (cherry picked from commit ab4374fc8af8e617ec7e5b3e83a1bd863452eed6)

diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index b211a5d..342be2b 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -459,9 +459,9 @@ void WorkbookFragment::finalizeImport()
     // setup structure sizes for the number of sheets
     getFormulaBuffer().SetSheetCount( aSheetFragments.size() );
 
-    // create all defined names and database ranges
-    getDefinedNames().finalizeImport();
+    // create all database ranges and defined names, in that order
     getTables().finalizeImport();
+    getDefinedNames().finalizeImport();
     // open the VBA project storage
     OUString aVbaFragmentPath = getFragmentPathFromFirstType( CREATE_MSOFFICE_RELATION_TYPE( "vbaProject" ) );
     if( !aVbaFragmentPath.isEmpty() )