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 /vcl/win/app/salinst.cxx | |
| 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 'vcl/win/app/salinst.cxx')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 4f270bc7845f..d0a8d01e5cca 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -920,7 +920,7 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS { IShellItem* pShellItem = nullptr; - HRESULT hr = pSHCreateItemFromParsingName ( system_path.getStr(), nullptr, IID_PPV_ARGS(&pShellItem) ); + HRESULT hr = pSHCreateItemFromParsingName ( SAL_W(system_path.getStr()), nullptr, IID_PPV_ARGS(&pShellItem) ); if ( SUCCEEDED(hr) && pShellItem ) { @@ -965,7 +965,7 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS DummyShardAppIDInfo info; info.psi = pShellItem; - info.pszAppID = sApplicationID.getStr(); + info.pszAppID = SAL_W(sApplicationID.getStr()); SHAddToRecentDocs ( SHARD_APPIDINFO, &info ); return; |