summaryrefslogtreecommitdiff
path: root/sw/source/filter/html
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/html')
-rw-r--r--sw/source/filter/html/css1atr.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/html/htmlbas.cxx3
-rw-r--r--sw/source/filter/html/htmlcss1.cxx12
-rw-r--r--sw/source/filter/html/htmlfly.cxx6
-rw-r--r--sw/source/filter/html/htmlftn.cxx6
-rw-r--r--sw/source/filter/html/htmlplug.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.cxx2
8 files changed, 18 insertions, 19 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index e9a30e75be0c..9bf099083d96 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -302,7 +302,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
// In STYLE-Optionen den String codieren
Strm() << sOut.makeStringAndClear().getStr();
if( pVal )
- HTMLOutFuncs::Out_String( Strm(), String::CreateFromAscii(pVal),
+ HTMLOutFuncs::Out_String( Strm(), rtl::OUString::createFromAscii(pVal),
eDestEnc, &aNonConvertableCharacters );
else if( pSVal )
HTMLOutFuncs::Out_String( Strm(), *pSVal, eDestEnc, &aNonConvertableCharacters );
@@ -3401,7 +3401,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
if( pTempFileName )
sGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm,
- String::CreateFromAscii("JPG"),
+ rtl::OUString("JPG"),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 389c75718e89..42816109099f 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -132,7 +132,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const String& rNm, sal_uInt16 nPoolId )
return 1 | HTML_DLCOLL_DT;
}
- String sDTDD( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_dt) );
+ String sDTDD( rtl::OUString(OOO_STRING_SVTOOLS_HTML_dt) );
sDTDD += ' ';
if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) )
// DefinitionList - term
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 9dc4cefc6954..5f09dc911e6b 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -291,8 +291,7 @@ void SwHTMLWriter::OutBasic()
const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) );
OSL_ENSURE( pModule, "Wo ist das Modul?" );
- String sLang(
- String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) );
+ rtl::OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC);
ScriptType eType = STARBASIC;
if( 0==i && 0==j )
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() );
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 9aabb328e8bd..2a9bc9425889 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1232,7 +1232,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
if( rHTMLWrt.GetOrigFileName() )
rGrfName = *rHTMLWrt.GetOrigFileName();
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName,
- String::CreateFromAscii("JPG"),
+ rtl::OUString("JPG"),
(XOUTBMP_USE_GIF_IF_SENSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE));
if( !nErr )
@@ -1569,7 +1569,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
aGrfNm = *rHTMLWrt.GetOrigFileName();
if( aGrf.GetType() == GRAPHIC_NONE ||
XOutBitmap::WriteGraphic( aGrf, aGrfNm,
- String::CreateFromAscii( "JPG" ),
+ rtl::OUString("JPG"),
(XOUTBMP_USE_GIF_IF_POSSIBLE|
XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 )
{
@@ -1628,7 +1628,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM ));
sal_uInt16 nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm,
- String::CreateFromAscii("JPG"), nFlags, &aMM100Size );
+ rtl::OUString("JPG"), nFlags, &aMM100Size );
if( nErr ) // fehlerhaft, da ist nichts auszugeben
{
rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 9b85c922c146..b3a8af03aaf6 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -504,7 +504,7 @@ sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt );
if( pStr )
{
- pParts[0] = String::CreateFromAscii( pStr );
+ pParts[0] = rtl::OUString::createFromAscii( pStr );
nParts = 1;
}
}
@@ -537,12 +537,12 @@ void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts,
{
xub_StrLen nPos = 0;
String aTmp( pParts[i] );
- String aRep( String::CreateFromAscii("\\\\") );
+ rtl::OUString aRep("\\\\");
while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( "\\",
aRep, nPos ) ) )
nPos += 2;
nPos = 0;
- aRep.AssignAscii( "\\;" );
+ aRep = rtl::OUString("\\;");
while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( ";",
aRep, nPos ) ) )
nPos += 2;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 31f00de2d0c3..2d8f4c814c90 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1275,7 +1275,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
aGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm,
- String::CreateFromAscii("JPG"),
+ rtl::OUString("JPG"),
(XOUTBMP_USE_GIF_IF_POSSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE) );
if( nErr ) // fehlerhaft, da ist nichts auszugeben
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 2966c2224f0c..fcdf0970c0af 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1141,7 +1141,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
if(pTempFileName)
rEmbGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm,
- String::CreateFromAscii( "JPG" ),
+ rtl::OUString("JPG"),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
generated by cgit (git 2.34.1) at 2024-07-14 08:08:40 +0000