diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 07:43:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 07:43:52 +0200 |
| commit | 5536aea8228778e00b9f1ca8199d858cd03780ad (patch) | |
| tree | d244654bc3c5aa4e5b3a87df5f004ef61049996c /starmath/source | |
| parent | 20f6a6b159c69771dc0e087f63b6c701908e32e2 (diff) | |
Let OUStringLiteral1 take its arg as ctor arg, not template arg
...which makes it more flexible, can now also be used on non-const arguments.
The drawback of the argument no longer being a compile-time constant is remedied
by making the ctor constexpr.
Change-Id: Ia4903a2cc86791fece92eac0cb8406b6659dd19d
Diffstat (limited to 'starmath/source')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 97eaacec6b11..577535f1fca9 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -312,25 +312,25 @@ OUString SmOoxmlImport::handleD() opening = "left lbrace "; if( closing == "}" ) closing = " right rbrace"; - if( opening == OUStringLiteral1<0x27e6>() ) + if( opening == OUStringLiteral1(0x27e6) ) opening = "left ldbracket "; - if( closing == OUStringLiteral1<0x27e7>() ) + if( closing == OUStringLiteral1(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 == OUStringLiteral1(MS_DLINE) + || opening == OUStringLiteral1(MS_DVERTLINE)) opening = "left ldline "; - if (closing == OUStringLiteral1<MS_DLINE>() - || closing == OUStringLiteral1<MS_DVERTLINE>()) + if (closing == OUStringLiteral1(MS_DLINE) + || closing == OUStringLiteral1(MS_DVERTLINE)) closing = " right rdline"; - if (opening == OUStringLiteral1<MS_LANGLE>() - || opening == OUStringLiteral1<MS_LMATHANGLE>()) + if (opening == OUStringLiteral1(MS_LANGLE) + || opening == OUStringLiteral1(MS_LMATHANGLE)) opening = "left langle "; - if (closing == OUStringLiteral1<MS_RANGLE>() - || closing == OUStringLiteral1<MS_RMATHANGLE>()) + if (closing == OUStringLiteral1(MS_RANGLE) + || closing == OUStringLiteral1(MS_RMATHANGLE)) closing = " right rangle"; // use scalable brackets (the explicit "left" or "right") if( opening == "(" || opening == "[" ) |