diff options
| author | skswales <stuart.swales.croftnuisk@gmail.com> | 2016-06-21 17:59:01 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-22 12:31:42 +0000 |
| commit | a50cdeb70ec19369f42ed08abfd4a5301d05edb5 (patch) | |
| tree | 70081e60d642b507e572dbfdd4cf191f4608ec14 /shell/inc | |
| parent | 547e4b3a80708600edbc3f5669b4428877b5a951 (diff) | |
Work towards tdf#72606 EasyHack _tstring/TCHAR elimination
shell module largely already compiled UNICODE: A/W clarity
Verified by installing release build and trying property sheets etc.
Change-Id: I4965cdadbce635d86da1996c3c1bbd37a981ffde
Reviewed-on: https://gerrit.libreoffice.org/26556
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/config.hxx | 12 | ||||
| -rw-r--r-- | shell/inc/utilities.hxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/shell/inc/config.hxx b/shell/inc/config.hxx index b65079166e39..eda0cfb06f9f 100644 --- a/shell/inc/config.hxx +++ b/shell/inc/config.hxx @@ -27,15 +27,15 @@ #include <tchar.h> #ifdef _AMD64_ -#define MODULE_NAME TEXT("shlxthdl_x64.dll") +#define MODULE_NAME L"shlxthdl_x64.dll" #else -#define MODULE_NAME TEXT("shlxthdl.dll") +#define MODULE_NAME L"shlxthdl.dll" #endif -#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("LibreOffice Column Handler") -#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("LibreOffice Infotip Handler") -#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("LibreOffice Property Sheet Handler") -#define THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME TEXT("LibreOffice Thumbnail Viewer") +#define COLUMN_HANDLER_DESCRIPTIVE_NAME L"LibreOffice Column Handler" +#define INFOTIP_HANDLER_DESCRIPTIVE_NAME L"LibreOffice Infotip Handler" +#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME L"LibreOffice Property Sheet Handler" +#define THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME L"LibreOffice Thumbnail Viewer" #define META_CONTENT_NAME "meta.xml" #define DOC_CONTENT_NAME "content.xml" diff --git a/shell/inc/utilities.hxx b/shell/inc/utilities.hxx index 0351e910658f..551089afd600 100644 --- a/shell/inc/utilities.hxx +++ b/shell/inc/utilities.hxx @@ -113,7 +113,7 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ); #ifdef DEBUG -inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) +inline void OutputDebugStringFormatA( LPCSTR pFormat, ... ) { CHAR buffer[1024]; va_list args; @@ -124,7 +124,7 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) OutputDebugStringA( buffer ); } #else -static inline void OutputDebugStringFormat( LPCSTR, ... ) +static inline void OutputDebugStringFormatA( LPCSTR, ... ) { } #endif |