[Libreoffice-commits] .: desktop/win32

[Andras Timar]

 desktop/win32/source/QuickStart/QuickStart.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 238108c5429722abe39262df4709ed0d31917790
Author: Andras Timar <atimar at suse.com>
Date:   Thu Jun 28 14:21:27 2012 +0200

    use defines from systools/win32/qswin32.h instead of duplication
    
    Change-Id: I3d52308087412d1250b8ad64ffc308ca7cc414fd

diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx
index b3e19a5..77583c4 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -5,16 +5,13 @@
 #include "StdAfx.h"
 #include "resource.h"
 #include <systools/win32/uwinapi.h>
+#include <systools/win32/qswin32.h>
 #include <stdio.h>
 
-// message used to communicate with soffice
-#define LISTENER_WINDOWCLASS    "SO Listener Class"
-#define KILLTRAY_MESSAGE        "SO KillTray"
-
 bool SofficeRuns()
 {
     // check for soffice by searching the communication window
-    return ( FindWindowEx( NULL, NULL, LISTENER_WINDOWCLASS, NULL ) == NULL ) ? false : true;
+    return ( FindWindowEx( NULL, NULL, QUICKSTART_CLASSNAME, NULL ) == NULL ) ? false : true;
 }
 
 bool launchSoffice( )
@@ -57,11 +54,11 @@ int APIENTRY WinMain(HINSTANCE /*hInstance*/,
     {
         if ( 0 == strcmp( __argv[i], "--killtray" ) )
         {
-            HWND    hwndTray = FindWindow( LISTENER_WINDOWCLASS, NULL );
+            HWND    hwndTray = FindWindow( QUICKSTART_CLASSNAME, NULL );
 
             if ( hwndTray )
             {
-                UINT    uMsgKillTray = RegisterWindowMessage( KILLTRAY_MESSAGE );
+                UINT    uMsgKillTray = RegisterWindowMessage( SHUTDOWN_QUICKSTART_MESSAGE );
                 SendMessage( hwndTray, uMsgKillTray, 0, 0 );
             }