summaryrefslogtreecommitdiffstats
path: root/sal/rtl/source/string.c
diff options
context:
space:
mode:
Diffstat (limited to 'sal/rtl/source/string.c')
-rw-r--r--sal/rtl/source/string.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sal/rtl/source/string.c b/sal/rtl/source/string.c
index c0f9a33c218b..2ee79611218a 100644
--- a/sal/rtl/source/string.c
+++ b/sal/rtl/source/string.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,7 +179,7 @@ sal_Bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget,
OSL_ASSERT(pTarget != NULL
&& (pSource != NULL || nLength == 0)
&& nLength >= 0
- && rtl_isOctetTextEncoding(nEncoding));
+ && (nLength == 0 || rtl_isOctetTextEncoding(nEncoding)));
if ( !nLength )
rtl_string_new( pTarget );
@@ -318,3 +319,5 @@ sal_Bool SAL_CALL rtl_convertUStringToString(rtl_String ** pTarget,
return rtl_impl_convertUStringToString(pTarget, pSource, nLength, nEncoding,
nFlags, sal_True);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */