[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - filter/source sc/source

[Maxim Monastirsky]

 filter/source/textfilterdetect/filterdetect.cxx |    4 ++++
 sc/source/ui/unoobj/exceldetect.cxx             |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 3750fbfca3c7a9f546abc88cd262f55c0348a76e
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Oct 27 13:26:39 2013 +0200

    fdo#68903 Import .tsv and .xls plain text files in Calc by default
    
    Change-Id: I14115542d7f0401f4fa8face9f255b4512fc0ac3
    Reviewed-on: https://gerrit.libreoffice.org/6448
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    (cherry picked from commit 8a201be240b6d408d15166be7ffc576b9e123634)
    Reviewed-on: https://gerrit.libreoffice.org/6465

diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx
index ef1a1d6..360d8d4 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -87,6 +87,10 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
             setPropValue(lDescriptor, nFilter, "FilterName", OUString(WRITER_TEXT_FILTER));
         else if (aExt == "csv")
             setPropValue(lDescriptor, nFilter, "FilterName", OUString(CALC_TEXT_FILTER));
+        else if (aExt == "tsv")
+            setPropValue(lDescriptor, nFilter, "FilterName", OUString(CALC_TEXT_FILTER));
+        else if (aExt == "xls")
+            setPropValue(lDescriptor, nFilter, "FilterName", OUString(CALC_TEXT_FILTER));
         else if (aExt == "txt")
             setPropValue(lDescriptor, nFilter, "FilterName", OUString(WRITER_TEXT_FILTER));
         else
commit 9bf1f12471511ae4bb2e4186ed55f61276fff5ef
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Oct 27 13:01:12 2013 +0200

    fdo#70100 Detect single stream excel files with BOF ID 5
    
    Change-Id: I321b7a08e0436a9c33878acd1ce2f98c497040b5
    Reviewed-on: https://gerrit.libreoffice.org/6447
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 71882916f617528a6d6fcc54450674dc3f630319)
    Reviewed-on: https://gerrit.libreoffice.org/6464
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index fb15a3c..e87d27a 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -102,6 +102,7 @@ bool isExcel40(const uno::Reference<io::XInputStream>& xInStream)
         case 0x0009: // Excel 2.1 worksheet (BIFF 2)
         case 0x0209: // Excel 3.0 worksheet (BIFF 3)
         case 0x0409: // Excel 4.0 worksheet (BIFF 4)
+        case 0x0809: // Excel 5.0 worksheet (BIFF 5), some apps create such files (fdo#70100)
             break;
         default:
             return false;