mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46510 optionally turn on Quickstarter by installer

Browse Source 
Change-Id: Ie002ab01a804cceea06e0a2ba7e6b2fe2a495344
This commit is contained in:
Andras Timar 2012-06-28 12:33:25 +02:00
parent 1e0a880cfe
commit 677f10cdf0
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
desktop/source/app/app.cxx
View File

@ -103,6 +103,18 @@
#include <sys/wait.h>
#endif
#ifdef WNT
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif //WNT
using rtl::OUString;
using rtl::OUStringBuffer;
@ -3039,6 +3051,30 @@ void Desktop::CheckFirstRun( )
m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.Start();
#ifdef WNT
// Check if Quckstarter should be started (on Windows only)
TCHAR szValue[8192];
DWORD nValueSize = sizeof(szValue);
HKEY hKey;
if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, "Software\\LibreOffice", &hKey ) )
{
if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("RunQuickstartAtFirstStart"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
{
sal_Bool bQuickstart( sal_True );
sal_Bool bAutostart( sal_True );
Sequence< Any > aSeq( 2 );
aSeq[0] <<= bQuickstart;
aSeq[1] <<= bAutostart;
Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
if ( xQuickstart.is() )
xQuickstart->initialize( aSeq );
RegCloseKey( hKey );
}
}
#endif
// --------------------------------------------------------------------
// reset the config flag

1
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
View File

@ -3,3 +3,4 @@ s72 S64
CheckBox Property
CREATEDESKTOPLINK 1
ENABLEATTOOLS 1
QUICKSTART 1

3
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
View File

@ -231,7 +231,8 @@ ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableATTools
ReadyToInstall EnableATTools CheckBox 21 125 300 10 3 ENABLEATTOOLS OOO_CONTROL_320 Back
ReadyToInstall EnableATTools CheckBox 21 125 300 10 3 ENABLEATTOOLS OOO_CONTROL_320 EnableQuickstart
ReadyToInstall EnableQuickstart CheckBox 21 150 300 10 3 QUICKSTART OOO_CONTROL_321 Back
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1

1
instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
View File

@ -24,6 +24,7 @@ ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
ReadyToInstall DesktopLink Hide NOT DESKTOPLINKEXISTS
ReadyToInstall EnableQuickstart Hide NOT ( &gm_o_Quickstart=3 OR ( !gm_o_Quickstart=3 AND &gm_o_Quickstart=-1 ) )
SetupCompleteError Back Default UpdateStarted
SetupCompleteError Back Disable NOT UpdateStarted
SetupCompleteError Back Enable UpdateStarted

5
scp2/source/quickstart/registryitem_quickstart.scp
View File

@ -27,10 +27,11 @@
#include "macros.inc"
RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
RegistryItem gid_Regitem_Software_OpenOffice_RunQuickstartAtFirstStart
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
Subkey = "Software\LibreOffice";
ModuleID = gid_Module_Optional_Quickstart;
Name = "QuickStarterInstalled";
Name = "RunQuickstartAtFirstStart";
Value = "1";
ComponentCondition = "QUICKSTART=1";
End