Kaydet (Commit) e99fafa6 authored tarafından Matteo Casalin's avatar Matteo Casalin

Reduce OString operations

Change-Id: I13291ca27574d3536e55d8207a0b13b2694385be
Reviewed-on: https://gerrit.libreoffice.org/69233
Tested-by: Jenkins
Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst dfb2feca
......@@ -259,10 +259,7 @@ void CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
}
else
{
OString sError( "Misplaced close tag: " );
sError += sToken;
sError += " in file ";
sError += global::inputPathname;
const OString sError{ "Misplaced close tag: " + sToken + " in file " + global::inputPathname };
yyerror(sError.getStr());
std::exit(EXIT_FAILURE);
}
......@@ -470,34 +467,16 @@ void CfgMerge::WorkOnResourceEnd()
if (
( !sCur.equalsIgnoreAsciiCase("en-US") ) && !sContent.isEmpty())
{
OString sText = helper::QuotHTML( sContent);
OString sAdditionalLine( "\t" );
OString sTextTag = pStackData->sTextTag;
OString sTemp = sTextTag.copy( sTextTag.indexOf( "xml:lang=" ));
sal_Int32 n = 0;
OString sSearch = sTemp.getToken(0, '"', n);
sSearch += "\"";
sSearch += sTemp.getToken(0, '"', n);
sSearch += "\"";
OString sReplace = sTemp.getToken(0, '"');
sReplace += "\"";
sReplace += sCur;
sReplace += "\"";
sTextTag = sTextTag.replaceFirst(sSearch, sReplace);
sAdditionalLine += sTextTag;
sAdditionalLine += sText;
sAdditionalLine += pStackData->sEndTextTag;
sAdditionalLine += "\n";
sAdditionalLine += sLastWhitespace;
const sal_Int32 nLangAttributeStart{ sTextTag.indexOf( "xml:lang=" ) };
const sal_Int32 nLangStart{ sTextTag.indexOf( '"', nLangAttributeStart )+1 };
const sal_Int32 nLangEnd{ sTextTag.indexOf( '"', nLangStart ) };
OString sAdditionalLine{ "\t"
+ sTextTag.replaceAt(nLangStart, nLangEnd-nLangStart, sCur)
+ helper::QuotHTML(sContent)
+ pStackData->sEndTextTag
+ "\n"
+ sLastWhitespace };
Output( sAdditionalLine );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment