mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stringconstant: adapt to improved OUStringLiteral1 (starmath)

Browse Source 
Change-Id: Ic0a3a2ae6c0e2601cb415cba971620a71ded02a5
This commit is contained in:
Stephan Bergmann
2016-08-30 15:29:20 +02:00
parent a86df4bbe0
commit f5a99c3748
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
starmath/source/mathtype.cxx
View File

@@ -110,56 +110,56 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " rightarrow "; pC = " rightarrow ";
else else
{ {
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
} }
break; break;
case 0x00fb: case 0x00fb:
if ((nVersion < 3) && (nTypeFace == 0x81)) if ((nVersion < 3) && (nTypeFace == 0x81))
nChar = 0xDF; nChar = 0xDF;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'a': case 'a':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3b1; nChar = 0x3b1;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'b': case 'b':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3b2; nChar = 0x3b2;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'l': case 'l':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3bb; nChar = 0x3bb;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'n': case 'n':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3bd; nChar = 0x3bd;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'r': case 'r':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3c1; nChar = 0x3c1;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 'D': case 'D':
if ((nVersion < 3) && (nTypeFace == 0x84)) if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x394; nChar = 0x394;
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 0xa9: case 0xa9:
if ((nVersion < 3) && (nTypeFace == 0x82)) if ((nVersion < 3) && (nTypeFace == 0x82))
nChar = '\''; nChar = '\'';
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
case 0x00f1: case 0x00f1:
@@ -167,7 +167,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " \\rangle "; pC = " \\rangle ";
else else
{ {
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
} }
break; break;
@@ -176,7 +176,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " <= "; pC = " <= ";
else else
{ {
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
} }
break; break;
@@ -185,7 +185,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " drarrow "; pC = " drarrow ";
else else
{ {
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
} }
break; break;
@@ -194,7 +194,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " %OMEGA "; pC = " %OMEGA ";
else else
{ {
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
} }
break; break;
@@ -442,7 +442,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
break; break;
case 0x22b2: case 0x22b2:
case 0x22b3: case 0x22b3:
rRet += " " + OUString( nChar ) + " "; rRet += " " + OUStringLiteral1( nChar ) + " ";
break; break;
case 0x22a5: case 0x22a5:
pC = " ortho "; pC = " ortho ";
@@ -513,7 +513,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
pC = " %OMEGA "; pC = " %OMEGA ";
break; break;
default: default:
rRet += OUString( nChar ); rRet += OUStringLiteral1( nChar );
bRet=true; bRet=true;
break; break;
} }

2
starmath/source/node.cxx
View File

@@ -2602,7 +2602,7 @@ void SmAttributNode::CreateTextFromNode(OUString &rText)
rText += "bar "; rText += "bar ";
break; break;
default: default:
rText += OUString( nLast ); rText += OUStringLiteral1( nLast );
break; break;
} }
} }

4
starmath/source/ooxmlimport.cxx
View File

@@ -462,9 +462,9 @@ OUString SmOoxmlImport::handleGroupChr()
if( pos == bot && chr == sal_Unicode( 0x23df )) if( pos == bot && chr == sal_Unicode( 0x23df ))
return "{" + e + "} underbrace { }"; return "{" + e + "} underbrace { }";
if( pos == top ) if( pos == top )
return "{" + e + "} csup {" + OUString( chr ) + "}"; return "{" + e + "} csup {" + OUStringLiteral1( chr ) + "}";
else else
return "{" + e + "} csub {" + OUString( chr ) + "}"; return "{" + e + "} csub {" + OUStringLiteral1( chr ) + "}";
} }
OUString SmOoxmlImport::handleM() OUString SmOoxmlImport::handleM()