From 1944e3ddc0b2247de3138d2a441cd6999e21fd9a Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 5 Oct 2017 06:19:56 +0300
Subject: Rename and move SAL_U/W to o3tl::toU/W

Previosly (since commit 9ac98e6e3488e434bf4864ecfb13a121784f640b)
it was expected to gradually remove SAL_U/W usage in Windows code
by replacing with reinterpret_cast or changing to some bettertypes.
But as it's useful to make use of fact that LibreOffice and Windows
use compatible representation of strings, this commit puts these
functions to a better-suited o3tl, and recommends that the functions
be consistently used throughout Windows-specific code to reflect the
compatibility and keep the casts safe.

Change-Id: I2f7c65606d0e2d0c01a00f08812bb4ab7659c5f6
Reviewed-on: https://gerrit.libreoffice.org/43150
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 helpcompiler/inc/HelpCompiler.hxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'helpcompiler/inc/HelpCompiler.hxx')

diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 8d8a920da696..f9827eb2bbbe 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -42,6 +42,7 @@
 #include <osl/thread.h>
 #include <osl/process.h>
 #include <osl/file.hxx>
+#include <o3tl/char16_t2wchar_t.hxx>
 
 #include <BasCodeTagger.hxx>
 #include <helpcompiler/compilehelp.hxx>
@@ -92,7 +93,7 @@ namespace fs
         {
             OUString ustrSystemPath;
             osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
-            return std::wstring(SAL_W(ustrSystemPath.getStr()));
+            return std::wstring(o3tl::toW(ustrSystemPath.getStr()));
         }
 #endif
         std::string toUTF8() const
-- 
cgit