[Libreoffice-commits] core.git: connectivity/source include/rtl

[Tor Lillqvist]

 connectivity/source/commontools/dbtools2.cxx |    3 +--
 include/rtl/string.h                         |    3 +--
 include/rtl/textcvt.h                        |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 0c2dc8ed105413fb45d4744697cfb57f9bd9e4b0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 23 11:22:54 2014 +0300

    RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE has never had any effect
    
    Change-Id: I9004ec2229cd31fb899b23c8ce59f5fd49ac03a2

diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 187812f..318f572 100644
--- 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;
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 32344bf..ef41bd2 100644
--- 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)
 
 /* ----------------------------------------------------------------------- */
 
diff --git a/include/rtl/textcvt.h b/include/rtl/textcvt.h
index 61f4e15..72a69a4 100644
--- 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