summaryrefslogtreecommitdiff
path: root/hwpfilter/source/hwpreader.cxx
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-06-09 23:06:51 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-06-09 23:06:51 +0200
commit097225a9ce5fbffccfbdbc0b47ba5a6fe5b4b818 (patch)
treeb6f697a6e65ca84c132bc0976fb213a704f6af8c /hwpfilter/source/hwpreader.cxx
parent121ec60a5d711178380cf68a1416dbe3274fe54b (diff)
Some cppcheck cleaning
Diffstat (limited to 'hwpfilter/source/hwpreader.cxx')
-rw-r--r--hwpfilter/source/hwpreader.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 2966019790bd..3ffc6a5c679e 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1531,7 +1531,6 @@ void HwpReader::parseParaShape(ParaShape * pshape)
*/
void HwpReader::makePStyle(ParaShape * pshape)
{
- unsigned char tf = 0;
int nscount = pshape->tabs[MAXTABS -1].type;
padd(ascii("style:name"), sXML_CDATA,
ascii(Int2Str(pshape->index, "P%d", buf)));
@@ -1545,6 +1544,7 @@ void HwpReader::makePStyle(ParaShape * pshape)
if( nscount )
{
+ unsigned char tf = 0;
rstartEl(ascii("style:tab-stops"),rList);
int tab_margin = pshape->left_margin + pshape->indent;
@@ -3658,11 +3658,11 @@ void HwpReader::makeTextBox(TxtBox * hbox)
ascii(Int2Str(hbox->style.boxnum, "Txtbox%d", buf)));
padd(ascii("draw:name"), sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "Frame%d", buf)));
- int x = 0;
- int y = 0;
if( hbox->style.cap_len <= 0 || hbox->type != TXT_TYPE )
{
+ int x = 0;
+ int y = 0;
switch (hbox->style.anchor_type)
{
case CHAR_ANCHOR: