summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2018-04-29 12:22:16 +0200
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2018-04-29 14:16:40 +0200
commite0317c8d12c9753ab8655a1f45ef8dd50047c414 (patch)
tree4bd7b2c1e752ef15836cf50b6648460c92087af6 /svx
parentd903118b7920f976f745d5122158c6cbb6221931 (diff)
cppcheck: knownConditionTrueFalse
Change-Id: I1b524568b0c014be381c971cd4152ac3f00db13c Reviewed-on: https://gerrit.libreoffice.org/53622 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/txencbox.cxx23
1 files changed, 10 insertions, 13 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index e4ba0b09a9d3..b4e446aeee3f 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -240,23 +240,20 @@ void TextEncodingBox::FillFromTextEncodingTable(
{
bool bInsert = true;
rtl_TextEncoding nEnc = RID_SVXSTR_TEXTENCODING_TABLE[j].second;
- if ( bInsert )
+ if ( bExcludeImportSubsets )
{
- if ( bExcludeImportSubsets )
+ switch ( nEnc )
{
- switch ( nEnc )
- {
- // subsets of RTL_TEXTENCODING_GB_18030
- case RTL_TEXTENCODING_GB_2312 :
- case RTL_TEXTENCODING_GBK :
- case RTL_TEXTENCODING_MS_936 :
- bInsert = false;
- break;
- }
+ // subsets of RTL_TEXTENCODING_GB_18030
+ case RTL_TEXTENCODING_GB_2312 :
+ case RTL_TEXTENCODING_GBK :
+ case RTL_TEXTENCODING_MS_936 :
+ bInsert = false;
+ break;
}
- if ( bInsert )
- InsertTextEncoding(nEnc, SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
}
+ if ( bInsert )
+ InsertTextEncoding(nEnc, SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
}
}