diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-25 18:56:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-27 10:10:52 +0200 |
| commit | f3049f68584811bb897873f35e0c302898af2d31 (patch) | |
| tree | b77f8bee3f733b8f2565a64276e33387576a26ac /svx | |
| parent | 28fc0962b10519ab84654d189d2ad0cca8f84f95 (diff) | |
loplugin:constantparam
Change-Id: I966dcf87be021520e7cc394338b9c0574bb8afee
Reviewed-on: https://gerrit.libreoffice.org/53541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 4eb656d0746e..448b6aa14912 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -233,33 +233,13 @@ TextEncodingBox::~TextEncodingBox() } void TextEncodingBox::FillFromTextEncodingTable( - bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, - sal_uInt32 nButIncludeInfoFlags ) + bool bExcludeImportSubsets ) { - rtl_TextEncodingInfo aInfo; - aInfo.StructSize = sizeof(rtl_TextEncodingInfo); const sal_uInt32 nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE); for (sal_uInt32 j = 0; j < nCount; ++j) { bool bInsert = true; rtl_TextEncoding nEnc = RID_SVXSTR_TEXTENCODING_TABLE[j].second; - if ( nExcludeInfoFlags ) - { - if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = false; - else - { - if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) - { - if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && - ((nEnc == RTL_TEXTENCODING_UCS2) || - nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = false; // InfoFlags don't work for Unicode :-( - } - else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) - bInsert = false; - } - } if ( bInsert ) { if ( bExcludeImportSubsets ) |