Kaydet (Commit) 0c2dc8ed authored tarafından Tor Lillqvist's avatar Tor Lillqvist

RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE has never had any effect

Change-Id: I9004ec2229cd31fb899b23c8ce59f5fd49ac03a2
üst 92aab82b
...@@ -917,8 +917,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr ...@@ -917,8 +917,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr
_eEncoding, _eEncoding,
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 | RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 )
RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE )
) )
{ {
SharedResources aResources; SharedResources aResources;
......
...@@ -1324,8 +1324,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_string_getToken( ...@@ -1324,8 +1324,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_string_getToken(
#define OUSTRING_TO_OSTRING_CVTFLAGS (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\ #define OUSTRING_TO_OSTRING_CVTFLAGS (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\ RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\ RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\
RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 |\ RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0)
RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
......
...@@ -143,7 +143,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConv ...@@ -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_NONSPACING_IGNORE ((sal_uInt32)0x0800)
#define RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE ((sal_uInt32)0x1000) #define RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE ((sal_uInt32)0x1000)
#define RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE ((sal_uInt32)0x2000) #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_FLUSH ((sal_uInt32)0x8000)
#define RTL_UNICODETOTEXT_FLAGS_GLOBAL_SIGNATURE 0x10000 #define RTL_UNICODETOTEXT_FLAGS_GLOBAL_SIGNATURE 0x10000
/* Write any global document signatures (for example, in UTF-8, a leading /* Write any global document signatures (for example, in UTF-8, a leading
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment