diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-15 15:00:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-15 15:01:22 +0200 |
| commit | 03f973ccefd07dbceaa4993206ee4f2f1296d321 (patch) | |
| tree | bee85f63cfa3855497487d7bf17a2f7ee95888f1 | |
| parent | a1230334d42250f7376f0a887e5303fa218234bb (diff) | |
sw: fix more clang tinderbox warnings
Change-Id: Ia72a9ca955c8209c97b2138cd442fe3e9e68f227
| -rw-r--r-- | sw/source/filter/html/htmldraw.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index af8ae2f4f25c..2f021aca0724 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -311,8 +311,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) break; case HTML_O_LOOP: - if( rOption.GetString(). - equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_LOOP_infinite) ) + if (rOption.GetString(). + equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_LOOP_infinite)) { nCount = 0; } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 51efbf9dd52e..cdbb4711cbab 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -363,9 +363,12 @@ void SwHTMLParser::InsertEmbed() aSpace.Height() = (long)rOption.GetNumber(); break; case HTML_O_UNKNOWN: - if( rOption.GetTokenString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SW_HTML_O_Hidden ) ) - bHidden = - !rOption.GetString().equalsIgnoreAsciiCaseAscii( sHTML_O_Hidden_False ); + if (rOption.GetTokenString().equalsIgnoreAsciiCase( + OOO_STRING_SW_HTML_O_Hidden)) + { + bHidden = !rOption.GetString().equalsIgnoreAsciiCase( + sHTML_O_Hidden_False); + } break; } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index ad700b250976..cae27824c45e 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -4876,8 +4876,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) const HTMLOption& rOption = rHTMLOptions[--i]; if( HTML_O_ALIGN == rOption.GetToken() ) { - if( rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_VA_bottom)) + if (rOption.GetString().equalsIgnoreAsciiCase( + OOO_STRING_SVTOOLS_HTML_VA_bottom)) + { bTop = sal_False; + } } } @@ -5142,9 +5145,12 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, break; case HTML_O_BORDER: // BORDER und BORDER=BORDER wie BORDER=1 behandeln - if( !rOption.GetString().isEmpty() && - !rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_O_border) ) + if (!rOption.GetString().isEmpty() && + !rOption.GetString().equalsIgnoreAsciiCase( + OOO_STRING_SVTOOLS_HTML_O_border)) + { nBorder = (sal_uInt16)rOption.GetNumber(); + } else nBorder = 1; |