summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-09-29 17:33:15 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-09-30 19:08:28 +0200
commitc3609f107b16eb888edf284f4637be6cb09234eb (patch)
treeda52e05b5cdf26d5d3a57f510f8b32d8af10a026 /dbaccess
parent8a4df9376bf299beb49fe116882ffdbd10b5e02b (diff)
Use SAL_W/SAL_U instead of reinterpret_cast btwn wchar_t* and sal_Unicode*
This is type-safe, and allows to catch cases where a source type is changed for some reason, but reinterpret_cast masks that Change-Id: Ib64b6fa2e22d94a6bba890f0ccc3e20325c6f0a1 Reviewed-on: https://gerrit.libreoffice.org/42961 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index f2a18c8c8acc..3b1e552f6db0 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -89,7 +89,7 @@ OUString PromptNew(long hWnd)
piTmpConnection->Release( );
dlPrompt->Release( );
CoUninitialize();
- return OUString(reinterpret_cast<sal_Unicode const *>(_result));
+ return SAL_U(_result);
}
OUString PromptEdit(long hWnd, OUString const & connstr)
@@ -115,7 +115,7 @@ OUString PromptEdit(long hWnd, OUString const & connstr)
hr = piTmpConnection->put_ConnectionString(
- const_cast<BSTR>(reinterpret_cast<wchar_t const *>(connstr.getStr())));
+ const_cast<BSTR>(SAL_W(connstr.getStr())));
if( FAILED( hr ) )
{
piTmpConnection->Release( );
@@ -180,7 +180,7 @@ OUString PromptEdit(long hWnd, OUString const & connstr)
piTmpConnection->Release( );
dlPrompt->Release( );
CoUninitialize();
- return OUString(reinterpret_cast<sal_Unicode const *>(_result));
+ return SAL_U(_result);
}
}