summaryrefslogtreecommitdiff
path: root/helpcompiler/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-04 14:57:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-04 16:12:11 +0000
commit9ac98e6e3488e434bf4864ecfb13a121784f640b (patch)
treeb3c9cbf52126fee5864be12e9109f7413e7a0878 /helpcompiler/inc
parent6f995da5a652d993ab253b3363188cd18e289728 (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 'helpcompiler/inc')
-rw-r--r--helpcompiler/inc/HelpCompiler.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index b275e31939aa..56163f5bb5ce 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -92,7 +92,7 @@ namespace fs
{
OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
- return ustrSystemPath.getStr();
+ return SAL_W(ustrSystemPath.getStr());
}
#endif
std::string toUTF8() const