desktop/WinResTarget_quickstart.mk | 2 desktop/source/app/app.cxx | 2 desktop/win32/source/QuickStart/OOQuickStart.rc | 130 ----------------------- desktop/win32/source/QuickStart/QuickStart.cxx | 7 - desktop/win32/source/QuickStart/QuickStart.rc | 130 +++++++++++++++++++++++ desktop/win32/source/QuickStart/so/QuickStart.rc | 130 ----------------------- 6 files changed, 135 insertions(+), 266 deletions(-)
New commits: commit 3ac61e97198354439ceac8969277585cb8d4cb18 Author: Andras Timar <ati...@suse.com> Date: Sun Dec 4 13:20:20 2011 +0100 remove StarOffice-only file diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 0c28ece..57e6358 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -35,6 +35,6 @@ $(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/OOQuickStart)) +$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/QuickStart)) # vim: set ts=4 sw=4 et: diff --git a/desktop/win32/source/QuickStart/OOQuickStart.rc b/desktop/win32/source/QuickStart/OOQuickStart.rc deleted file mode 100644 index 2fdfa7d..0000000 --- a/desktop/win32/source/QuickStart/OOQuickStart.rc +++ /dev/null @@ -1,130 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -ICON_ACTIVE ICON DISCARDABLE "icons/main_app.ico" -IDI_QUICKSTART ICON DISCARDABLE "icons/main_app.ico" -IDI_SMALL ICON DISCARDABLE "icons/main_app.ico" -ICON_INACTIVE ICON DISCARDABLE "icons/main_app.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_QUICKSTART ACCELERATORS MOVEABLE PURE -BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "System" -BEGIN - ICON IDI_QUICKSTART,IDC_MYICON,14,9,16,16 - LTEXT "QuickStart Version 1.0",IDC_STATIC,49,10,119,8, - SS_NOPREFIX - LTEXT "Copyright (C) 2001",IDC_STATIC,49,20,119,8 - DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "SoQuickStart" - IDC_QUICKSTART "QUICKSTART" - IDS_TOOLTIP "StarOffice 6.0 QuickStart" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_EXIT "Exit" -END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/desktop/win32/source/QuickStart/QuickStart.rc b/desktop/win32/source/QuickStart/QuickStart.rc new file mode 100644 index 0000000..2fdfa7d --- /dev/null +++ b/desktop/win32/source/QuickStart/QuickStart.rc @@ -0,0 +1,130 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +ICON_ACTIVE ICON DISCARDABLE "icons/main_app.ico" +IDI_QUICKSTART ICON DISCARDABLE "icons/main_app.ico" +IDI_SMALL ICON DISCARDABLE "icons/main_app.ico" +ICON_INACTIVE ICON DISCARDABLE "icons/main_app.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_QUICKSTART ACCELERATORS MOVEABLE PURE +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "System" +BEGIN + ICON IDI_QUICKSTART,IDC_MYICON,14,9,16,16 + LTEXT "QuickStart Version 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 2001",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "SoQuickStart" + IDC_QUICKSTART "QUICKSTART" + IDS_TOOLTIP "StarOffice 6.0 QuickStart" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXIT "Exit" +END + +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/desktop/win32/source/QuickStart/so/QuickStart.rc b/desktop/win32/source/QuickStart/so/QuickStart.rc deleted file mode 100644 index 732904d..0000000 --- a/desktop/win32/source/QuickStart/so/QuickStart.rc +++ /dev/null @@ -1,130 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -ICON_ACTIVE ICON DISCARDABLE "icons/so9_main_app.ico" -IDI_QUICKSTART ICON DISCARDABLE "icons/so9_main_app.ico" -IDI_SMALL ICON DISCARDABLE "icons/so9_main_app.ico" -ICON_INACTIVE ICON DISCARDABLE "icons/so9_main_app.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_QUICKSTART ACCELERATORS MOVEABLE PURE -BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "System" -BEGIN - ICON IDI_QUICKSTART,IDC_MYICON,14,9,16,16 - LTEXT "QuickStart Version 1.0",IDC_STATIC,49,10,119,8, - SS_NOPREFIX - LTEXT "Copyright (C) 2001",IDC_STATIC,49,20,119,8 - DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "SoQuickStart" - IDC_QUICKSTART "QUICKSTART" - IDS_TOOLTIP "Oracle Open Office 3.2 QuickStart" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_EXIT "Exit" -END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - commit bca4eb7a1b37c053c97c5d8c267d07187ccce3a7 Author: Andras Timar <ati...@suse.com> Date: Sun Dec 4 13:16:28 2011 +0100 -quickstart -> --quickstart, etc. diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 78fb7ab..1c5a66a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2058,7 +2058,7 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r { // the shutdown icon sits in the systray and allows the user to keep // the office instance running for quicker restart - // this will only be activated if -quickstart was specified on cmdline + // this will only be activated if --quickstart was specified on cmdline RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) createInstance com.sun.star.office.Quickstart" ); sal_Bool bQuickstart = shouldLaunchQuickstart(); diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx index 242ca28..26276ba 100644 --- a/desktop/win32/source/QuickStart/QuickStart.cxx +++ b/desktop/win32/source/QuickStart/QuickStart.cxx @@ -48,7 +48,6 @@ bool launchSoffice( ) { if ( !SofficeRuns() ) { - // UINT ret = WinExec( "h:\\office60.630b\\program\\swriter.exe -bean", SW_SHOW ); char filename[_MAX_PATH + 1]; filename[_MAX_PATH] = 0; @@ -62,7 +61,7 @@ bool launchSoffice( ) char imagename[_MAX_PATH + 1]; imagename[_MAX_PATH] = 0; - _snprintf(imagename, _MAX_PATH, "\"%s\" -quickstart", filename ); + _snprintf(imagename, _MAX_PATH, "\"%s\" --quickstart", filename ); UINT ret = WinExec( imagename, SW_SHOW ); if ( ret < 32 ) @@ -124,11 +123,11 @@ int APIENTRY WinMain(HINSTANCE /*hInstance*/, LPSTR /*lpCmdLine*/, int /*nCmdShow*/) { - // Look for -killtray argument + // Look for --killtray argument for ( int i = 1; i < __argc; i++ ) { - if ( 0 == strcmp( __argv[i], "-killtray" ) ) + if ( 0 == strcmp( __argv[i], "--killtray" ) ) { HWND hwndTray = FindWindow( LISTENER_WINDOWCLASS, NULL ); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits