diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/adodatalinks.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/adodatalinks.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index 3b1e552f6db0..ef4bc2601b36 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -31,6 +31,8 @@ #pragma warning(push, 1) #endif +#include <o3tl/char16_t2wchar_t.hxx> + #include <initguid.h> #include <adoid.h> #include <adoint.h> @@ -89,7 +91,8 @@ OUString PromptNew(long hWnd) piTmpConnection->Release( ); dlPrompt->Release( ); CoUninitialize(); - return SAL_U(_result); + // Don't we need SysFreeString(_result)? + return o3tl::toU(_result); } OUString PromptEdit(long hWnd, OUString const & connstr) @@ -115,7 +118,7 @@ OUString PromptEdit(long hWnd, OUString const & connstr) hr = piTmpConnection->put_ConnectionString( - const_cast<BSTR>(SAL_W(connstr.getStr()))); + const_cast<BSTR>(o3tl::toW(connstr.getStr()))); if( FAILED( hr ) ) { piTmpConnection->Release( ); @@ -180,7 +183,8 @@ OUString PromptEdit(long hWnd, OUString const & connstr) piTmpConnection->Release( ); dlPrompt->Release( ); CoUninitialize(); - return SAL_U(_result); + // Don't we need SysFreeString(_result)? + return o3tl::toU(_result); } } |