diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-04 14:57:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-04 16:12:11 +0000 |
| commit | 9ac98e6e3488e434bf4864ecfb13a121784f640b (patch) | |
| tree | b3c9cbf52126fee5864be12e9109f7413e7a0878 /cli_ure/source/climaker | |
| parent | 6f995da5a652d993ab253b3363188cd18e289728 (diff) | |
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>
Diffstat (limited to 'cli_ure/source/climaker')
| -rw-r--r-- | cli_ure/source/climaker/climaker_app.cxx | 2 | ||||
| -rw-r--r-- | cli_ure/source/climaker/climaker_share.h | 4 |
2 files changed, 3 insertions, 3 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 |