diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:01:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:27 +0100 |
commit | a54fd6ae34b195dde26c4dcc11963b5525ed9889 (patch) | |
tree | a1b85e1fd7abcecb8c9d0d7ac6e708a1296ea571 /hwpfilter | |
parent | 63b891d3a6186a9bcd7770e05edd02317fe2baa0 (diff) |
bool improvements
Change-Id: I53fabee80a6c16f0c9cc2da2c94099a21e69aae9
Diffstat (limited to 'hwpfilter')
-rw-r--r-- | hwpfilter/source/formula.cxx | 10 | ||||
-rw-r--r-- | hwpfilter/source/hwpeq.cxx | 2 | ||||
-rw-r--r-- | hwpfilter/source/hwpfile.cxx | 2 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 8 | ||||
-rw-r--r-- | hwpfilter/source/lexer.cxx | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx index 03e6be282134..9d61d2ac1488 100644 --- a/hwpfilter/source/formula.cxx +++ b/hwpfilter/source/formula.cxx @@ -33,11 +33,11 @@ extern std::list<Node*> nodelist; #include "hcode.h" #define ascii(x) OUString::createFromAscii(x) -#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(0) -#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(0) -#define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(ascii(x)); } while(0) -#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x)); } while(0) -#define reucstr(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x,y, RTL_TEXTENCODING_EUC_KR)); } while(0) +#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false) +#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false) +#define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(ascii(x)); } while(false) +#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x)); } while(false) +#define reucstr(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x,y, RTL_TEXTENCODING_EUC_KR)); } while(false) #define padd(x,y,z) pList->addAttribute(x,y,z) #else static int indent = 0; diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx index 032a928c94e2..ce53b0ca9c63 100644 --- a/hwpfilter/source/hwpeq.cxx +++ b/hwpfilter/source/hwpeq.cxx @@ -593,7 +593,7 @@ static int eq_word(MzString& outs, istream *strm, int status) else { /* token */ int script_status = SCRIPT_NONE; - while( 1 ) { + while( true ) { state << white << token; make_keyword(keyword, token); if( token[0] == '^' ) diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index bf66ca288870..2b5a1fec000e 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -277,7 +277,7 @@ bool HWPFile::TagsRead(void) ulong tag; long size; - while (1) + while (true) { tag = Read4b(); size = Read4b(); diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 8347fd4503e2..3a751cfb93be 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -42,9 +42,9 @@ extern int getRepFamilyName(const char* , char *, double &ratio); // To be shorten source code by realking #define hconv(x) OUString(hstr2ucsstr(x).c_str()) #define ascii(x) OUString::createFromAscii(x) -#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(0) -#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(0) -#define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(0) +#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false) +#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false) +#define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(false) #define padd(x,y,z) pList->addAttribute(x,y,z) #define Double2Str(x) OUString::number((double)(x)) #define WTI(x) ((double)(x) / 1800.) // unit => inch @@ -134,7 +134,7 @@ sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(R HStream stream; Sequence < sal_Int8 > aBuffer; sal_Int32 nRead, nBlock = 32768, nTotal = 0; - while( 1 ) + while( true ) { nRead = xInputStream->readBytes(aBuffer, nBlock); if( nRead == 0 ) diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx index 4cfeff291831..95ebe7ee2ff8 100644 --- a/hwpfilter/source/lexer.cxx +++ b/hwpfilter/source/lexer.cxx @@ -1054,7 +1054,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (false) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1144,7 +1144,7 @@ YY_DECL yy_load_buffer_state(); } - while ( 1 ) /* loops until end-of-file is reached */ + while ( true ) /* loops until end-of-file is reached */ { yy_cp = yy_c_buf_p; |