sd/source/ui/unoidl/sddetect.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Feb 10 16:45:27 2014 +0100
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
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 31043ca..f962b9c 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;
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
