From f484a8949334cdb659f3a0c222052fc05a9e76e5 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Wed, 19 Dec 2012 18:45:55 +0100 Subject: Revert "fix crash for fdo#58306 when appending to OUStringBuffer initialised with """ newFromLiteral doesn't cheat, it's broken This reverts commit 8b9b779e9fc1de7186217b7be75ef02bb66e2da9. --- sal/inc/rtl/ustrbuf.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index b6ddb66a9562..98f1fc5ee911 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -183,7 +183,7 @@ public: , nCapacity( internal::ConstCharArrayDetector< T, void >::size - 1 + 16 ) { assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); - ( internal::ConstCharArrayDetector< T >::size - 1 ) ? rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 ) : rtl_uString_new_WithLength( &pData, 16 ); + rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 ); #ifdef RTL_STRING_UNITTEST rtl_string_unittest_const_literal = true; #endif -- cgit v1.2.3