diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-16 15:06:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 07:28:49 +0200 |
commit | 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch) | |
tree | d3ec594b343f56c76056418d835d3bc7b696a9ab /starmath/source | |
parent | f51cd77bcecc5134e0e04c398bfb7b34eb65d68d (diff) |
Rename OUStringLiteral1 to OUStringChar
It started out as a wrapper around character literals, but has by now become a
wrapper around arbitrary single characters. Besides updating the documentation,
this change is a mechanical
for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done
Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f
Reviewed-on: https://gerrit.libreoffice.org/80892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath/source')
-rw-r--r-- | starmath/source/mathtype.cxx | 34 | ||||
-rw-r--r-- | starmath/source/node.cxx | 2 | ||||
-rw-r--r-- | starmath/source/ooxmlimport.cxx | 24 |
3 files changed, 30 insertions, 30 deletions
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index da48da787fa5..8d785dde61c8 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -115,56 +115,56 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " rightarrow "; else { - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; } break; case 0x00fb: if ((nVersion < 3) && (nTypeFace == 0x81)) nChar = 0xDF; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'a': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x3b1; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'b': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x3b2; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'l': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x3bb; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'n': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x3bd; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'r': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x3c1; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 'D': if ((nVersion < 3) && (nTypeFace == 0x84)) nChar = 0x394; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 0xa9: if ((nVersion < 3) && (nTypeFace == 0x82)) nChar = '\''; - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; case 0x00f1: @@ -172,7 +172,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " \\rangle "; else { - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; } break; @@ -181,7 +181,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " <= "; else { - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; } break; @@ -190,7 +190,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " drarrow "; else { - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; } break; @@ -199,7 +199,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " %OMEGA "; else { - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; } break; @@ -313,10 +313,10 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers break; case 0x2208: // in case 0x2209: // notin - rRet.append(" func ").append(OUStringLiteral1(nChar)).append(" "); + rRet.append(" func ").append(OUStringChar(nChar)).append(" "); break; case 0x220d: // owns - rRet.append(" func ").append(OUStringLiteral1(0x220b)).append(" "); + rRet.append(" func ").append(OUStringChar(0x220b)).append(" "); break; case 0x220f: pC = " prod "; @@ -429,7 +429,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers case 0x2289: // nsupseteq case 0x22b2: // NORMAL SUBGROUP OF case 0x22b3: // CONTAINS AS NORMAL SUBGROUP - rRet.append(" func ").append(OUStringLiteral1(nChar)).append(" "); + rRet.append(" func ").append(OUStringChar(nChar)).append(" "); break; case 0x22a5: pC = " ortho "; @@ -500,7 +500,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers pC = " %OMEGA "; break; default: - rRet.append(OUStringLiteral1(nChar)); + rRet.append(OUStringChar(nChar)); bRet=true; break; } diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index ca5dd1a24a4e..f8f00cd8a949 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2550,7 +2550,7 @@ void SmAttributNode::CreateTextFromNode(OUStringBuffer &rText) rText.append("bar "); break; default: - rText.append(OUStringLiteral1(nLast)); + rText.append(OUStringChar(nLast)); break; } } diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 912136e69aa8..4150dcba0209 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -317,25 +317,25 @@ OUString SmOoxmlImport::handleD() opening = "left lbrace "; if( closing == "}" ) closing = " right rbrace"; - if( opening == OUStringLiteral1(0x27e6) ) + if( opening == OUStringChar(0x27e6) ) opening = "left ldbracket "; - if( closing == OUStringLiteral1(0x27e7) ) + if( closing == OUStringChar(0x27e7) ) closing = " right rdbracket"; if( opening == "|" ) opening = "left lline "; if( closing == "|" ) closing = " right rline"; - if (opening == OUStringLiteral1(MS_DLINE) - || opening == OUStringLiteral1(MS_DVERTLINE)) + if (opening == OUStringChar(MS_DLINE) + || opening == OUStringChar(MS_DVERTLINE)) opening = "left ldline "; - if (closing == OUStringLiteral1(MS_DLINE) - || closing == OUStringLiteral1(MS_DVERTLINE)) + if (closing == OUStringChar(MS_DLINE) + || closing == OUStringChar(MS_DVERTLINE)) closing = " right rdline"; - if (opening == OUStringLiteral1(MS_LANGLE) - || opening == OUStringLiteral1(MS_LMATHANGLE)) + if (opening == OUStringChar(MS_LANGLE) + || opening == OUStringChar(MS_LMATHANGLE)) opening = "left langle "; - if (closing == OUStringLiteral1(MS_RANGLE) - || closing == OUStringLiteral1(MS_RMATHANGLE)) + if (closing == OUStringChar(MS_RANGLE) + || closing == OUStringChar(MS_RMATHANGLE)) closing = " right rangle"; // use scalable brackets (the explicit "left" or "right") if( opening == "(" || opening == "[" ) @@ -467,9 +467,9 @@ OUString SmOoxmlImport::handleGroupChr() if( pos == bot && chr == u'\x23df') return "{" + e + "} underbrace { }"; if( pos == top ) - return "{" + e + "} csup {" + OUStringLiteral1( chr ) + "}"; + return "{" + e + "} csup {" + OUStringChar( chr ) + "}"; else - return "{" + e + "} csub {" + OUStringLiteral1( chr ) + "}"; + return "{" + e + "} csub {" + OUStringChar( chr ) + "}"; } OUString SmOoxmlImport::handleM() |