sw/source/ui/uno/swdetect.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit c53d6326aaa2bb2721818671034f4df68923b11c
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Aug 20 15:48:37 2013 +0200
Revert "Ugly workaround for historic sxw files..."
There is cleaner, scriptable and out-of-source-tree workaround available at:
http://fridrich.blogspot.ch/2013/08/service-announcement-openning-of-sxw.html
This reverts commit 36c64c875f5819bf5ada2bb657c490441bc24644.
Change-Id: I37362e996ff1c73bcc88d1037defd07d7bab90af
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 6100721..21f954a 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -240,11 +240,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence<
PropertyValue >& lDescriptor
}
catch (const WrappedTargetException& aWrap)
{
- /* Cater for non-compliant sxw files created once upon
a time by old libwpd/wpd2sxw combo
- Don't bail-out early if the document is considered
as corrupted. This allows us not to
- reach the -- apparently -- catch-all
SmFilterDetect::detect.
- */
- if (!bDeepDetection && aTypeName !=
"writer_StarOffice_XML_Writer")
+ if (!bDeepDetection)
// Bail out early unless it's a deep detection.
return OUString();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
