diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-22 20:15:31 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-23 00:32:47 +0200 |
| commit | d9cfbabc7fe13752daf02e2a8cfa38c72a30fb29 (patch) | |
| tree | 9e73bbe91a74a0e424dc0c3f50e5dde5d2991f40 | |
| parent | e59b69010c9eca5b7c1dd3102141d9a23ab1c5a5 (diff) | |
bEncodedFilter is always false
Change-Id: I1b959ce8f46f45a789bb7d493c371677ba775f3b
| -rw-r--r-- | sw/inc/iodetect.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index cce9b3225095..e49c8031589f 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 4fc0635b3985..1ab3626fe2a1 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: */ |