diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-13 17:01:10 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-13 17:08:59 +0100 |
| commit | 9e6b086c62b4144058eb52ca40b562ff61e26a68 (patch) | |
| tree | 57b7e336d3e8fdb9a2bee73042519763127142f9 /starmath | |
| parent | badbf0c9259a6ff3928958332532c5a9ed8c5774 (diff) | |
string literals in ?: don't get automatically converted to OUString
Technically these two are both const char[8], so gcc/clang keep
the resulting type the same, but msvc always converts to const char*,
even if the same sizes mean this is not required.
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 63b52fd218d7..78a75ab0fd87 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -438,7 +438,9 @@ OUString SmOoxmlImport::handleLimLowUpp( LimLowUpp_t limlowupp ) return e.copy( 0, e.getLength() - 2 ) + lim + "}"; if( limlowupp == LimLow && e.endsWith( " underbrace { }" )) return e.copy( 0, e.getLength() - 2 ) + lim + "}"; - return e + ( limlowupp == LimLow ? " csub {" : " csup {" ) + lim + "}"; + return e + + ( limlowupp == LimLow ? OUString( " csub {" ) : OUString( " csup {" )) + + lim + "}"; } OUString SmOoxmlImport::handleGroupChr() |