diff options
| author | Muthu Subramanian <sumuthu@novell.com> | 2011-04-08 14:24:28 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@novell.com> | 2011-04-08 14:25:50 +0530 |
| commit | 59b404bc0e73da3224d94cabd63b4bafaa86b18e (patch) | |
| tree | f04b1af42fb9ce47827654e91caff0ac90c42030 | |
| parent | 09ed1bee7412ed66deb781ef2547e3eeb6303850 (diff) | |
Again merge-fix with importDocumentProperties()
| -rw-r--r-- | oox/source/xls/excelfilter.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx index 953d752fe842..5683fd55c14b 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() |