[Libreoffice-commits] core.git: sw/inc sw/source

[Maxim Monastirsky]

 sw/inc/iodetect.hxx                  |    2 +-
 sw/source/filter/basflt/iodetect.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d9cfbabc7fe13752daf02e2a8cfa38c72a30fb29
Author: Maxim Monastirsky <momonas...@gmail.com>
Date:   Sun Jan 22 20:15:31 2017 +0200

    bEncodedFilter is always false
    
    Change-Id: I1b959ce8f46f45a789bb7d493c371677ba775f3b

diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index cce9b32..e49c803 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -96,7 +96,7 @@ public:
     static bool IsValidStgFilter( const css::uno::Reference < 
css::embed::XStorage >& rStg, const SfxFilter& rFilter);
 
     static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
-            rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd 
*pLineEnd=nullptr, bool bEncodedFilter = false );
+            rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd=nullptr 
);
 
     static const OUString GetSubStorageName( const SfxFilter& rFltr );
 };
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 4fc0635..1ab3626 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -234,7 +234,7 @@ std::shared_ptr<const SfxFilter> 
SwIoSystem::GetFileFilter(const OUString& rFile
 }
 
 bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen,
-    rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd, bool 
bEncodedFilter)
+    rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd)
 {
     bool bSwap = false;
     rtl_TextEncoding eCharSet = RTL_TEXTENCODING_DONTKNOW;
@@ -369,7 +369,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, 
sal_uLong &rLen,
     if (pLineEnd)
         *pLineEnd = eLineEnd;
 
-    return bEncodedFilter || (!bIsBareUnicode && eSysLE == eLineEnd);
+    return !bIsBareUnicode && eSysLE == eLineEnd;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits