summaryrefslogtreecommitdiff
path: root/sal/textenc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-25 18:20:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-26 08:56:47 +0200
commit979c8c56b7d52fe9a5d4b1fbfdab0adaba04c470 (patch)
treede5942b227fb6f441e1f36878a030a1b13601ba0 /sal/textenc
parentc2d139d8fa92e44baf592cd8ce644dc66356e143 (diff)
loplugin:oncevar in oox..sax
Change-Id: I0fee8bcddaeea48335e3be05761d2ad2c45020e2 Reviewed-on: https://gerrit.libreoffice.org/39238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/textenc')
-rw-r--r--sal/textenc/convertisciidevangari.cxx2
-rw-r--r--sal/textenc/convertsinglebytetobmpunicode.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx
index 2e7f09e5e48e..ed87c5819586 100644
--- a/sal/textenc/convertisciidevangari.cxx
+++ b/sal/textenc/convertisciidevangari.cxx
@@ -234,7 +234,7 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size
char* pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags,
sal_uInt32 * pInfo, sal_Size* pSrcCvtChars)
{
- size_t entries = SAL_N_ELEMENTS(unicodeToISCIIEncoding);
+ size_t const entries = SAL_N_ELEMENTS(unicodeToISCIIEncoding);
BmpUnicodeToSingleByteRange const * ranges = unicodeToISCIIEncoding;
sal_Unicode cHighSurrogate = m_cHighSurrogate;
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx
index 9bb994d2a9c8..5890a9dc8220 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.cxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.cxx
@@ -42,7 +42,6 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
sal_Unicode * destBufPtr = destBuf;
sal_Unicode * destBufEnd = destBuf + destChars;
for (; converted < srcBytes; ++converted) {
- bool undefined = true;
sal_Char b = *srcBuf++;
sal_Unicode c = map[static_cast< sal_uInt8 >(b)];
if (c == 0xFFFF) {
@@ -55,7 +54,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
continue;
bad_input:
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
- undefined, false, b, flags, &destBufPtr, destBufEnd,
+ true/*undefined*/, false, b, flags, &destBufPtr, destBufEnd,
&infoFlags))
{
case sal::detail::textenc::BAD_INPUT_STOP: