Kaydet (Commit) c4745302 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

There is no <Arg> tag in xcu localizable strings

So no reason to work with it.
So can use helper function after
make it to handle single quote.

Change-Id: Ic2eb901148c3ae31316607b41350bbad79a639db
üst d7a30147
......@@ -84,61 +84,6 @@ void workOnTokenSet(int nTyp, char * pTokenText) {
}
namespace
{
static OString lcl_QuoteHTML( const OString& rString )
{
rtl::OStringBuffer sReturn;
for ( sal_Int32 i = 0; i < rString.getLength(); i++ ) {
rtl::OString sTemp = rString.copy( i );
if ( sTemp.match( "<Arg n=" ) ) {
while ( i < rString.getLength() && rString[i] != '>' ) {
sReturn.append(rString[i]);
i++;
}
if ( rString[i] == '>' ) {
sReturn.append('>');
i++;
}
}
if ( i < rString.getLength()) {
switch ( rString[i]) {
case '<':
sReturn.append("&lt;");
break;
case '>':
sReturn.append("&gt;");
break;
case '\"':
sReturn.append("&quot;");
break;
case '\'':
sReturn.append("&apos;");
break;
case '&':
if ((( i + 4 ) < rString.getLength()) &&
( rString.copy( i, 5 ) == "&amp;" ))
sReturn.append(rString[i]);
else
sReturn.append("&amp;");
break;
default:
sReturn.append(rString[i]);
break;
}
}
}
return sReturn.makeStringAndClear();
}
} // anonymous namespace
//
// class CfgStackData
//
......@@ -558,7 +503,7 @@ void CfgMerge::WorkOnText(rtl::OString &rText, const rtl::OString& rLangIndex)
if ( !rLangIndex.equalsIgnoreAsciiCase("en-US") &&
( sContent != "-" ) && !sContent.isEmpty())
{
rText = lcl_QuoteHTML( rText );
rText = helper::QuotHTML( rText );
}
}
}
......@@ -590,7 +535,7 @@ void CfgMerge::WorkOnResourceEnd()
( sContent != "-" ) && !sContent.isEmpty())
{
rtl::OString sText = lcl_QuoteHTML( sContent);
rtl::OString sText = helper::QuotHTML( sContent);
rtl::OString sAdditionalLine( "\t" );
......
......@@ -27,6 +27,9 @@ OString QuotHTML(const OString &rString)
case '"':
sReturn.append("&quot;");
break;
case '\'':
sReturn.append("&apos;");
break;
case '&':
if (rString.match("&amp;", i))
sReturn.append('&');
......
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