nlsupport.c -> nlsupport.cxx

Change-Id: Ida0c3c0c521f71fd3f18a12c02cf98ac96c5b7a6

jurt/source/pipe/staticsalhack_c.c

@@ -9,7 +9,6 @@
 
 #include <staticsalhack.h>
 
-#include <sal/osl/unx/nlsupport.c>
 #include <sal/osl/unx/pipe.c>
 #include <sal/osl/unx/readwrite_helper.c>
 

jurt/source/pipe/staticsalhack_cxx.cxx

@@ -29,6 +29,7 @@
 #include <sal/osl/unx/memory.cxx>
 #include <sal/osl/unx/module.cxx>
 #include <sal/osl/unx/mutex.cxx>
+#include <sal/osl/unx/nlsupport.cxx>
 #include <sal/osl/unx/process.cxx>
 #include <sal/osl/unx/process_impl.cxx>
 #include <sal/osl/unx/profile.cxx>

sal/Library_sal.mk

@@ -162,6 +162,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/memory \
 	sal/osl/unx/module \
 	sal/osl/unx/mutex \
+	sal/osl/unx/nlsupport \
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
 	sal/osl/unx/profile \
@@ -171,7 +172,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
         $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
-	sal/osl/unx/nlsupport \
 	sal/osl/unx/pipe \
 	sal/osl/unx/readwrite_helper \
 	sal/osl/unx/socket \

sal/osl/unx/nlsupport.c → sal/osl/unx/nlsupport.cxx

@@ -106,7 +106,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
                 pLocale->Language->buffer, pLocale->Language->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
 
-            if( SAL_INT_CAST(sal_uInt32, pLanguage->length) < n )
+            if( sal::static_int_cast<sal_uInt32>(pLanguage->length) < n )
             {
                 strcpy( buffer, pLanguage->buffer );
                 offset = pLanguage->length;
@@ -136,7 +136,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
 
         /* convert variant to ascii - check if there is enough space for the variant string */
         if( pLocale->Variant && pLocale->Variant->length &&
-            ( SAL_INT_CAST(sal_uInt32, pLocale->Variant->length) < n - 6 ) )
+            ( sal::static_int_cast<sal_uInt32>(pLocale->Variant->length) < n - 6 ) )
         {
             rtl_String *pVariant = NULL;