import the document properties before the document

That allows us to potentially change the import depending on the
producer of the document.

This becomes necessary to handle MSO 2007 chart drawingml streams
correctly.

Change-Id: I9be8b019fae69cd206203591982a89648965692f

1 files changed, 12 insertions, 12 deletions

diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 06ab0db88409..35199e4d2ab9 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -102,24 +102,24 @@ bool ExcelFilter::importDocument()
 
     try
     {
+        try
+        {
+            importDocumentProperties();
+        }
+        catch( const Exception& e )
+        {
+            SAL_WARN("sc", "exception when importing document properties " << e.Message);
+        }
+        catch( ... )
+        {
+            SAL_WARN("sc", "exception when importing document properties");
+        }
         /*  Construct the WorkbookGlobals object referred to by every instance of
             the class WorkbookHelper, and execute the import filter by constructing
             an instance of WorkbookFragment and loading the file. */
         WorkbookGlobalsRef xBookGlob(WorkbookHelper::constructGlobals(*this));
         if (xBookGlob.get() && importFragment(new WorkbookFragment(*xBookGlob, aWorkbookPath)))
         {
-            try
-            {
-                importDocumentProperties();
-            }
-            catch( const Exception& e )
-            {
-                SAL_WARN("sc", "exception when importing document properties " << e.Message);
-            }
-            catch( ... )
-            {
-                SAL_WARN("sc", "exception when importing document properties");
-            }
             return true;
         }
     }