summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/inc')
-rwxr-xr-x[-rw-r--r--]desktop/inc/app.hxx23
-rwxr-xr-x[-rw-r--r--]desktop/inc/deployment.hrc9
-rwxr-xr-x[-rw-r--r--]desktop/inc/makefile.mk0
-rwxr-xr-xdesktop/inc/migration.hxx45
-rwxr-xr-x[-rw-r--r--]desktop/inc/pch/precompiled_desktop.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/inc/pch/precompiled_desktop.hxx3
6 files changed, 62 insertions, 20 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 3b3cba11f5a0..3a4f5253c537 100644..100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include <map>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/svapp.hxx>
-#ifndef _VCL_TIMER_HXX_
#include <vcl/timer.hxx>
-#endif
#include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -45,7 +44,6 @@
using namespace com::sun::star::task;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using namespace rtl;
#define DESKTOP_SAVETASKS_MOD 0x1
#define DESKTOP_SAVETASKS_UNMOD 0x2
@@ -59,7 +57,7 @@ namespace desktop
--------------------------------------------------------------------*/
class CommandLineArgs;
class Lockfile;
-class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
+class AcceptorMap : public std::map< rtl::OUString, Reference<XInitialization> > {};
struct ConvertData;
class Desktop : public Application
{
@@ -88,8 +86,9 @@ class Desktop : public Application
Desktop();
~Desktop();
- virtual void Main( );
+ virtual int Main( );
virtual void Init();
+ virtual void InitFinished();
virtual void DeInit();
virtual sal_Bool QueryExit();
virtual sal_uInt16 Exception(sal_uInt16 nError);
@@ -130,10 +129,7 @@ class Desktop : public Application
static sal_Bool CheckOEM();
static sal_Bool isCrashReporterEnabled();
- // first-start (ever) & license relate methods
- static rtl::OUString GetLicensePath();
- static sal_Bool LicenseNeedsAcceptance();
- static sal_Bool IsFirstStartWizardNeeded();
+ // first-start (ever) related methods
static sal_Bool CheckExtensionDependencies();
static void DoRestartActionsIfNecessary( sal_Bool bQuickStart );
@@ -143,6 +139,8 @@ class Desktop : public Application
void SetSplashScreenText( const ::rtl::OUString& rText );
void SetSplashScreenProgress( sal_Int32 );
+ void CreateProcessServiceFactory();
+
private:
// Bootstrap methods
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > CreateApplicationServiceManager();
@@ -158,6 +156,7 @@ class Desktop : public Application
sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename );
sal_Bool InitializeConfiguration();
void FlushConfiguration();
+ static sal_Bool shouldLaunchQuickstart();
sal_Bool InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr );
void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg );
@@ -196,9 +195,9 @@ class Desktop : public Application
static sal_Bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
- static void createAcceptor(const OUString& aDescription);
+ static void createAcceptor(const rtl::OUString& aDescription);
static void enableAcceptors();
- static void destroyAcceptor(const OUString& aDescription);
+ static void destroyAcceptor(const rtl::OUString& aDescription);
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
@@ -217,3 +216,5 @@ class Desktop : public Application
}
#endif // _DESKTOP_APP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 370996c710ae..22492cd8ae88 100644..100755
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -40,27 +40,19 @@
#define RID_DEPLOYMENT_BUNDLE_START (RID_DEPLOYMENT_START+2000)
#define RID_IMG_DEF_PACKAGE_BUNDLE RID_DEPLOYMENT_BUNDLE_START
-#define RID_IMG_DEF_PACKAGE_BUNDLE_HC (RID_DEPLOYMENT_BUNDLE_START+1)
#define RID_DEPLOYMENT_SCRIPT_START (RID_DEPLOYMENT_START+2500)
#define RID_IMG_SCRIPTLIB RID_DEPLOYMENT_SCRIPT_START
-#define RID_IMG_SCRIPTLIB_HC (RID_DEPLOYMENT_SCRIPT_START+1)
#define RID_IMG_DIALOGLIB (RID_DEPLOYMENT_SCRIPT_START+2)
-#define RID_IMG_DIALOGLIB_HC (RID_DEPLOYMENT_SCRIPT_START+3)
#define RID_DEPLOYMENT_CONF_START (RID_DEPLOYMENT_START+3000)
#define RID_IMG_CONF_XML RID_DEPLOYMENT_CONF_START
-#define RID_IMG_CONF_XML_HC (RID_DEPLOYMENT_CONF_START+1)
#define RID_DEPLOYMENT_COMPONENT_START (RID_DEPLOYMENT_START+3500)
#define RID_IMG_COMPONENT RID_DEPLOYMENT_COMPONENT_START
-#define RID_IMG_COMPONENT_HC (RID_DEPLOYMENT_COMPONENT_START+1)
#define RID_IMG_JAVA_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+2)
-#define RID_IMG_JAVA_COMPONENT_HC (RID_DEPLOYMENT_COMPONENT_START+3)
#define RID_IMG_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+4)
-#define RID_IMG_TYPELIB_HC (RID_DEPLOYMENT_COMPONENT_START+5)
#define RID_IMG_JAVA_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+6)
-#define RID_IMG_JAVA_TYPELIB_HC (RID_DEPLOYMENT_COMPONENT_START+7)
#define RID_DEPLOYMENT_UNOPKG_START (RID_DEPLOYMENT_START+4000)
#define RID_STR_UNOPKG_ACCEPT_LIC_1 (RID_DEPLOYMENT_UNOPKG_START+1)
@@ -83,5 +75,4 @@
#define RID_DEPLOYMENT_HELP_START (RID_DEPLOYMENT_START+5000)
#define RID_IMG_HELP RID_DEPLOYMENT_HELP_START
-#define RID_IMG_HELP_HC (RID_DEPLOYMENT_HELP_START+1)
#endif
diff --git a/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
index 8715d814274f..8715d814274f 100644..100755
--- a/desktop/inc/makefile.mk
+++ b/desktop/inc/makefile.mk
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
new file mode 100755
index 000000000000..3319d8d7716f
--- /dev/null
+++ b/desktop/inc/migration.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _DESKTOP_MIGRATION_HXX_
+#define _DESKTOP_MIGRATION_HXX_
+
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+
+namespace desktop {
+
+class Migration
+{
+public:
+ static void migrateSettingsIfNecessary();
+};
+}
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_desktop.cxx b/desktop/inc/pch/precompiled_desktop.cxx
index f95c8300208b..24d7e45f222d 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.cxx
+++ b/desktop/inc/pch/precompiled_desktop.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_desktop.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_desktop.hxx b/desktop/inc/pch/precompiled_desktop.hxx
index 796ed48aa7a2..6baa50c69781 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.hxx
+++ b/desktop/inc/pch/precompiled_desktop.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
#include "tools/debug.hxx"
#include "unotools/configmgr.hxx"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 08:32:46 +0000