[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 ati...@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_WINDOWCLASSSO Listener Class
-#define KILLTRAY_MESSAGESO 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 ) )
 {
-HWNDhwndTray = FindWindow( LISTENER_WINDOWCLASS, NULL );
+HWNDhwndTray = FindWindow( QUICKSTART_CLASSNAME, NULL );
 
 if ( hwndTray )
 {
-UINTuMsgKillTray = RegisterWindowMessage( KILLTRAY_MESSAGE 
);
+UINTuMsgKillTray = RegisterWindowMessage( 
SHUTDOWN_QUICKSTART_MESSAGE );
 SendMessage( hwndTray, uMsgKillTray, 0, 0 );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/win32

[Jesús Corrius]

 desktop/win32/source/applauncher/launcher.cxx |2 --
 desktop/win32/source/applauncher/launcher.hxx |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3c3d6c6dedc145aef6a91816cfed03c399f338a5
Author: Jesús Corrius je...@softcatala.org
Date:   Mon Jun 4 11:47:13 2012 +0200

Make sure the symbols are found

diff --git a/desktop/win32/source/applauncher/launcher.cxx 
b/desktop/win32/source/applauncher/launcher.cxx
index 24843a4..8cb7afb 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -35,8 +35,6 @@
 #endif
 #   include windows.h
 #   include shellapi.h
-#   include winbase.h
-#   include shlwapi.h
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/desktop/win32/source/applauncher/launcher.hxx 
b/desktop/win32/source/applauncher/launcher.hxx
index e602bfe..7b6f4ac 100644
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
@@ -5,6 +5,8 @@
 #endif
 
 #include windows.h
+#include winbase.h
+#include shlwapi.h
 
 #ifndef _INC_TCHAR
 #   ifdef UNICODE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/win32

[Jesús Corrius]

 desktop/win32/source/applauncher/launcher.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 335b175cdaf02b77104559a3b0ea6a403533d79d
Author: Jesús Corrius je...@softcatala.org
Date:   Mon Jun 4 12:12:42 2012 +0200

Make sure all the required headers are there

diff --git a/desktop/win32/source/applauncher/launcher.hxx 
b/desktop/win32/source/applauncher/launcher.hxx
index 7b6f4ac..1ce55e5 100644
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
@@ -6,6 +6,7 @@
 
 #include windows.h
 #include winbase.h
+#include windef.h
 #include shlwapi.h
 
 #ifndef _INC_TCHAR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/win32

[Jesús Corrius]

 desktop/win32/source/applauncher/launcher.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f0f8576596e104549e66e62d15a262acfd70dcec
Author: Jesús Corrius je...@softcatala.org
Date:   Thu May 24 13:33:39 2012 +0200

Don't spam fellow developers until I fix the problem in MinGW

diff --git a/desktop/win32/source/applauncher/launcher.cxx 
b/desktop/win32/source/applauncher/launcher.cxx
index 8ba9cb6..074e2b5 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -56,7 +56,8 @@ extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, 
LPTSTR, int )
 {
// Set an explicit Application User Model ID for the process
 
-   SetExplicitAppUserModelID(APPUSERMODELID);
+// FIXME: Comment this out until I find a fix for minGW.
+// SetExplicitAppUserModelID(APPUSERMODELID);
 
 // Retreive startup info
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/win32

[Andras Timar]

 desktop/win32/source/QuickStart/QuickStart.cxx |  353 -
 desktop/win32/source/QuickStart/QuickStart.rc  |  127 
 desktop/win32/source/QuickStart/resource.h |   32 --
 3 files changed, 1 insertion(+), 511 deletions(-)

New commits:
commit 6411ad12f2dac9525f720662692cf712801f8c5b
Author: Andras Timar ati...@suse.com
Date:   Sun Dec 4 14:50:37 2011 +0100

code cleanup of Windows quickstarter

diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx 
b/desktop/win32/source/QuickStart/QuickStart.cxx
index 26276ba..b3e19a5 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -7,37 +7,10 @@
 #include systools/win32/uwinapi.h
 #include stdio.h
 
-#define MY_TASKBAR_NOTIFICATION WM_USER+1
-
-#define MAX_LOADSTRING 100
-
 // message used to communicate with soffice
-#define TERMINATIONVETO_MESSAGE SO TerminationVeto
-#define TERMINATE_MESSAGE   SO Terminate
 #define LISTENER_WINDOWCLASSSO Listener Class
 #define KILLTRAY_MESSAGESO KillTray
 
-static  UINT aTerminationVetoMessage = 0x7FFF;
-static  UINT aTerminateMessage = 0x7FFF;
-static  HMENU popupMenu = NULL;
-static  bool bTerminateVeto = true;
-
-#define UPDATE_TIMER   1
-
-// Global Variables:
-HINSTANCE hInst;// current instance
-TCHAR szTitle[MAX_LOADSTRING];  // The title bar text
-TCHAR szWindowClass[MAX_LOADSTRING];// The title bar text
-
-TCHAR szExitString[MAX_LOADSTRING];
-TCHAR szTooltipString[MAX_LOADSTRING];
-
-// Foward declarations of functions included in this code module:
-ATOMMyRegisterClass(HINSTANCE hInstance);
-BOOLInitInstance(HINSTANCE, int);
-LRESULT CALLBACKWndProc(HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACKAbout(HWND, UINT, WPARAM, LPARAM);
-
 bool SofficeRuns()
 {
 // check for soffice by searching the communication window
@@ -66,58 +39,13 @@ bool launchSoffice( )
 UINT ret = WinExec( imagename, SW_SHOW );
 if ( ret  32 )
 return false;
-/*
-// wait until we can communicate
-int retry = 30;
-while (retry--  !SofficeRuns() )
-Sleep(1000);
 
-return SofficeRuns();
-*/
 return true;
 }
 else
 return true;
 }
 
-void NotifyListener( HWND hWnd )
-{
-static HICON hIconActive=NULL;
-//static HICON hIconInActive=NULL;
-
-if( !hIconActive )
-{
-hIconActive = (HICON)LoadImage( GetModuleHandle( NULL ), 
MAKEINTRESOURCE( ICON_ACTIVE ),
-IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( 
SM_CYSMICON ),
-LR_DEFAULTCOLOR | LR_SHARED );
-
-/*hIconInActive = (HICON)LoadImage( GetModuleHandle( NULL ), 
MAKEINTRESOURCE( ICON_INACTIVE ),
-IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( 
SM_CYSMICON ),
-LR_DEFAULTCOLOR | LR_SHARED );
-*/
-}
-
-NOTIFYICONDATA nid;
-nid.cbSize = sizeof(NOTIFYICONDATA);
-nid.hWnd   = hWnd;
-nid.uID= IDM_QUICKSTART;
-nid.szTip[SAL_N_ELEMENTS(nid.szTip) - 1] = 0;
-//nid.hIcon = bTerminateVeto ? hIconActive : hIconInActive;
-//strncpy(nid.szTip, bTerminateVeto ? STRING_QUICKSTARTACTIVE : 
STRING_QUICKSTARTINACTIVE, SAL_N_ELEMENTS(nid.szTip) - 1 );
-nid.hIcon = hIconActive;
-strncpy(nid.szTip, szTooltipString, SAL_N_ELEMENTS(nid.szTip) - 1);
-nid.uFlags = NIF_TIP|NIF_ICON;
-
-// update systray
-Shell_NotifyIcon( NIM_MODIFY, nid );
-//CheckMenuItem( popupMenu, IDM_QUICKSTART, bTerminateVeto ? MF_CHECKED : 
MF_UNCHECKED );
-
-// notify listener
-SendMessage( HWND_BROADCAST, aTerminationVetoMessage, (WORD) 
bTerminateVeto, 0L );
-}
-
-
-
 int APIENTRY WinMain(HINSTANCE /*hInstance*/,
  HINSTANCE /*hPrevInstance*/,
  LPSTR /*lpCmdLine*/,
@@ -143,287 +71,6 @@ int APIENTRY WinMain(HINSTANCE /*hInstance*/,
 
 launchSoffice();
 return 0;
-
-#if 0 // Note unconditional return 0 above. Do not remove this block of code
-  // unless you are sure it will never be needed even for reference.
-
- // TODO: Place code here.
-MSG msg;
-HACCEL hAccelTable;
-aTerminationVetoMessage = RegisterWindowMessage( TERMINATIONVETO_MESSAGE );
-aTerminateMessage   = RegisterWindowMessage( TERMINATE_MESSAGE );
-
-// Initialize global strings
-LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-LoadString(hInstance, IDC_QUICKSTART, szWindowClass, MAX_LOADSTRING);
-
-LoadString(hInstance, IDS_EXIT,szExitString, MAX_LOADSTRING);
-LoadString(hInstance, IDS_TOOLTIP, szTooltipString, MAX_LOADSTRING);
-
-MyRegisterClass(hInstance);
-
-// Perform application initialization:
-if (!InitInstance (hInstance, nCmdShow))
-{
-return FALSE;
-}
-
-hAccelTable = LoadAccelerators(hInstance, 

[Libreoffice-commits] .: desktop/win32

[Jan Holesovsky]

 desktop/win32/source/applauncher/sbase.cxx|2 +-
 desktop/win32/source/applauncher/scalc.cxx|2 +-
 desktop/win32/source/applauncher/sdraw.cxx|2 +-
 desktop/win32/source/applauncher/simpress.cxx |2 +-
 desktop/win32/source/applauncher/smath.cxx|2 +-
 desktop/win32/source/applauncher/sweb.cxx |2 +-
 desktop/win32/source/applauncher/swriter.cxx  |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 79228bb177bc9ebe847509d761630663b9c488ef
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Oct 31 15:25:14 2011 +0100

The -something switches are obsolete, use --something instead.

diff --git a/desktop/win32/source/applauncher/sbase.cxx 
b/desktop/win32/source/applauncher/sbase.cxx
index 9a1f31d..5fbbd15 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -base );
+_TCHAR APPLICATION_SWITCH[] = _T( --base );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/scalc.cxx 
b/desktop/win32/source/applauncher/scalc.cxx
index ceca63e..1a56bd6 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -calc );
+_TCHAR APPLICATION_SWITCH[] = _T( --calc );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sdraw.cxx 
b/desktop/win32/source/applauncher/sdraw.cxx
index 034a7c4..e3f0a53 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -draw );
+_TCHAR APPLICATION_SWITCH[] = _T( --draw );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/simpress.cxx 
b/desktop/win32/source/applauncher/simpress.cxx
index cd01d01..9397e24 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -impress );
+_TCHAR APPLICATION_SWITCH[] = _T( --impress );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/smath.cxx 
b/desktop/win32/source/applauncher/smath.cxx
index 3e670cd..d1e50c5 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -math );
+_TCHAR APPLICATION_SWITCH[] = _T( --math );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sweb.cxx 
b/desktop/win32/source/applauncher/sweb.cxx
index 1c2fd8e..bbe2c77 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -web );
+_TCHAR APPLICATION_SWITCH[] = _T( --web );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/swriter.cxx 
b/desktop/win32/source/applauncher/swriter.cxx
index 1909cb9..5e41003 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -30,6 +30,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -writer );
+_TCHAR APPLICATION_SWITCH[] = _T( --writer );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits