[Libreoffice-commits] .: oox/source

[Muthu Subramanian]

 oox/source/xls/excelfilter.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5528eefeda3abbc58600152365ddd64839e0fe18
Author: Muthu Subramanian <sumuthu at novell.com>
Date:   Fri Apr 8 14:24:28 2011 +0530

    Again merge-fix with importDocumentProperties()

diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx
index 0f6dfb8..bd2127c 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/oox/source/xls/excelfilter.cxx
@@ -127,7 +127,12 @@ bool ExcelFilter::importDocument() throw()
         return false;
         
     WorkbookHelperRoot aHelper( *this );
-    return aHelper.isValid() && importFragment( new WorkbookFragment( aHelper, aWorkbookPath ) );
+    if( aHelper.isValid() && importFragment( new WorkbookFragment( aHelper, aWorkbookPath ) ) )
+    {
+        importDocumentProperties();
+        return true;
+    }
+    return false;
 }
 
 bool ExcelFilter::exportDocument() throw()