summaryrefslogtreecommitdiff
path: root/tools/source
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-12-02 22:32:41 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-12-03 18:04:24 +0100
commitc94b9c48664062396e9f8a12176970f6c90c0003 (patch)
tree5ff8ecf1c54fcc0c18c3d3f2f58c5970d2937e2b /tools/source
parentd3e763d65c44d1838eeebbc5a581bcdd18040d8e (diff)
tools String support for fast operator+
Change-Id: I13f49a49f86a7097fce115d62271ad82609036f1
Diffstat (limited to 'tools/source')
-rw-r--r--tools/source/string/strucvt.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 759da6304cab..b01e3e277419 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -73,7 +73,8 @@ UniString& UniString::Assign( const rtl::OUString& rStr )
if (rStr.pData->length < STRING_MAXLEN)
{
- STRING_RELEASE((STRING_TYPE *)mpData);
+ if( mpData != NULL )
+ STRING_RELEASE((STRING_TYPE *)mpData);
mpData = reinterpret_cast< UniStringData * >(const_cast< rtl::OUString & >(rStr).pData);
STRING_ACQUIRE((STRING_TYPE *)mpData);
}