summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx14
-rw-r--r--sw/source/filter/rtf/rtffld.cxx6
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww1/fltshell.cxx2
-rw-r--r--sw/source/filter/ww1/w1filter.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx18
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
14 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index d7beadca3c16..c8c504c2373c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1799,7 +1799,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
else if( pTemplate )
pRefPageDesc = pTemplate->GetPageDescFromPool( nRefPoolId, false );
- String aSelector( '@' );
+ String aSelector = rtl::OUString('@');
aSelector.AppendAscii( sCSS1_page );
if( bPseudo )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1fdf4cd2ea77..05d5adb88380 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1439,11 +1439,11 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_NONBREAKSPACE:
- pDoc->InsertString( *pPam, CHAR_HARDBLANK );
+ pDoc->InsertString( *pPam, rtl::OUString(CHAR_HARDBLANK) );
break;
case HTML_SOFTHYPH:
- pDoc->InsertString( *pPam, CHAR_SOFTHYPHEN );
+ pDoc->InsertString( *pPam, rtl::OUString(CHAR_SOFTHYPHEN) );
break;
case HTML_LINEFEEDCHAR:
@@ -1965,9 +1965,9 @@ void SwHTMLParser::NextToken( int nToken )
}
else
{
- String aComment( '<' );
- (aComment += aToken) += '>';
- InsertComment( aComment );
+ rtl::OUStringBuffer aComment;
+ aComment.append('<').append(aToken).append('>');
+ InsertComment( aComment.makeStringAndClear() );
}
}
break;
@@ -4934,7 +4934,7 @@ void SwHTMLParser::InsertSpacer()
else
{
NewAttr( &aAttrTab.pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING ) );
- String aTmp( ' ' );
+ rtl::OUString aTmp( ' ' );
pDoc->InsertString( *pPam, aTmp );
EndAttr( aAttrTab.pKerning );
}
@@ -5138,7 +5138,7 @@ void SwHTMLParser::InsertLineBreak()
{
// wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird
// ein Zeilenumbruch eingef?gt
- String sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
+ rtl::OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
pDoc->InsertString( *pPam, sTmp );
}
else if( pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index b7888b0b7046..fb96136cb575 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -581,10 +581,10 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
case 0:
if( !bCharIns )
{
- sal_Unicode nChar = (sal_Unicode)sParam.ToInt32();
- if( nChar )
+ sal_Unicode cChar = (sal_Unicode)sParam.ToInt32();
+ if( cChar )
{
- pDoc->InsertString( *pPam, nChar );
+ pDoc->InsertString( *pPam, rtl::OUString(cChar) );
bCharIns = sal_True;
}
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 81a7dd2a98c5..031a63e30583 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -3565,7 +3565,7 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
{
pPam->GetPoint()->nContent--;
nPos--;
- aFtnNote.SetNumStr( pTxtNd->GetTxt().GetChar( nPos ) );
+ aFtnNote.SetNumStr(rtl::OUString(pTxtNd->GetTxt().GetChar(nPos)));
((String&)pTxtNd->GetTxt()).SetChar( nPos, CH_TXTATR_INWORD );
bDelFirstChar = sal_True;
}
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index b4d2e3fdc2a8..23ffe9a5a9ae 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1074,7 +1074,7 @@ String SwFltShell::QuoteStr( const String& rIn )
SwFltShell& SwFltShell::operator << ( const sal_Unicode c )
{
OSL_ENSURE( eSubMode != Style, "char insert while in style-mode");
- GetDoc().InsertString( *pPaM, c );
+ GetDoc().InsertString( *pPaM, rtl::OUString(c) );
return *this;
}
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 0a46f88ec661..b62e7845e669 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -844,7 +844,7 @@ oncemore:
aStr.Erase(0, 1);
if( !aFName.Len() )
break;
- aFName.SearchAndReplaceAscii( "\\\\", String( '\\' ));
+ aFName.SearchAndReplaceAscii( "\\\\", rtl::OUString('\\') );
aFName = URIHelper::SmartRel2Abs(
INetURLObject(rOut.GetBaseURL()), aFName );
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 0f733416bdf9..118ef9acf0c0 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -634,7 +634,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
const Font& rFont = rFmt.GetBulletFont()
? *rFmt.GetBulletFont()
: numfunc::GetDefBulletFont();
- String sNumStr = rFmt.GetBulletChar();
+ String sNumStr = rtl::OUString(rFmt.GetBulletChar());
rtl_TextEncoding eChrSet = rFont.GetCharSet();
String sFontName = rFont.GetName();
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 041f7184330c..3b4de1e1d61f 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -253,7 +253,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
bool bIsNotDuplicate = aRes.second; //.second is false when element already existed
nPictureId = aRes.first->second;
Set_UInt32(pDataAdr, nPictureId);
- String sStorageName( '_' );
+ String sStorageName = rtl::OUString('_');
sStorageName += String::CreateFromInt32( nPictureId );
SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 78ff6bef1c0c..f00e78470cf6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2227,7 +2227,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if( rStyles.Len() )
{
xub_StrLen nPos = 0;
- String sLvl( ',' );
+ String sLvl = rtl::OUString(',');
sLvl += String::CreateFromInt32( n + 1 );
do {
String sStyle( rStyles.GetToken( 0,
@@ -2685,7 +2685,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
case DI_CUSTOM:
eFld = ww::eDOCPROPERTY;
{
- static String sQuotes('\"');
+ rtl::OUString sQuotes('\"');
const SwDocInfoField * pDocInfoField =
dynamic_cast<const SwDocInfoField *> (pFld);
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1c350b22490f..a85e4985fb45 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -945,11 +945,11 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS
InsertAttrsAsDrawingAttrs(nStartCp, nEndCp, eType);
//Annotations typically begin with a (useless) 0x5
- if ((eType == MAN_AND) && mpDrawEditEngine->GetTextLen())
- {
- ESelection aFirstChar(0, 0, 0, 1);
- if (mpDrawEditEngine->GetText( aFirstChar ) == String(sal_Unicode(0x5)))
- mpDrawEditEngine->QuickDelete(aFirstChar);
+ if ((eType == MAN_AND) && mpDrawEditEngine->GetTextLen())
+ {
+ ESelection aFirstChar(0, 0, 0, 1);
+ if (comphelper::string::equals(mpDrawEditEngine->GetText( aFirstChar ), 0x5))
+ mpDrawEditEngine->QuickDelete(aFirstChar);
}
EditTextObject* pTemporaryText = mpDrawEditEngine->CreateTextObject();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d804eeeb7760..f813a10e0526 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2934,7 +2934,7 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd,
{
for(sal_uInt16 nCh = 0; nCh < nEnd - rPos; ++nCh)
{
- rDoc.InsertString( *pPaM, cSymbol );
+ rDoc.InsertString( *pPaM, rtl::OUString(cSymbol) );
}
pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT );
}
@@ -3075,13 +3075,13 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bRet = HandlePageBreakChar();
break;
case 0x1e: // Non-breaking hyphen
- rDoc.InsertString( *pPaM, CHAR_HARDHYPHEN );
+ rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDHYPHEN) );
break;
case 0x1f: // Non-required hyphens
- rDoc.InsertString( *pPaM, CHAR_SOFTHYPHEN );
+ rDoc.InsertString( *pPaM, rtl::OUString(CHAR_SOFTHYPHEN) );
break;
case 0xa0: // Non-breaking spaces
- rDoc.InsertString( *pPaM, CHAR_HARDBLANK );
+ rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDBLANK) );
break;
case 0x1:
/*
@@ -3567,7 +3567,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
m_aExtraneousParas(rD),
maInsertedTables(rD),
maSectionNameGenerator(rD, rtl::OUString("WW")),
- maGrfNameGenerator(bNewDoc,String('G')),
+ maGrfNameGenerator(bNewDoc, rtl::OUString('G')),
maParaStyleMapper(rD),
maCharStyleMapper(rD),
maTxtNodesHavingFirstLineOfstSet(), // #i103711#
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 5e7f1aca5520..4a68b7bc5058 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -351,7 +351,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
long nX=0, nY=0; // nX, nY is graphic size
bool bOleOk = true;
- String aSrcStgName = '_';
+ String aSrcStgName = rtl::OUString('_');
// ergibt Name "_4711"
aSrcStgName += String::CreateFromInt32( nObjLocFc );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 1377713a4382..bffc2409c1a4 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -432,8 +432,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
void SwWW8ImplReader::ConvertFFileName( String& rName, const String& rOrg )
{
rName = rOrg;
- rName.SearchAndReplaceAllAscii( "\\\\", String( '\\' ));
- rName.SearchAndReplaceAllAscii( "%20", String( ' ' ));
+ rName.SearchAndReplaceAllAscii( "\\\\", rtl::OUString( '\\' ));
+ rName.SearchAndReplaceAllAscii( "%20", rtl::OUString( ' ' ));
// ggfs. anhaengende Anfuehrungszeichen entfernen
if( rName.Len() && '"' == rName.GetChar( rName.Len()-1 ))
@@ -762,7 +762,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
if ( maFieldStack.back().mnObjLocFc > 0 )
{
// Store the OLE object as an internal link
- String sOleId = '_';
+ String sOleId = rtl::OUString('_');
sOleId += String::CreateFromInt32( maFieldStack.back().mnObjLocFc );
SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
@@ -2002,7 +2002,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
NewAttr(aSz);
}
- rDoc.InsertString(*pPaM, cChar);
+ rDoc.InsertString(*pPaM, rtl::OUString(cChar));
if (nSize > 0)
pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONTSIZE);
@@ -2265,7 +2265,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String& rStr)
aVText += aReadParam.GetResult();
if (bNewVText)
{
- bBracket = aVText.EqualsIgnoreCaseAscii('[', 1, 0)
+ bBracket = aVText.EqualsIgnoreCaseAscii(rtl::OUString('['), 1, 0)
? true : false;
bNewVText = false;
}
@@ -2542,7 +2542,7 @@ void SwWW8ImplReader::Read_SubF_Combined( _ReadFieldParams& rReadParam)
{
String sCombinedCharacters;
if ((-2 == rReadParam.SkipToNextToken()) &&
- rReadParam.GetResult().EqualsIgnoreCaseAscii('(', 1, 0))
+ rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('('), 1, 0))
{
for (int i=0;i<2;i++)
{
@@ -2552,8 +2552,8 @@ void SwWW8ImplReader::Read_SubF_Combined( _ReadFieldParams& rReadParam)
if (-2 != rReadParam.SkipToNextToken())
break;
String sF = rReadParam.GetResult();
- if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii('p', 1, 0))
- || (('d' == cChar) && sF.EqualsIgnoreCaseAscii('o', 1, 0)))
+ if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0))
+ || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('o'), 1, 0)))
{
if (-2 == rReadParam.SkipToNextToken())
{
@@ -2623,7 +2623,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( _ReadFieldParams& rReadParam)
if ('u' == nRet)
{
if (-2 == rReadParam.SkipToNextToken() &&
- (rReadParam.GetResult().EqualsIgnoreCaseAscii('p', 1, 0)))
+ (rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0)))
{
if (-2 == rReadParam.SkipToNextToken())
{
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 7ab5756ac084..60fdf2a70907 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1156,7 +1156,7 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
if (sPrefixStr.Len() == 0)
{
- sPrefixStr = String('_');
+ sPrefixStr = rtl::OUString('_');
}
// increase count until we find a name that is not yet taken
generated by cgit (git 2.34.1) at 2024-07-15 17:28:28 +0000