Skip to content

C
core
Kaydet (Commit) 287bc0aa authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

Kill the migration wizard for good. 

Extends default-no-startup-wizard.diff and desktop-disable-startup-registration.diff.
üst 4843a465
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 713 deletions
desktop/source/app/app.cxx
Dosyayı görüntüle @ 287bc0aa
......@@ -47,7 +47,7 @@
#include "userinstall.hxx"
#include "desktopcontext.hxx"
#include "exithelper.hxx"
#include "../migration/pages.hxx"
#include "../migration/migration.hxx"
#include <svtools/javacontext.hxx>
#include <com/sun/star/frame/XSessionManagerListener.hpp>
......@@ -1710,37 +1710,9 @@ void Desktop::Main()
bool bAbort = CheckExtensionDependencies();
if ( bAbort )
return;
// First Start Wizard allowed ?
if ( ! pCmdLineArgs->IsNoFirstStartWizard())
{
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ FirstStartWizard" );
if (IsFirstStartWizardNeeded())
{
::utl::RegOptions().removeReminder(); // remove patch registration reminder
Reference< XJob > xFirstStartJob( xSMgr->createInstance(
DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
if (xFirstStartJob.is())
{
sal_Bool bDone = sal_False;
Sequence< NamedValue > lArgs(2);
lArgs[0].Name = ::rtl::OUString::createFromAscii("LicenseNeedsAcceptance");
lArgs[0].Value <<= LicenseNeedsAcceptance();
lArgs[1].Name = ::rtl::OUString::createFromAscii("LicensePath");
lArgs[1].Value <<= GetLicensePath();
xFirstStartJob->execute(lArgs) >>= bDone;
if ( !bDone )
{
return;
}
}
}
else if ( RegistrationPage::hasReminderDateCome() )
RegistrationPage::executeSingleMode();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
}
if ( Migration::checkMigration() )
Migration::doMigration();
// keep a language options instance...
pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
......
desktop/source/migration/makefile.mk
Dosyayı görüntüle @ 287bc0aa
......@@ -45,14 +45,8 @@ CDEFS+=-I..$/app
SLOFILES = \
$(SLO)$/migration.obj \
$(SLO)$/wizard.obj \
$(SLO)$/pages.obj \
$(SLO)$/cfgfilter.obj
SRS1NAME= wizard
SRC1FILES= wizard.src
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
......
desktop/source/migration/migration.cxx 100755 → 100644
Dosyayı görüntüle @ 287bc0aa
File mode changed from 100755 to 100644
desktop/source/migration/pages.cxx deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
This diff is collapsed.
desktop/source/migration/pages.hxx deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
/*************************************************************************
*
* 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 _PAGES_HXX_
#define _PAGES_HXX_
#include <vcl/tabpage.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/scrbar.hxx>
#include <svtools/wizardmachine.hxx>
#include <svtools/svmedit.hxx>
#include <svl/lstner.hxx>
#include <svtools/xtextedt.hxx>
#include <com/sun/star/awt/XThrobber.hpp>
namespace desktop
{
class WelcomePage : public svt::OWizardPage
{
private:
FixedText m_ftHead;
FixedText m_ftBody;
svt::OWizardMachine *m_pParent;
sal_Bool m_bLicenseNeedsAcceptance;
enum OEMType
{
OEM_NONE, OEM_NORMAL, OEM_EXTENDED
};
bool bIsEvalVersion;
bool bNoEvalText;
void checkEval();
public:
WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_Bool bLicenseNeedsAcceptance );
protected:
virtual void ActivatePage();
};
class LicenseView : public MultiLineEdit, public SfxListener
{
BOOL mbEndReached;
Link maEndReachedHdl;
Link maScrolledHdl;
public:
LicenseView( Window* pParent, const ResId& rResId );
~LicenseView();
void ScrollDown( ScrollType eScroll );
BOOL IsEndReached() const;
BOOL EndReached() const { return mbEndReached; }
void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
void SetEndReachedHdl( const Link& rHdl ) { maEndReachedHdl = rHdl; }
const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
void SetScrolledHdl( const Link& rHdl ) { maScrolledHdl = rHdl; }
const Link& GetScrolledHdl() const { return maScrolledHdl; }
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
protected:
using MultiLineEdit::Notify;
};
class LicensePage : public svt::OWizardPage
{
private:
svt::OWizardMachine *m_pParent;
FixedText m_ftHead;
FixedText m_ftBody1;
FixedText m_ftBody1Txt;
FixedText m_ftBody2;
FixedText m_ftBody2Txt;
LicenseView m_mlLicense;
PushButton m_pbDown;
sal_Bool m_bLicenseRead;
public:
LicensePage( svt::OWizardMachine* parent, const ResId& resid, const rtl::OUString &rLicensePath );
private:
DECL_LINK(PageDownHdl, PushButton*);
DECL_LINK(EndReachedHdl, LicenseView*);
DECL_LINK(ScrolledHdl, LicenseView*);
protected:
virtual bool canAdvance() const;
virtual void ActivatePage();
};
class MigrationPage : public svt::OWizardPage
{
private:
FixedText m_ftHead;
FixedText m_ftBody;
CheckBox m_cbMigration;
sal_Bool m_bMigrationDone;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
public:
MigrationPage( svt::OWizardMachine* parent, const ResId& resid, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber );
virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
protected:
virtual void ActivatePage();
};
class UserPage : public svt::OWizardPage
{
private:
FixedText m_ftHead;
FixedText m_ftBody;
FixedText m_ftFirst;
Edit m_edFirst;
FixedText m_ftLast;
Edit m_edLast;
FixedText m_ftInitials;
Edit m_edInitials;
FixedText m_ftFather;
Edit m_edFather;
LanguageType m_lang;
public:
UserPage( svt::OWizardMachine* parent, const ResId& resid);
virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
protected:
virtual void ActivatePage();
};
class UpdateCheckPage : public svt::OWizardPage
{
private:
FixedText m_ftHead;
FixedText m_ftBody;
CheckBox m_cbUpdateCheck;
public:
UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid);
virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
protected:
virtual void ActivatePage();
};
class RegistrationPage : public svt::OWizardPage
{
private:
FixedText m_ftHeader;
FixedText m_ftBody;
RadioButton m_rbNow;
RadioButton m_rbLater;
RadioButton m_rbNever;
FixedLine m_flSeparator;
FixedText m_ftEnd;
sal_Bool m_bNeverVisible;
void updateButtonStates();
void impl_retrieveConfigurationData();
protected:
virtual bool canAdvance() const;
virtual void ActivatePage();
virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
public:
RegistrationPage( Window* parent, const ResId& resid);
enum RegistrationMode
{
rmNow, // register now
rmLater, // register later
rmNever // register never
};
RegistrationMode getRegistrationMode() const;
void prepareSingleMode();
inline String getSingleModeTitle() const { return m_ftHeader.GetText(); }
static bool hasReminderDateCome();
static void executeSingleMode();
};
} // namespace desktop
#endif // #ifndef _PAGES_HXX_
desktop/source/migration/services/migrationoo3.map 100755 → 100644
Dosyayı görüntüle @ 287bc0aa
File mode changed from 100755 to 100644
desktop/source/migration/wizard.cxx deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
This diff is collapsed.
desktop/source/migration/wizard.hrc deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
/*************************************************************************
*
* 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.
*
************************************************************************/
#include "desktop.hrc"
#include "helpid.hrc"
#define TP_WIDTH 220
#define TP_HEIGHT 205
#define DLG_FIRSTSTART_WIZARD RID_FIRSTSTSTART_START+1
// FREE
#define TP_WELCOME RID_FIRSTSTSTART_START+3
#define TP_REGISTRATION RID_FIRSTSTSTART_START+4
#define TP_MIGRATION RID_FIRSTSTSTART_START+5
#define TP_USER RID_FIRSTSTSTART_START+6
#define TP_LICENSE RID_FIRSTSTSTART_START+7
#define TP_UPDATE_CHECK RID_FIRSTSTSTART_START+8
#define ERRBOX_REG_NOSYSBROWSER RID_FIRSTSTSTART_START+29
#define QB_ASK_DECLINE RID_FIRSTSTSTART_START+30
// local resIDs
#define FT_WELCOME_HEADER 1
#define FT_WELCOME_BODY 2
#define FT_LICENSE_HEADER 1
#define FT_LICENSE_BODY_1 2
#define FT_LICENSE_BODY_1_TXT 3
#define FT_LICENSE_BODY_2 4
#define FT_LICENSE_BODY_2_TXT 5
#define ML_LICENSE 6
#define PB_LICENSE_DOWN 7
#define FT_MIGRATION_HEADER 1
#define FT_MIGRATION_BODY 2
#define CB_MIGRATION 3
#define FT_UPDATE_CHECK_HEADER 1
#define FT_UPDATE_CHECK_BODY 2
#define CB_UPDATE_CHECK 3
#define FT_REGISTRATION_HEADER 1
#define FT_REGISTRATION_BODY 2
#define FL_REGISTRATION 3
#define FT_REGISTRATION_END 4
#define RB_REGISTRATION_NOW 5
#define RB_REGISTRATION_LATER 6
#define RB_REGISTRATION_NEVER 7
#define RB_REGISTRATION_REG 8
#define IMG_REGISTRATION 9
#define FT_USER_HEADER 10
#define FT_USER_BODY 11
#define FT_USER_FIRST 12
#define FT_USER_LAST 13
#define FT_USER_FATHER 14
#define FT_USER_INITIALS 15
#define ED_USER_FIRST 16
#define ED_USER_LAST 17
#define ED_USER_FATHER 18
#define ED_USER_INITIALS 19
#define TR_WAITING 20
// global strings
#define STR_STATE_WELCOME RID_FIRSTSTSTART_START+100
#define STR_STATE_LICENSE RID_FIRSTSTSTART_START+101
#define STR_STATE_MIGRATION RID_FIRSTSTSTART_START+102
#define STR_STATE_REGISTRATION RID_FIRSTSTSTART_START+103
#define STR_WELCOME_MIGRATION RID_FIRSTSTSTART_START+104
// FREE RID_FIRSTSTSTART_START+105
// FREE RID_FIRSTSTSTART_START+106
#define STR_LICENSE_ACCEPT RID_FIRSTSTSTART_START+107
#define STR_LICENSE_DECLINE RID_FIRSTSTSTART_START+108
#define STR_FINISH RID_FIRSTSTSTART_START+109
#define STR_STATE_USER RID_FIRSTSTSTART_START+110
// FREE RID_FIRSTSTSTART_START+111
#define STR_STATE_UPDATE_CHECK RID_FIRSTSTSTART_START+112
#define STR_WELCOME_WITHOUT_LICENSE RID_FIRSTSTSTART_START+113
#define STR_REGISTRATION_OOO RID_FIRSTSTSTART_START+114
desktop/source/migration/wizard.hxx deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
/*************************************************************************
*
* 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 _WIZARD_HXX_
#define _WIZARD_HXX_
#include <rtl/ustring.hxx>
#include <svtools/roadmapwizard.hxx>
#include <vcl/window.hxx>
#include <tools/resid.hxx>
#include <com/sun/star/awt/XThrobber.hpp>
namespace desktop
{
class WizardResId : public ResId
{
public:
WizardResId( USHORT nId );
};
class FirstStartWizard : public svt::RoadmapWizard
{
public:
static const WizardState STATE_WELCOME;
static const WizardState STATE_LICENSE;
static const WizardState STATE_MIGRATION;
static const WizardState STATE_USER;
static const WizardState STATE_UPDATE_CHECK;
static const WizardState STATE_REGISTRATION;
static ResMgr* pResMgr;
static ResMgr* GetResManager();
FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAcceptance, const rtl::OUString &rLicensePath );
virtual short Execute();
virtual long PreNotify( NotifyEvent& rNEvt );
void DisableButtonsWhileMigration();
private:
sal_Bool m_bOverride;
WizardState _currentState;
::svt::RoadmapWizardTypes::PathId m_aDefaultPath;
::svt::RoadmapWizardTypes::PathId m_aMigrationPath;
String m_sNext;
String m_sCancel;
sal_Bool m_bDone;
sal_Bool m_bLicenseNeedsAcceptance;
sal_Bool m_bLicenseWasAccepted;
sal_Bool m_bAutomaticUpdChk;
Link m_lnkCancel;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
rtl::OUString m_aLicensePath;
void storeAcceptDate();
void setPatchLevel();
void disableWizard();
void enableQuickstart();
DECL_LINK(DeclineHdl, PushButton*);
void cleanOldOfficeRegKeys();
sal_Bool showOnlineUpdatePage();
::svt::RoadmapWizardTypes::PathId defineWizardPagesDependingFromContext();
protected:
// from svt::WizardMachine
virtual TabPage* createPage(WizardState _nState);
virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
virtual sal_Bool leaveState(WizardState _nState );
virtual sal_Bool onFinish();
virtual void enterState(WizardState _nState);
// from svt::RoadmapWizard
virtual String getStateDisplayName( WizardState _nState ) const;
};
}
#endif
desktop/source/migration/wizard.src deleted 100644 → 0
Dosyayı görüntüle @ 4843a465
This diff is collapsed.
desktop/source/splash/firststart.cxx deleted 100755 → 0
Dosyayı görüntüle @ 4843a465
/*************************************************************************
*
* 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.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_desktop.hxx"
#include "firststart.hxx"
#include "../migration/wizard.hxx"
#include <comphelper/sequenceashashmap.hxx>
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<NamedValue>& 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<NamedValue> seq(1);
seq[0] = NamedValue(
OUString::createFromAscii("Override"),
makeAny(sal_True));
execute(seq);
}
} // namespace desktop
desktop/source/splash/firststart.hxx deleted 100755 → 0
Dosyayı görüntüle @ 4843a465
/*************************************************************************
*
* 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 _SOCOMP_FIRSTSTART_HXX_
#define _SOCOMP_FIRSTSTART_HXX_
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <com/sun/star/task/XJobExecutor.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/mutex.hxx>
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<NamedValue>& 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<XInterface> SAL_CALL CreateInstance(
const Reference< XMultiServiceFactory >&);
};
}
#endif // _SOCOMP_FIRSTSTART_HXX_
desktop/source/splash/makefile.mk
Dosyayı görüntüle @ 287bc0aa
......@@ -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) \
......
desktop/source/splash/services_spl.cxx
Dosyayı görüntüle @ 287bc0aa
......@@ -35,7 +35,6 @@
#include <unotools/configmgr.hxx>
#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<XInterface>(* fProvider)(const Reference<XMultiServiceFactory>
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
};
......
desktop/util/makefile.mk
Dosyayı görüntüle @ 287bc0aa
......@@ -71,8 +71,7 @@ LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//)
RESLIB1NAME= dkt
RESLIB1IMAGES= $(PRJ)$/res
RESLIB1SRSFILES= $(SRS)$/desktop.srs \
$(SRS)$/wizard.srs
RESLIB1SRSFILES= $(SRS)$/desktop.srs
.IF "$(L10N_framework)"==""
.IF "$(LINK_SO)"=="TRUE"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment