starmath/source/ooxmlimport.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 9e6b086c62b4144058eb52ca40b562ff61e26a68 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Tue Mar 13 17:01:10 2012 +0100 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. diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 63b52fd..78a75ab 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()
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits