RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE has never had any effect

Change-Id: I9004ec2229cd31fb899b23c8ce59f5fd49ac03a2

RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE has never had any effect
Change-Id: I9004ec2229cd31fb899b23c8ce59f5fd49ac03a2
0c2dc8ed · Tor Lillqvist · 92aab82b · 0c2dc8ed · 0c2dc8ed · 0c2dc8ed
Kaydet (Commit) 0c2dc8ed authored Nis 23, 2014 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

dbtools2.cxx connectivity/source/commontools/dbtools2.cxx +1 -2

string.h include/rtl/string.h +1 -2

textcvt.h include/rtl/textcvt.h +1 -1

No files found.
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -917,8 +917,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr
            _eEncoding,
            RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
            RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
-            RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 |
-            RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE )
+            RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 )
        )
    {
        SharedResources aResources;

--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -1324,8 +1324,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_string_getToken(
 #define OUSTRING_TO_OSTRING_CVTFLAGS    (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
                                         RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\
                                         RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\
-                                         RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 |\
-                                         RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE)
+                                         RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0)

 /* ----------------------------------------------------------------------- */


--- a/include/rtl/textcvt.h
+++ b/include/rtl/textcvt.h
@@ -143,7 +143,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConv
 #define RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE           ((sal_uInt32)0x0800)
 #define RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE              ((sal_uInt32)0x1000)
 #define RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE              ((sal_uInt32)0x2000)
-#define RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE                 ((sal_uInt32)0x4000)
+#define RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE                 ((sal_uInt32)0x4000) ///< has no effect @deprecated
 #define RTL_UNICODETOTEXT_FLAGS_FLUSH                       ((sal_uInt32)0x8000)
 #define RTL_UNICODETOTEXT_FLAGS_GLOBAL_SIGNATURE 0x10000
    /* Write any global document signatures (for example, in UTF-8, a leading