[Libreoffice-commits] core.git: fpicker/source

[Stephan Bergmann]

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |    3 ++-
 fpicker/source/win32/filepicker/helppopupwindow.cxx     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6d3a43fa80d8ad54fe8982b2b056ce15ea4268b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 12 13:25:26 2017 +0200

    Clean up uses of SAL_U/SAL_W: fpicker
    
    Change-Id: I9fe1a639bee624eea3ab91d5f29a86ef8ac3d97c

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 9e4fda73ddf7..0c8dc884aabf 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -62,7 +62,8 @@ bool createFolderItem(OUString const & url, ComPtr<IShellItem> & folder) {
         return false;
     }
     HRESULT res = SHCreateItemFromParsingName(
-        SAL_W(path.getStr()), nullptr, IID_PPV_ARGS(&folder));
+        reinterpret_cast<wchar_t const *>(path.getStr()), nullptr,
+        IID_PPV_ARGS(&folder));
     return SUCCEEDED(res);
 }
 
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 068a7f8ed39e..3990e14f5628 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -335,7 +335,7 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc )
 
     DrawTextW(
         hdc,
-        SAL_W(m_HelpText.getStr( )),
+        reinterpret_cast<wchar_t const *>(m_HelpText.getStr( )),
         m_HelpText.getLength( ),
         &rect,
         nFormat );