diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-18 14:09:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-19 07:58:15 +0200 |
commit | e61e4e56994c22221dcc0e9f4c2cb62fd63ac823 (patch) | |
tree | d38359c4e9a3de7112075244d7013907ce135d4f /hwpfilter | |
parent | ba80f637b82ef5df7c650ec301ca9ebb5f678f44 (diff) |
clang-tidy readability-misleading-indentation
Change-Id: I4673fc7c694924b41d048a1918ddb8b0e0af1f79
Reviewed-on: https://gerrit.libreoffice.org/61935
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'hwpfilter')
-rw-r--r-- | hwpfilter/source/hcode.cxx | 16 | ||||
-rw-r--r-- | hwpfilter/source/hwpfile.cxx | 34 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 14 |
3 files changed, 32 insertions, 32 deletions
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index 7dd7408ffe56..836a39ab0d18 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -895,13 +895,13 @@ int hcharconv(hchar ch, hchar *dest, int codeType) if (ch < 128){ dest[0] = ch; return 1; - } + } if (IsHangul(ch)) { - hchar ch2 = ch; + hchar ch2 = ch; if (codeType == KS) ch = cdkssm2ks_han(ch); - else if( codeType == UNICODE ){ + else if( codeType == UNICODE ){ if( ch2 == 0xd3c5 ){ dest[0] = 0xd55c; return 1 ; @@ -909,8 +909,8 @@ int hcharconv(hchar ch, hchar *dest, int codeType) int res = kssm_hangul_to_ucs2(ch, dest); //printf("hcharconv Hangul[%04x]\n",dest[0]); return res; - } - dest[0] = ch; + } + dest[0] = ch; return 1; } /* Chinese characters have a value of 4888 kinds from 0x4000. */ @@ -938,12 +938,12 @@ int hcharconv(hchar ch, hchar *dest, int codeType) lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1); ch = (hi << 8) | lo; } - else if(codeType == UNICODE){ + else if(codeType == UNICODE){ hi = sal::static_int_cast<unsigned char>(index / (0xFE - 0xA1 + 1) + 0xCA); lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1); ch = (hi << 8) | lo; ch = ksc5601_han_to_ucs2(ch); - } + } else { hi = sal::static_int_cast<unsigned char>(index / (0x100 - 0x31 - 0x11 - 2) + 0xE0); @@ -1321,7 +1321,7 @@ char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar) { // nothing special here, just copy } - else + else { unsigned int srclen = strlen(src); if (3 < srclen) diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 258ea9370ef5..2ceefc481c2f 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -217,20 +217,20 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist) unsigned char prev_etcflag = 0; while (spNode->Read(*this, 0)) { - if( !(spNode->etcflag & 0x04) ){ - tmp_etcflag = spNode->etcflag; - spNode->etcflag = prev_etcflag; - prev_etcflag = tmp_etcflag; - } + if( !(spNode->etcflag & 0x04) ){ + tmp_etcflag = spNode->etcflag; + spNode->etcflag = prev_etcflag; + prev_etcflag = tmp_etcflag; + } if (spNode->nch && spNode->reuse_shape) { if (!aplist.empty()){ - spNode->pshape = aplist.back()->pshape; - } - else{ - spNode->nch = 0; - spNode->reuse_shape = 0; - } + spNode->pshape = aplist.back()->pshape; + } + else{ + spNode->nch = 0; + spNode->reuse_shape = 0; + } } spNode->pshape->pagebreak = spNode->etcflag; if (spNode->nch) @@ -258,12 +258,12 @@ void HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsi if (spNode->nch && spNode->reuse_shape) { if (!aplist.empty()){ - spNode->pshape = aplist.back()->pshape; - } - else{ - spNode->nch = 0; - spNode->reuse_shape = 0; - } + spNode->pshape = aplist.back()->pshape; + } + else{ + spNode->nch = 0; + spNode->reuse_shape = 0; + } } spNode->pshape->pagebreak = spNode->etcflag; if (spNode->nch) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index d02f7b21d2c4..9e427591cd3c 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -1370,19 +1370,19 @@ void HwpReader::parseCharShape(CharShape const * cshape) padd("fo:font-style", sXML_CDATA, "italic"); padd("style:font-style-asian", sXML_CDATA, "italic"); } - else{ + else{ padd("fo:font-style", sXML_CDATA, "normal"); padd("style:font-style-asian", sXML_CDATA, "normal"); - } + } if (cshape->attr >> 1 & 0x01) { padd("fo:font-weight", sXML_CDATA, "bold"); padd("style:font-weight-asian", sXML_CDATA, "bold"); } - else{ + else{ padd("fo:font-weight", sXML_CDATA, "normal"); padd("style:font-weight-asian", sXML_CDATA, "normal"); - } + } if (cshape->attr >> 2 & 0x01) padd("style:text-underline", sXML_CDATA, "single"); if (cshape->attr >> 3 & 0x01) @@ -1463,7 +1463,7 @@ void HwpReader::parseParaShape(ParaShape const * pshape) if( pshape->pagebreak & 0x02 || pshape->pagebreak & 0x04) padd("fo:break-before", sXML_CDATA, "page"); - else if( pshape->pagebreak & 0x01 ) + else if( pshape->pagebreak & 0x01 ) padd("fo:break-before", sXML_CDATA, "column"); } @@ -3565,10 +3565,10 @@ void HwpReader::makeTextBox(TxtBox * hbox) rstartEl("text:p", mxList.get()); mxList->clear(); } - else{ + else{ padd("draw:z-index", sXML_CDATA, ascii(Int2Str(hbox->zorder, "%d", buf))); - } + } padd("draw:style-name", sXML_CDATA, ascii(Int2Str(hbox->style.boxnum, "Txtbox%d", buf))); |