diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-02 16:02:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-03 21:24:35 +0100 |
commit | bccf34c19ae022b67565e212fa4ec0d5213947de (patch) | |
tree | 73c2d2e29ad8d15999cbfb2ff554efa1e502a35e /sw/source/filter/html/htmlcss1.cxx | |
parent | 285289275d1cf1769080a208b55be984cd269e1e (diff) |
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 5abd02894e0a..36dfe97d31f4 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -234,7 +234,7 @@ void SwCSS1Parser::SetLinkCharFmts() OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" ); SvxCSS1MapEntry *pStyleEntry = - GetTag( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); + GetTag( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); SwCharFmt *pUnvisited = 0, *pVisited = 0; if( pStyleEntry ) { @@ -250,7 +250,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyVLinkSet |= bColorSet; } - String sTmp( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); + String sTmp( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); sTmp.Append( ':' ); sTmp.AppendAscii( sCSS1_link ); pStyleEntry = GetTag( sTmp ); @@ -1204,7 +1204,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c } else { - String sCName( String::CreateFromAscii(sName) ); + String sCName( rtl::OUString::createFromAscii(sName) ); pCFmt = pDoc->FindCharFmtByName( sCName ); if( !pCFmt ) { @@ -1886,7 +1886,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_first), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_first), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1894,7 +1894,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetFirstPageDesc = sal_True; } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_right), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_right), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1902,7 +1902,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetRightPageDesc = sal_True; } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_left), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_left), sal_True ); if( pPageEntry ) SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); |