diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-10 16:45:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-10 17:02:58 +0100 |
| commit | e62339f856efa0b8ef03df3bf8b93e098c4ac0d3 (patch) | |
| tree | 6fc995d1cb4467540d4e46562950c583d1ca206f | |
| parent | 70d8b26810c927949206dc6189b7f163651ce55e (diff) | |
fdo#73363: sd: fix mis-detection of Visio files as PPT
SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.
Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee
| -rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 31043caa251b..f962b9c82c03 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -372,6 +372,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes else pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97); } + else + { + pFilter = 0; + } } else { @@ -424,6 +428,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes } } } + else + { + pFilter = 0; + } } } |