Finally switch MSVC to sal_Unicode = char16_t, too

There is lots of (Windows-only) code that relied on sal_Unicode being the same
as wchar_t, and the best change may be different in each case (and doing the
changes may be somewhat error prone).  So for now add SAL_U/SAL_W scaffolding
functions to sal/types.h, remove their uses one by one again, and finally drop
those functions again.

Change-Id: I2cc791bd941d089901abb5f6fc2f05fbc49e65ea
Reviewed-on: https://gerrit.libreoffice.org/36077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index 23cca54d9557..550b99a9d696 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -471,7 +471,7 @@ SAL_IMPLEMENT_MAIN()
         // setup assembly info: xxx todo set more? e.g. avoid strong versioning
         AssemblyName ^ assembly_name = gcnew AssemblyName();
         assembly_name->CodeBase = output_dir;
-        assembly_name->Name = gcnew ::System::String(name.getStr());
+        assembly_name->Name = gcnew ::System::String(SAL_W(name.getStr()));
         if (kp != nullptr)
             assembly_name->KeyPair= kp;
 
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index 5aeeabe05504..ee36c6831d19 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -82,7 +82,7 @@ ref struct Constants
 
 inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
-    return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
+    return gcnew ::System::String( SAL_W(ustr.getStr()), 0, ustr.getLength() );
 }
 
 
@@ -90,7 +90,7 @@ inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<const wchar_t> chars = PtrToStringChars( str );
-    return OUString( chars, str->Length );
+    return OUString( SAL_U(chars), str->Length );
 }
 
 /* If the argument type is a typedef for an interface then the interface
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index 1be1b3a082b3..5ef576862196 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -35,14 +35,14 @@ namespace util
 
 inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
-    return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
+    return gcnew ::System::String( SAL_W(ustr.getStr()), 0, ustr.getLength() );
 }
 
 inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<wchar_t const> chars = PtrToStringChars( str );
-    return OUString( chars, str->Length );
+    return OUString( SAL_U(chars), str->Length );
 }
 
 template< typename T >
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index c325fc762bb0..24b3753ef61d 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -718,7 +718,7 @@ OUString mapCliString(System::String ^ data)
     {
         OSL_ASSERT(sizeof(wchar_t) == sizeof(sal_Unicode));
         pin_ptr<wchar_t const> pdata= PtrToStringChars(data);
-        return OUString(pdata, const_cast<System::String^>(data)->Length);
+        return OUString(SAL_U(pdata), const_cast<System::String^>(data)->Length);
     }
     else
     {
@@ -819,7 +819,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                 System::String ^s= safe_cast<System::String^>(cli_data);
                 pin_ptr<const wchar_t> pdata= PtrToStringChars(s);
                 rtl_uString_newFromStr_WithLength( (rtl_uString**) uno_data,
-                                                  pdata, s->Length );
+                                                  SAL_U(pdata), s->Length );
             }
             break;
         }
@@ -1294,7 +1294,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                             rtl_uString** pStr=  & ((rtl_uString**) &
                                                     ((uno_Sequence*) seq.get())->elements)[i];
                             *pStr= NULL;
-                            rtl_uString_newFromStr_WithLength( pStr, pdata,
+                            rtl_uString_newFromStr_WithLength( pStr, SAL_U(pdata),
                                                                arStr[i]->Length);
                         }
                         break;