diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:33:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:34 +0100 |
| commit | 7c6aa647e83b4989fcaecd4a4d81361c06a3f3d4 (patch) | |
| tree | 374f4b5c873861ec11c33ca3e144eef36dff0932 /svtools/source/svhtml | |
| parent | f79c92198775cac688774ace792b296647448781 (diff) | |
svtools: Use appropriate OUString functions on string constants
Change-Id: Ifa7ea9bf840cacb701dd4b5fb0904870bc3cf407
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/htmlsupp.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 25 |
2 files changed, 16 insertions, 17 deletions
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index 7069e4e2a07e..8c4324b6cc89 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -44,11 +44,11 @@ bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas { const HTMLOptions& aScriptOptions = GetOptions(); - rLangString = ""; + rLangString.clear(); rLang = HTML_SL_JAVASCRIPT; - rSrc = ""; - rLibrary = ""; - rModule = ""; + rSrc.clear(); + rLibrary.clear(); + rModule.clear(); for( size_t i = aScriptOptions.size(); i; ) { diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 14d5c741c57e..ce9ba50e44f1 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -830,7 +830,7 @@ int HTMLParser::_GetNextRawToken() // thus we don't have to search it again. bReadScript = false; bReadStyle = false; - aEndToken = ""; + aEndToken.clear(); bEndTokenFound = false; return 0; @@ -895,7 +895,7 @@ int HTMLParser::_GetNextRawToken() // ">" is optional for security reasons bDone = bOffState && ( bReadScript - ? aTok.equals(OOO_STRING_SVTOOLS_HTML_script) + ? aTok == OOO_STRING_SVTOOLS_HTML_script : aTok.equals(aEndToken) ); } } @@ -909,11 +909,10 @@ int HTMLParser::_GetNextRawToken() { // Style sheets can be closed by </STYLE>, </HEAD> or <BODY> if( bOffState ) - bDone = aTok.equals(OOO_STRING_SVTOOLS_HTML_style) || - aTok.equals(OOO_STRING_SVTOOLS_HTML_head); + bDone = aTok == OOO_STRING_SVTOOLS_HTML_style || + aTok == OOO_STRING_SVTOOLS_HTML_head; else - bDone = - aTok.equals(OOO_STRING_SVTOOLS_HTML_body); + bDone = aTok == OOO_STRING_SVTOOLS_HTML_body; } if( bDone ) @@ -930,7 +929,7 @@ int HTMLParser::_GetNextRawToken() // and parse the end token bReadScript = false; bReadStyle = false; - aEndToken = ""; + aEndToken.clear(); nToken = 0; } else @@ -1010,7 +1009,7 @@ int HTMLParser::_GetNextRawToken() { bReadScript = false; bReadStyle = false; - aEndToken = ""; + aEndToken.clear(); nToken = 0; } break; @@ -1042,14 +1041,14 @@ int HTMLParser::_GetNextRawToken() int HTMLParser::_GetNextToken() { int nRet = 0; - sSaveToken = ""; + sSaveToken.clear(); if (mnPendingOffToken) { // HTML_<TOKEN>_OFF generated for HTML_<TOKEN>_ON nRet = mnPendingOffToken; mnPendingOffToken = 0; - aToken = ""; + aToken.clear(); return nRet; } @@ -1189,7 +1188,7 @@ int HTMLParser::_GetNextToken() else { // TokenString not needed anymore - aToken = ""; + aToken.clear(); } // Read until closing '>' @@ -1248,7 +1247,7 @@ int HTMLParser::_GetNextToken() } if( SVPAR_PENDING == eState ) bReadNextChar = bReadNextCharSave; - aToken = ""; + aToken.clear(); } else if( '%' == nNextCh ) { @@ -1281,7 +1280,7 @@ int HTMLParser::_GetNextToken() if( IsParserWorking() ) { sSaveToken = aToken; - aToken = ""; + aToken.clear(); } } else |