diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-27 07:35:39 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-27 07:38:47 +0200 |
| commit | e72e8c59fb1103f46b3d0b3e6a2386566068b1a2 (patch) | |
| tree | 1bb7ddfff50ce29d9991f4ff83dd67e6a6282355 /oox | |
| parent | c6726bdbd2143ae2875f3373b07b23611eb263d7 (diff) | |
OOXML with VBA needs to be a different filter type
The filter type also contains the file format, so we need to use a
different type to keep the xlsm extension during export.
Now the only missing part is the warning that saving as the non-VBA
version will loose the VBA stream.
Change-Id: I11f78d2c33cb2834086a4e9fad141b3e374b8991
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/filterdetect.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index d48d25c0f7aa..1742c919c1fc 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -178,10 +178,12 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r rContentType == "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" ) return OUString( "writer_MS_Word_2007_Template" ); - if( rContentType == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" || - rContentType == "application/vnd.ms-excel.sheet.macroEnabled.main+xml" ) + if( rContentType == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml") return OUString( "MS Excel 2007 XML" ); + if (rContentType == "application/vnd.ms-excel.sheet.macroEnabled.main+xml") + return OUString( "MS Excel 2007 VBA XML" ); + if( rContentType == "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml" || rContentType == "application/vnd.ms-excel.template.macroEnabled.main+xml" ) return OUString( "MS Excel 2007 XML Template" ); |