diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-13 12:52:35 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-13 11:33:01 +0000 |
| commit | 91c5143087b8da37a050b4e54d8b665396bf2d13 (patch) | |
| tree | 0b21e940a2365ddd1f095a4a17c8b1324a98d557 /sw/source/filter/html/htmlfly.cxx | |
| parent | 3e55e00662b50b02c289ca4a1d94d4306bd8c86b (diff) | |
String to OUString
Change-Id: I14d6a7e4a53e65070357a2a5ceab3b25498a9fd4
Reviewed-on: https://gerrit.libreoffice.org/5933
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index dabdd9c83cd8..2abf566ddcdd 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -1510,7 +1510,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt, Graphic aGraphic( ((SwFrmFmt &)rFrmFmt).MakeGraphic( &aIMap ) ); Size aSz( 0, 0 ); OutHTML_Image( rWrt, rFrmFmt, aGraphic, rFrmFmt.GetName(), aSz, - HTML_FRMOPTS_GENIMG, pMarkToFrame, + HTML_FRMOPTS_GENIMG, "frame", aIMap.GetIMapObjectCount() ? &aIMap : 0 ); return rWrt; @@ -1535,7 +1535,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, Graphic aGraphic = pGrfNd->GetGraphic(); OutHTML_Image( rWrt, rFrmFmt, aGraphic, pGrfNd->GetTitle(), - pGrfNd->GetTwipSize(), nFrmFlags, pMarkToGraphic ); + pGrfNd->GetTwipSize(), nFrmFlags, "graphic" ); return rWrt; } @@ -1685,18 +1685,18 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) String aURL( rURL.Copy( 1 ) ); // nPos-1+1/3 (-1 wg. Erase) - String sCmp(comphelper::string::remove(aURL.Copy(bEncoded ? nPos+2 : nPos), + OUString sCmp(comphelper::string::remove(aURL.Copy(bEncoded ? nPos+2 : nPos), ' ')); - if( !sCmp.Len() ) + if( sCmp.isEmpty() ) return; - sCmp.ToLowerAscii(); + sCmp = sCmp.toAsciiLowerCase(); - if( sCmp.EqualsAscii( pMarkToRegion ) || - sCmp.EqualsAscii( pMarkToFrame ) || - sCmp.EqualsAscii( pMarkToGraphic ) || - sCmp.EqualsAscii( pMarkToOLE ) || - sCmp.EqualsAscii( pMarkToTable ) ) + if( sCmp == "region" || + sCmp == "frame" || + sCmp == "graphic" || + sCmp == "ole" || + sCmp == "table" ) { // Einfach nur in einem sortierten Array merken if( bEncoded ) @@ -1706,7 +1706,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) } aImplicitMarks.insert( aURL ); } - else if( sCmp.EqualsAscii( pMarkToOutline ) ) + else if( sCmp == "outline" ) { // Hier brauchen wir Position und Name. Deshalb sortieren wir // ein sal_uInt16 und ein String-Array selbst @@ -1730,7 +1730,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) aOutlineMarks.insert( aOutlineMarks.begin()+nIns, new String( aURL ) ); } } - else if( sCmp.EqualsAscii( pMarkToText ) ) + else if( sCmp == "text" ) { // } |