diff options
| author | Andras Timar <atimar@suse.com> | 2012-07-16 15:03:46 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-07-16 15:03:46 +0200 |
| commit | 34ebc821d9942641c256157ada9f817338832711 (patch) | |
| tree | a00558cd1d3bd051d897db0071bdc214e3a0a6e1 /sfx2 | |
| parent | 8722e6f55b3625fb410f1aedf40ed8d0eb2612f0 (diff) | |
fdo#52143 use Unicode functions for QuickStarter tooltip
Change-Id: Ic9c7ed84925ea5b4ce324a98a1089102dcda24b8
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 78d1a9cd41c7..f4a540ef7892 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -275,13 +275,12 @@ static void addTaskbarIcon( HWND hWnd ) strTip = ShutdownIcon::getInstance()->GetResString( STR_QUICKSTART_TIP ); // add taskbar icon - NOTIFYICONDATAA nid; + NOTIFYICONDATAW nid; nid.hIcon = (HICON)LoadImageA( GetModuleHandle( NULL ), MAKEINTRESOURCE( ICON_LO_DEFAULT ), IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), LR_DEFAULTCOLOR | LR_SHARED ); - // better use unicode wrapper here ? - strncpy( nid.szTip, ( OUStringToOString(strTip, osl_getThreadTextEncoding()).getStr() ), 64 ); + wcsncpy( nid.szTip, strTip.getStr(), 64 ); nid.cbSize = sizeof(nid); nid.hWnd = hWnd; @@ -289,7 +288,7 @@ static void addTaskbarIcon( HWND hWnd ) nid.uCallbackMessage = SFX_TASKBAR_NOTIFICATION; nid.uFlags = NIF_MESSAGE|NIF_TIP|NIF_ICON; - Shell_NotifyIconA(NIM_ADD, &nid); + Shell_NotifyIconW(NIM_ADD, &nid); } // ------------------------------- |