mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bEncodedFilter is always false

Browse Source 
Change-Id: I1b959ce8f46f45a789bb7d493c371677ba775f3b
This commit is contained in:
Maxim Monastirsky 2017-01-22 20:15:31 +02:00
parent e59b69010c
commit d9cfbabc7f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sw/inc/iodetect.hxx
View File

@ -96,7 +96,7 @@ public:
static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter); static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter);
static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, 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 ); static const OUString GetSubStorageName( const SfxFilter& rFltr );
}; };

4
sw/source/filter/basflt/iodetect.cxx
View File

@ -234,7 +234,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile
} }
bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, 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; bool bSwap = false;
rtl_TextEncoding eCharSet = RTL_TEXTENCODING_DONTKNOW; rtl_TextEncoding eCharSet = RTL_TEXTENCODING_DONTKNOW;
@ -369,7 +369,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen,
if (pLineEnd) if (pLineEnd)
*pLineEnd = eLineEnd; *pLineEnd = eLineEnd;
return bEncodedFilter || (!bIsBareUnicode && eSysLE == eLineEnd); return !bIsBareUnicode && eSysLE == eLineEnd;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */