summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-10 16:45:27 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-12 11:00:48 +0000
commit6a6e61368f252c24bb761417b78dceb9b7dea210 (patch)
treef205d0245ee1f0ca254eb7f828f489bef2b441ab
parent708200d8532c5c3372978e5fb63c65d259a65394 (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 (cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3) Reviewed-on: https://gerrit.libreoffice.org/7976 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 0fddd1be6459..e8ee02e0398a 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -371,6 +371,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
else
pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
}
+ else
+ {
+ pFilter = 0;
+ }
}
else
{
@@ -423,6 +427,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
}
}
}
+ else
+ {
+ pFilter = 0;
+ }
}
}