summaryrefslogtreecommitdiff
path: root/sw/source/filter/basflt/iodetect.cxx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-01-22 20:24:02 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-01-23 11:02:47 +0000
commit6ff57262f44843ccd1f320426984b5e074e3eaf1 (patch)
tree76fab1ef2dc6b52f7afce218e762b8d2e27cb713 /sw/source/filter/basflt/iodetect.cxx
parentda55a0e5158e14c3743b186d3b1d4022a278e4d5 (diff)
tdf#63673 Never ignore detected BOM
SwIoSystem::IsDetectableText was returning false only because the detected line end isn't the same as the system default one. Instead return true whenever there is a known BOM or at least there is no 0x0, and actually use the detected line end. Change-Id: I20cc1642e7ad2e6e13dfb48c325a00c44f818f15 Reviewed-on: https://gerrit.libreoffice.org/33404 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw/source/filter/basflt/iodetect.cxx')
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 1ab3626fe2a1..6522a92045af 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -369,7 +369,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen,
if (pLineEnd)
*pLineEnd = eLineEnd;
- return !bIsBareUnicode && eSysLE == eLineEnd;
+ return !bIsBareUnicode;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */