diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 09:50:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 13:17:27 +0100 |
| commit | 5089bdb234a93bcb62b597c18b8ab66048246b13 (patch) | |
| tree | 0983967d89d9662b8484c88d2590cfdd7362fa43 /sw/source/filter/html/htmlcss1.cxx | |
| parent | 0ba03a38f022ca8d3705ae1370bb1d739e1e973f (diff) | |
Related: fdo#38838 remove UniString::EqualsAscii
Change-Id: I55c85c1c44452c7fb6ac40591aea7177d054affe
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 0254957df955..915887f7833f 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1692,7 +1692,7 @@ _HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich ) void SwHTMLParser::NewStyle() { - String sType; + OUString sType; const HTMLOptions& rOptions2 = GetOptions(); for (size_t i = rOptions2.size(); i; ) @@ -1702,8 +1702,8 @@ void SwHTMLParser::NewStyle() sType = rOption.GetString(); } - bIgnoreRawData = sType.Len() && - !sType.GetToken(0,';').EqualsAscii(sCSS_mimetype); + bIgnoreRawData = !sType.getLength() && + !sType.getToken(0,';').equalsAscii(sCSS_mimetype); } void SwHTMLParser::EndStyle() @@ -1778,8 +1778,7 @@ void SwHTMLParser::InsertLink() } else { - OUString sRel; - String sHRef, sType; + OUString sRel, sHRef, sType; const HTMLOptions& rOptions2 = GetOptions(); for (size_t i = rOptions2.size(); i; ) @@ -1799,9 +1798,9 @@ void SwHTMLParser::InsertLink() } } - if( sHRef.Len() && sRel.equalsIgnoreAsciiCase( "STYLESHEET" ) && - ( !sType.Len() || - sType.GetToken(0,';').EqualsAscii(sCSS_mimetype) ) ) + if( !sHRef.isEmpty() && sRel.equalsIgnoreAsciiCase( "STYLESHEET" ) && + ( sType.isEmpty() || + sType.getToken(0,';').equalsAscii(sCSS_mimetype) ) ) { if( GetMedium() ) { |