summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-07-16 15:03:46 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-07-16 15:35:22 +0200
commitdd57301eef0d99943672da7fc3d453ee3db4ad6e (patch)
treeede52f0d235949aa8fd634987d45ab1af44cd0a2
parentede7e6e18ceb6f48b5e4d2c8a8c770670b1cbf55 (diff)
fdo#52143 use Unicode functions for QuickStarter tooltip
Change-Id: Ic9c7ed84925ea5b4ce324a98a1089102dcda24b8 Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 0d3b86c46e53..28f783be28eb 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -284,13 +284,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;
@@ -298,7 +297,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);
}
// -------------------------------