From 287bc0aab7a848b991266586737b53630332b987 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 14 Sep 2010 20:05:34 +0200 Subject: Kill the migration wizard for good. Extends default-no-startup-wizard.diff and desktop-disable-startup-registration.diff. --- desktop/source/splash/firststart.cxx | 156 --------------------------------- desktop/source/splash/firststart.hxx | 90 ------------------- desktop/source/splash/makefile.mk | 5 +- desktop/source/splash/services_spl.cxx | 5 -- 4 files changed, 1 insertion(+), 255 deletions(-) delete mode 100755 desktop/source/splash/firststart.cxx delete mode 100755 desktop/source/splash/firststart.hxx (limited to 'desktop/source/splash') diff --git a/desktop/source/splash/firststart.cxx b/desktop/source/splash/firststart.cxx deleted file mode 100755 index 21a0a562269a..000000000000 --- a/desktop/source/splash/firststart.cxx +++ /dev/null @@ -1,156 +0,0 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - -#include "firststart.hxx" -#include "../migration/wizard.hxx" -#include - -using namespace rtl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; - -namespace desktop{ - - -const char* FirstStart::interfaces[] = -{ - "com.sun.star.task.XJob", - NULL, -}; -const char* FirstStart::implementationName = "com.sun.star.comp.desktop.FirstStart"; -const char* FirstStart::serviceName = "com.sun.star.task.Job"; - -OUString FirstStart::GetImplementationName() -{ - return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationName)); -} - -Sequence< OUString > FirstStart::GetSupportedServiceNames() -{ - sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1; - Sequence< OUString > aResult( nSize ); - - for( sal_Int32 i = 0; i < nSize; i++ ) - aResult[i] = OUString::createFromAscii( interfaces[i] ); - return aResult; -} - -Reference< XInterface > SAL_CALL FirstStart::CreateInstance( - const Reference< XMultiServiceFactory >& rSMgr ) -{ - static osl::Mutex aMutex; - osl::MutexGuard guard( aMutex ); - return (XComponent*) ( new FirstStart( rSMgr ) ); -} - -FirstStart::FirstStart( const Reference< XMultiServiceFactory >& xFactory ) : - m_aListeners( m_aMutex ), - m_xServiceManager( xFactory ) -{ -} - -FirstStart::~FirstStart() -{ -} - -// XComponent -void SAL_CALL FirstStart::dispose() throw ( RuntimeException ) -{ - EventObject aObject; - aObject.Source = (XComponent*)this; - m_aListeners.disposeAndClear( aObject ); -} - -void SAL_CALL FirstStart::addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException ) -{ - m_aListeners.addInterface( aListener ); -} - -void SAL_CALL FirstStart::removeEventListener( const Reference< XEventListener > & aListener ) throw ( RuntimeException ) -{ - m_aListeners.removeInterface( aListener ); -} - -// XServiceInfo -::rtl::OUString SAL_CALL FirstStart::getImplementationName() -throw ( RuntimeException ) -{ - return FirstStart::GetImplementationName(); -} - -sal_Bool SAL_CALL FirstStart::supportsService( const ::rtl::OUString& rServiceName ) -throw ( RuntimeException ) -{ - sal_Int32 nSize = sizeof( interfaces ) / sizeof( const char *); - - for( sal_Int32 i = 0; i < nSize; i++ ) - if ( rServiceName.equalsAscii( interfaces[i] )) - return sal_True; - return sal_False; -} - -Sequence< ::rtl::OUString > SAL_CALL FirstStart::getSupportedServiceNames() -throw ( RuntimeException ) -{ - return FirstStart::GetSupportedServiceNames(); -} - -// XJob -Any SAL_CALL FirstStart::execute(const Sequence& args) -throw ( RuntimeException ) -{ - static const ::rtl::OUString ARG_LICENSENEEDED( RTL_CONSTASCII_USTRINGPARAM( "LicenseNeedsAcceptance" ) ); - static const ::rtl::OUString ARG_LICENSEPATH( RTL_CONSTASCII_USTRINGPARAM( "LicensePath" ) ); - - ::comphelper::SequenceAsHashMap lArgs(args); - - sal_Bool bLicenseNeeded = lArgs.getUnpackedValueOrDefault( ARG_LICENSENEEDED, (sal_Bool)sal_True ); - rtl::OUString aLicensePath = lArgs.getUnpackedValueOrDefault( ARG_LICENSEPATH, rtl::OUString() ); - - FirstStartWizard fsw( NULL, bLicenseNeeded && ( aLicensePath.getLength() > 0 ), aLicensePath ); - return makeAny( (sal_Bool)fsw.Execute() ); -} - -// XJobExecutor -void SAL_CALL FirstStart::trigger(const OUString&) -throw ( RuntimeException ) -{ - // trigger wizard with override, so it gets started regardless of - // configuration - Sequence seq(1); - seq[0] = NamedValue( - OUString::createFromAscii("Override"), - makeAny(sal_True)); - execute(seq); -} - - -} // namespace desktop diff --git a/desktop/source/splash/firststart.hxx b/desktop/source/splash/firststart.hxx deleted file mode 100755 index fe45833cfae7..000000000000 --- a/desktop/source/splash/firststart.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SOCOMP_FIRSTSTART_HXX_ -#define _SOCOMP_FIRSTSTART_HXX_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::task; - -namespace desktop{ - -class FirstStart : public ::cppu::WeakImplHelper4< XJob, XJobExecutor, XComponent, XServiceInfo > -{ - -private: - ::osl::Mutex m_aMutex; - ::cppu::OInterfaceContainerHelper m_aListeners; - Reference< XMultiServiceFactory > m_xServiceManager; - -public: - FirstStart( const Reference < XMultiServiceFactory >& xFactory ); - virtual ~FirstStart(); - - static ::rtl::OUString GetImplementationName(); - static Sequence< rtl::OUString > GetSupportedServiceNames(); - - - // XComponent - virtual void SAL_CALL dispose() throw ( RuntimeException ); - virtual void SAL_CALL addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException ); - virtual void SAL_CALL removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException ); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); - - //XJob - virtual Any SAL_CALL execute(const Sequence& args)throw ( RuntimeException ); - //XJobExecutor - virtual void SAL_CALL trigger(const rtl::OUString& arg)throw ( RuntimeException ); - - static const char* interfaces[]; - static const char* implementationName; - static const char* serviceName; - static Reference SAL_CALL CreateInstance( - const Reference< XMultiServiceFactory >&); - - -}; -} - -#endif // _SOCOMP_FIRSTSTART_HXX_ diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 89609687438c..ae97a607cc39 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -40,13 +40,10 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES = $(SLO)$/splash.obj \ - $(SLO)$/firststart.obj \ $(SLO)$/services_spl.obj SHL1DEPN= makefile.mk SHL1OBJS= $(SLOFILES) \ - $(SLO)$/pages.obj \ - $(SLO)$/wizard.obj \ $(SLO)$/migration.obj \ $(SLO)$/cfgfilter.obj @@ -65,7 +62,7 @@ SHL1STDLIBS= \ $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(UCBHELPERLIB) \ + $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(VOSLIB) \ diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 349ec2ec0a78..7c2bb1133c68 100755 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -35,7 +35,6 @@ #include #include "splash.hxx" -#include "firststart.hxx" using namespace rtl; @@ -48,14 +47,12 @@ using namespace ::desktop; static const char* pServices[] = { SplashScreen::serviceName, - FirstStart::serviceName, NULL }; static const char* pImplementations[] = { SplashScreen::implementationName, - FirstStart::implementationName, NULL }; @@ -64,7 +61,6 @@ typedef Reference(* fProvider)(const Reference static const fProvider pInstanceProviders[] = { SplashScreen::getInstance, - FirstStart::CreateInstance, NULL }; @@ -72,7 +68,6 @@ static const fProvider pInstanceProviders[] = static const char** pSupportedServices[] = { SplashScreen::interfaces, - FirstStart::interfaces, NULL }; -- cgit on> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sfx2/AllLangMoTarget_sfx2.mk
AgeCommit message (Expand)Author