On 4 July 2011 16:21, Michael Meeks <michael.meeks@novell.com> wrote:
Hi Matus,
On Sat, 2011-07-02 at 19:23 +0200, Matúš Kukan wrote:
Well, it turned out re-applying was not necessary in the end. Just to
remove unused files. I've git push-ed that.
The patches look lovely to me. Did we kill the OEM mess too ?
I didn't send those, so here they are.
But you must first apply the one about socomp and then preload
cleaning. Hope it will be apply-able.
Thanks,
Matus
From 51144218a4556d49fe14aa83149955437cd9e081 Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sat, 2 Jul 2011 18:43:19 +0200
Subject: [PATCH] Remove socomp library related code
---
desktop/inc/app.hxx | 1 -
desktop/prj/build.lst | 3 +-
desktop/prj/d.lst | 4 -
desktop/source/app/app.cxx | 26 ----
desktop/source/app/checkinstall.cxx | 122 ---------------
desktop/source/app/checkinstall.hxx | 45 ------
desktop/source/app/makefile.mk | 1 -
desktop/source/app/officeipcthread.cxx | 8 +-
desktop/source/so_comp/evaluation.cxx | 209 --------------------------
desktop/source/so_comp/evaluation.hxx | 95 ------------
desktop/source/so_comp/makefile.mk | 79 ----------
desktop/source/so_comp/oemjob.cxx | 250 -------------------------------
desktop/source/so_comp/oemjob.hxx | 95 ------------
desktop/source/so_comp/services.cxx | 135 -----------------
desktop/source/so_comp/socomp.component | 37 -----
sfx2/source/appl/shutdowniconw32.cxx | 36 +----
16 files changed, 7 insertions(+), 1139 deletions(-)
delete mode 100644 desktop/source/app/checkinstall.cxx
delete mode 100644 desktop/source/app/checkinstall.hxx
delete mode 100644 desktop/source/so_comp/evaluation.cxx
delete mode 100644 desktop/source/so_comp/evaluation.hxx
delete mode 100755 desktop/source/so_comp/makefile.mk
delete mode 100644 desktop/source/so_comp/oemjob.cxx
delete mode 100644 desktop/source/so_comp/oemjob.hxx
delete mode 100644 desktop/source/so_comp/services.cxx
delete mode 100755 desktop/source/so_comp/socomp.component
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 9b514b0..ef181ca 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -126,7 +126,6 @@ class Desktop : public Application
return m_aBootstrapStatus;
}
- static sal_Bool CheckOEM();
static sal_Bool isCrashReporterEnabled();
// first-start (ever) related methods
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index e9a287a..4e59c5f 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -6,7 +6,6 @@ dt desktop\res get
- all dt_res NULL
dt desktop\source\app nmake - all
dt_app dt_migr dt_inc dt_dp_misc NULL
dt desktop\source\migration nmake - all dt_migr
dt_inc NULL
dt desktop\source\migration\services nmake - all dt_services dt_inc
dt_dp_misc NULL
-dt desktop\source\so_comp nmake - all dt_so_comp
dt_inc NULL
dt desktop\source\offacc nmake - all dt_offac
dt_inc NULL
dt desktop\source\splash nmake - all dt_spl
dt_migr dt_inc NULL
dt desktop\win32\source nmake - w dt_wrapper
dt_inc NULL
@@ -40,7 +39,7 @@ dt desktop\source\deployment\registry\configuration nmake - all
dt_dp_registry_c
dt desktop\source\deployment\registry\help nmake - all
dt_dp_registry_help dt_inc NULL
dt desktop\source\deployment\registry\executable nmake - all
dt_dp_registry_executable dt_inc NULL
dt desktop\scripts nmake - u
dt_scripts dt_inc NULL
-dt desktop\util nmake - all
dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w
dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w dt_zipintro
NULL
+dt desktop\util nmake - all
dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w
dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w dt_zipintro NULL
dt desktop\zipintro nmake - all
dt_zipintro NULL
dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig
NULL
dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 38bdf49..6287afa 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -50,7 +50,6 @@ mkdir: %_DEST%\bin\odf4ms
..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin\soffice.bin.manifest
..\%__SRC%\bin\wrp*.dll %_DEST%\bin\wrp*.dll
..\%__SRC%\bin\spl*.dll %_DEST%\bin\spl*.dll
-..\%__SRC%\bin\socomp.dll %_DEST%\bin\socomp.dll
..\%__SRC%\obj\officeloader.obj %_DEST%\lib\officeloader.obj
..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib\extendloaderenvironment.obj
..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib\copyright_ascii_sun.obj
@@ -59,8 +58,6 @@ mkdir: %_DEST%\bin\odf4ms
..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib\libwrp*.dylib
..\%__SRC%\lib\libspl*.so %_DEST%\lib\libspl*.so
..\%__SRC%\lib\libspl*.dylib %_DEST%\lib\libspl*.dylib
-..\%__SRC%\lib\libsocomp.so %_DEST%\lib\libsocomp.so
-..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib\libsocomp.dylib
..\%__SRC%\bin\offacc*.dll %_DEST%\bin\offacc*.dll
..\%__SRC%\lib\liboffacc*.so %_DEST%\lib\liboffacc*.so
..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib\liboffacc*.dylib
@@ -147,6 +144,5 @@ mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
..\%__SRC%\misc\migrationoo2.component %_DEST%\xml\migrationoo2.component
..\%__SRC%\misc\migrationoo3.component %_DEST%\xml\migrationoo3.component
..\%__SRC%\misc\offacc.component %_DEST%\xml\offacc.component
-..\%__SRC%\misc\socomp.component %_DEST%\xml\socomp.component
..\%__SRC%\misc\spl.component %_DEST%\xml\spl.component
..\%__SRC%\misc\splash.component %_DEST%\xml\splash.component
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2d3950d..46abbad 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -43,7 +43,6 @@
#include "dispatchwatcher.hxx"
#include "configinit.hxx"
#include "lockfile.hxx"
-#include "checkinstall.hxx"
#include "cmdlinehelp.hxx"
#include "userinstall.hxx"
#include "desktopcontext.hxx"
@@ -1672,14 +1671,6 @@ int Desktop::Main()
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
delete pLabelResMgr;
- // Check for StarOffice/Suite specific extensions runs also with OpenOffice installation
sets
- OUString aTitleString( aTitle );
- bCheckOk = CheckInstallation( aTitleString );
- if ( !bCheckOk )
- return EXIT_FAILURE;
- else
- aTitle = aTitleString;
-
#ifdef DBG_UTIL
//include version ID in non product builds
::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
@@ -2234,23 +2225,6 @@ void Desktop::EnableOleAutomation()
#endif
}
-sal_Bool Desktop::CheckOEM()
-{
- Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
- Reference<XJob> rOemJob(rFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.OEMPreloadJob"))),
- UNO_QUERY );
- Sequence<NamedValue> args;
- sal_Bool bResult = sal_False;
- if (rOemJob.is()) {
- Any aResult = rOemJob->execute(args);
- aResult >>= bResult;
- return bResult;
- } else {
- return sal_True;
- }
-}
-
void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory();
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
deleted file mode 100644
index 52f6c6d..0000000
--- a/desktop/source/app/checkinstall.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "checkinstall.hxx"
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
-#include <tools/date.hxx>
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-
-using ::rtl::OUString;
-
-namespace desktop
-{
-
-sal_Bool CheckInstallation( OUString& rTitle )
-{
- try
- {
- Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
- Reference< XExactName > xExactName( xSMgr->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.desktop.Evaluation" ))),
- UNO_QUERY );
- if ( xExactName.is() )
- {
- try
- {
- rTitle = xExactName->getExactName( rTitle );
- Reference< XMaterialHolder > xMaterialHolder( xExactName, UNO_QUERY );
- if ( xMaterialHolder.is() )
- {
- com::sun::star::util::Date aExpirationDate;
- Any a = xMaterialHolder->getMaterial();
- if ( a >>= aExpirationDate )
- {
- Date aToday;
- Date aTimeBombDate( aExpirationDate.Day, aExpirationDate.Month,
aExpirationDate.Year );
- if ( aToday > aTimeBombDate )
- {
- InfoBox aInfoBox( NULL, String::CreateFromAscii( "This version has
expired" ) );
- aInfoBox.Execute();
- return sal_False;
- }
- }
-
- return sal_True;
- }
- else
- {
- InfoBox aInfoBox( NULL, rTitle );
- aInfoBox.Execute();
- return sal_False;
- }
- }
- catch ( RuntimeException& )
- {
- // Evaluation version expired!
- return sal_False;
- }
- }
- else
- {
- Reference< com::sun::star::container::XContentEnumerationAccess > rContent( xSMgr ,
UNO_QUERY );
- if( rContent.is() )
- {
- OUString sEvalService = OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.office.Evaluation" ) );
- Reference < com::sun::star::container::XEnumeration > rEnum =
rContent->createContentEnumeration( sEvalService );
- if ( rEnum.is() )
- {
- InfoBox aInfoBox( NULL, rTitle );
- aInfoBox.Execute();
- return sal_False;
- }
- }
- }
- }
- catch(Exception)
- {
- }
-
- return sal_True;
-}
-
-} // namespace desktop
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
deleted file mode 100644
index f37d5ee..0000000
--- a/desktop/source/app/checkinstall.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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_CHECKINSTALL_HXX_
-#define _DESKTOP_CHECKINSTALL_HXX_
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-
-namespace desktop
-{
-
-sal_Bool CheckInstallation( rtl::OUString& rTitle );
-
-}
-
-#endif // _DESKTOP_CHECKINSTALL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 4a3d084..f905bd6 100755
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -61,7 +61,6 @@ SHL1OBJS = \
$(SLO)$/appfirststart.obj \
$(SLO)$/appinit.obj \
$(SLO)$/appsys.obj \
- $(SLO)$/checkinstall.obj \
$(SLO)$/check_ext_deps.obj \
$(SLO)$/cmdlineargs.obj \
$(SLO)$/cmdlinehelp.obj \
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index dcde366..3540ad0 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -719,7 +719,7 @@ void SAL_CALL OfficeIPCThread::run()
// handle request for acceptor
OUString aAcceptString;
- if ( aCmdLineArgs->GetAcceptString(aAcceptString) && Desktop::CheckOEM()) {
+ if ( aCmdLineArgs->GetAcceptString(aAcceptString) ) {
ApplicationEvent* pAppEvent =
new ApplicationEvent( aEmpty, aEmpty,
"ACCEPT", aAcceptString );
@@ -772,7 +772,7 @@ void SAL_CALL OfficeIPCThread::run()
// we only do this if no document was specified on the command line,
// since this would be inconsistent with the the behaviour of
// the first process, see OpenClients() (call to OpenDefault()) in app.cxx
- if ( aCmdLineArgs->HasModuleParam() && Desktop::CheckOEM() && (!bDocRequestSent))
+ if ( aCmdLineArgs->HasModuleParam() && (!bDocRequestSent) )
{
SvtModuleOptions aOpt;
SvtModuleOptions::EFactory eFactory = SvtModuleOptions::E_WRITER;
@@ -801,7 +801,7 @@ void SAL_CALL OfficeIPCThread::run()
}
}
- if (!aCmdLineArgs->IsQuickstart() && Desktop::CheckOEM()) {
+ if ( !aCmdLineArgs->IsQuickstart() ) {
sal_Bool bShowHelp = sal_False;
rtl::OUStringBuffer aHelpURLBuffer;
if (aCmdLineArgs->IsHelpWriter()) {
@@ -844,7 +844,7 @@ void SAL_CALL OfficeIPCThread::run()
}
}
- if ( bDocRequestSent && Desktop::CheckOEM())
+ if ( bDocRequestSent )
{
// Send requests to dispatch watcher if we have at least one. The receiver
// is responsible to delete the request after processing it.
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
deleted file mode 100644
index aa113b4..0000000
--- a/desktop/source/so_comp/evaluation.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "evaluation.hxx"
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <uno/environment.h>
-#include <cppuhelper/factory.hxx>
-#include <unotools/configmgr.hxx>
-#include <vcl/msgbox.hxx>
-#include <tools/resmgr.hxx>
-#include <tools/resid.hxx>
-#include "../app/desktop.hrc"
-
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-
-using ::rtl::OUString;
-
-namespace desktop {
-
-static SOEvaluation* pSOEval=0;
-
-const char* SOEvaluation::interfaces[] =
-{
- "com.sun.star.beans.XExactName",
- "com.sun.star.beans.XMaterialHolder",
- "com.sun.star.lang.XComponent",
- "com.sun.star.lang.XServiceInfo",
- NULL,
-};
-
-const char* SOEvaluation::implementationName = "com.sun.star.comp.desktop.Evaluation";
-const char* SOEvaluation::serviceName = "com.sun.star.office.Evaluation";
-
-OUString SOEvaluation::GetImplementationName()
-{
- return OUString::createFromAscii(implementationName);
-}
-
-Sequence< OUString > SOEvaluation::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 SOEvaluation::CreateInstance(
- const Reference< XMultiServiceFactory >& rSMgr )
-{
- static osl::Mutex aMutex;
- if ( pSOEval == 0 )
- {
- osl::MutexGuard guard( aMutex );
- if ( pSOEval == 0 )
- return (XComponent*) ( new SOEvaluation( rSMgr ) );
- }
- return (XComponent*)0;
-}
-
-SOEvaluation::SOEvaluation( const Reference< XMultiServiceFactory >& xFactory ) :
- m_aListeners( m_aMutex ),
- m_xServiceManager( xFactory )
-{
-}
-
-SOEvaluation::~SOEvaluation()
-{
-}
-
-// XComponent
-void SAL_CALL SOEvaluation::dispose() throw ( RuntimeException )
-{
- EventObject aObject;
- aObject.Source = (XComponent*)this;
- m_aListeners.disposeAndClear( aObject );
-}
-
-void SAL_CALL SOEvaluation::addEventListener( const Reference< XEventListener > & aListener) throw
( RuntimeException )
-{
- m_aListeners.addInterface( aListener );
-}
-
-void SAL_CALL SOEvaluation::removeEventListener( const Reference< XEventListener > & aListener )
throw ( RuntimeException )
-{
- m_aListeners.removeInterface( aListener );
-}
-
-// XExactName
-rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproximateName ) throw (
RuntimeException )
-{
- // get the tabreg service for an evaluation version
- // without this service office shouldn't run at all
- OUString aTitle = rApproximateName;
- OUString aEval;
- sal_Bool bExpired = sal_True;
- Reference < XMaterialHolder > xHolder( m_xServiceManager->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.tab.tabreg" ) ) ),
UNO_QUERY );
- if ( xHolder.is() )
- {
- // get a sequence of strings for the defined locales
- // a registered version doesn't provide data
- bExpired = sal_False;
- Any aData = xHolder->getMaterial();
- Sequence < NamedValue > aSeq;
- if ( aData >>= aSeq )
- {
- // this is an evaluation version, because it provides "material"
- bExpired = sal_True;
- for (int i=0; i<aSeq.getLength(); i++ )
- {
- NamedValue& rValue = aSeq[i];
- if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("expired")) )
- rValue.Value >>= bExpired;
- else if (rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("title")) )
- rValue.Value >>= aEval;
- }
- // append eval string to title
- aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + aEval;
- if ( bExpired )
- throw RuntimeException();
- }
- }
-
- return aTitle;
-}
-
-// XMaterialHolder
-Any SAL_CALL SOEvaluation::getMaterial() throw( RuntimeException )
-{
- // Time bomb implementation. Return empty Any to do nothing or
- // provide a com::sun::star::util::Date with the time bomb date.
- Any a;
-
- // change here to force recompile 00002
-#ifdef TIMEBOMB
- // Code for extracting/providing time bomb date!
- int nDay = TIMEBOMB % 100;
- int nMonth = ( TIMEBOMB % 10000 ) / 100;
- int nYear = TIMEBOMB / 10000;
- com::sun::star::util::Date aDate( nDay, nMonth, nYear );
- a <<= aDate;
-#endif
- return a;
-}
-
-// XServiceInfo
-::rtl::OUString SAL_CALL SOEvaluation::getImplementationName()
-throw ( RuntimeException )
-{
- return SOEvaluation::GetImplementationName();
-}
-
-sal_Bool SAL_CALL SOEvaluation::supportsService( const ::rtl::OUString& rServiceName )
-throw ( RuntimeException )
-{
- sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *))-1;
-
- for( sal_Int32 i = 0; i < nSize; i++ )
- if ( rServiceName.equalsAscii( interfaces[i] ))
- return sal_True;
- return sal_False;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL SOEvaluation::getSupportedServiceNames()
-throw ( RuntimeException )
-{
- return SOEvaluation::GetSupportedServiceNames();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx
deleted file mode 100644
index a34cc65..0000000
--- a/desktop/source/so_comp/evaluation.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-/* makefile.mk changed 20030409, LO */
-
-#ifndef _SOCOMP_EVALUATION_HXX_
-#define _SOCOMP_EVALUATION_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/lang/XEventListener.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/interfacecontainer.h>
-
-#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;
-
-namespace desktop {
-
-class SOEvaluation : public ::cppu::WeakImplHelper4< XExactName, XMaterialHolder, XComponent,
XServiceInfo >
-{
- ::osl::Mutex m_aMutex;
- ::cppu::OInterfaceContainerHelper m_aListeners;
- Reference< XMultiServiceFactory > m_xServiceManager;
-
-public:
- SOEvaluation( const Reference < XMultiServiceFactory >& xFactory );
- virtual ~SOEvaluation();
-
- static Reference< XSingleServiceFactory > GetSOEvaluationFactory( Reference<
XMultiServiceFactory > & xSMgr );
- 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 );
-
- // XExactName
- virtual rtl::OUString SAL_CALL getExactName( const rtl::OUString& rApproximateName
) throw ( RuntimeException );
-
- // XMaterialHolder
- virtual Any SAL_CALL getMaterial() 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 );
-
- static const char* interfaces[];
- static const char* implementationName;
- static const char* serviceName;
- static Reference<XInterface> SAL_CALL CreateInstance(
- const Reference< XMultiServiceFactory >&);
-
-
-
-};
-}
-#endif // _SOCOMP_EVALUATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
deleted file mode 100755
index 4d8d479..0000000
--- a/desktop/source/so_comp/makefile.mk
+++ /dev/null
@@ -1,79 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=desktop
-TARGET=socomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/evaluation.obj \
- $(SLO)$/oemjob.obj \
- $(SLO)$/services.obj
-
-SHL1DEPN= makefile.mk
-SHL1OBJS= $(SLOFILES)
-
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(FWELIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/socomp.component
-
-$(MISC)/socomp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- socomp.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt socomp.component
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
deleted file mode 100644
index d50bab2..0000000
--- a/desktop/source/so_comp/oemjob.cxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "oemjob.hxx"
-#include <rtl/bootstrap.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
-#include <tools/config.hxx>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::Bootstrap;
-
-namespace desktop{
-
-char const OEM_PRELOAD_SECTION[] = "Bootstrap";
-char const OEM_PRELOAD[] = "Preload";
-char const STR_TRUE[] = "1";
-char const STR_FALSE[] = "0";
-
-const char* OEMPreloadJob::interfaces[] =
-{
- "com.sun.star.task.XJob",
- NULL,
-};
-const char* OEMPreloadJob::implementationName = "com.sun.star.comp.desktop.OEMPreloadJob";
-const char* OEMPreloadJob::serviceName = "com.sun.star.office.OEMPreloadJob";
-
-OUString OEMPreloadJob::GetImplementationName()
-{
- return OUString::createFromAscii(implementationName);
-}
-
-Sequence< OUString > OEMPreloadJob::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 OEMPreloadJob::CreateInstance(
- const Reference< XMultiServiceFactory >& rSMgr )
-{
- static osl::Mutex aMutex;
- osl::MutexGuard guard( aMutex );
- return (XComponent*) ( new OEMPreloadJob( rSMgr ) );
-}
-
-OEMPreloadJob::OEMPreloadJob( const Reference< XMultiServiceFactory >& xFactory ) :
- m_aListeners( m_aMutex ),
- m_xServiceManager( xFactory )
-{
-}
-
-OEMPreloadJob::~OEMPreloadJob()
-{
-}
-
-// XComponent
-void SAL_CALL OEMPreloadJob::dispose() throw ( RuntimeException )
-{
- EventObject aObject;
- aObject.Source = (XComponent*)this;
- m_aListeners.disposeAndClear( aObject );
-}
-
-void SAL_CALL OEMPreloadJob::addEventListener( const Reference< XEventListener > & aListener)
throw ( RuntimeException )
-{
- m_aListeners.addInterface( aListener );
-}
-
-void SAL_CALL OEMPreloadJob::removeEventListener( const Reference< XEventListener > & aListener )
throw ( RuntimeException )
-{
- m_aListeners.removeInterface( aListener );
-}
-
-// XServiceInfo
-::rtl::OUString SAL_CALL OEMPreloadJob::getImplementationName()
-throw ( RuntimeException )
-{
- return OEMPreloadJob::GetImplementationName();
-}
-
-sal_Bool SAL_CALL OEMPreloadJob::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 OEMPreloadJob::getSupportedServiceNames()
-throw ( RuntimeException )
-{
- return OEMPreloadJob::GetSupportedServiceNames();
-}
-
-// XJob
-Any SAL_CALL OEMPreloadJob::execute(const Sequence<NamedValue>&)
-throw ( RuntimeException )
-{
- sal_Bool bCont = sal_False;
- // are we an OEM version at all?
- if (checkOEMPreloadFlag())
- {
- // create OEM preload service dialog
- Reference <XExecutableDialog> xDialog( m_xServiceManager->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.preload.OEMPreloadWizard"))),
- UNO_QUERY );
- if ( xDialog.is() ){
- // execute OEM preload dialog and check return value
- if ( xDialog->execute() == ExecutableDialogResults::OK ) {
- // user accepted.
- // make sure the job does not get called again.
- bCont = sal_True;
- disableOEMPreloadFlag();
- } else {
- // user declined...
- // terminate.
- bCont = sal_False;
- }
- }
- } else {
- // don't try again
- bCont = sal_True;
- }
- Any r;
- r <<= bCont;
- return r;
-}
-
-static sal_Bool existsURL( OUString const& _sURL )
-{
- using namespace osl;
- DirectoryItem aDirItem;
-
- if (_sURL.getLength() != 0)
- return ( DirectoryItem::get( _sURL, aDirItem ) == DirectoryItem::E_None );
-
- return sal_False;
-}
-
-// locate soffice.ini/.rc file
-static OUString locateIniFile()
-{
- OUString aUserDataPath;
- OUString aSofficeIniFileURL;
-
- // Retrieve the default file URL for the soffice.ini/rc
- Bootstrap().getIniName( aSofficeIniFileURL );
-
- if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS )
- {
- const char CONFIG_DIR[] = "/config";
-
- sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
- if ( nIndex > 0 )
- {
- OUString aUserSofficeIniFileURL;
- OUStringBuffer aBuffer( aUserDataPath );
- aBuffer.appendAscii( CONFIG_DIR );
- aBuffer.append( aSofficeIniFileURL.copy( nIndex ));
- aUserSofficeIniFileURL = aBuffer.makeStringAndClear();
-
- if ( existsURL( aUserSofficeIniFileURL ))
- return aUserSofficeIniFileURL;
- }
- }
- // Fallback try to use the soffice.ini/rc from program folder
- return aSofficeIniFileURL;
-}
-
-// check whether the OEMPreload flag was set in soffice.ini/.rc
-sal_Bool OEMPreloadJob::checkOEMPreloadFlag()
-{
- OUString aSofficeIniFileURL;
- aSofficeIniFileURL = locateIniFile();
- Config aConfig(aSofficeIniFileURL);
- aConfig.SetGroup( OEM_PRELOAD_SECTION );
- ByteString sResult = aConfig.ReadKey( OEM_PRELOAD );
- if ( sResult == STR_TRUE )
- return sal_True;
- else
- return sal_False;
-}
-
-void OEMPreloadJob::disableOEMPreloadFlag()
-{
- OUString aSofficeIniFileURL = locateIniFile();
- if ( aSofficeIniFileURL.getLength() > 0 )
- {
- Config aConfig(aSofficeIniFileURL);
- aConfig.SetGroup( OEM_PRELOAD_SECTION );
- aConfig.WriteKey( OEM_PRELOAD, STR_FALSE );
- aConfig.Flush();
- }
-}
-
-} // namespace desktop
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx
deleted file mode 100644
index 26c1f09..0000000
--- a/desktop/source/so_comp/oemjob.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- 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 _SOCOMP_OEMJOB_HXX_
-#define _SOCOMP_OEMJOB_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/implbase3.hxx>
-#include <cppuhelper/interfacecontainer.h>
-
-#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 OEMPreloadJob : public ::cppu::WeakImplHelper3< XJob, XComponent, XServiceInfo >
-{
-
-private:
- ::osl::Mutex m_aMutex;
- ::cppu::OInterfaceContainerHelper m_aListeners;
- Reference< XMultiServiceFactory > m_xServiceManager;
-
- sal_Bool checkOEMPreloadFlag();
- void disableOEMPreloadFlag();
-
-public:
- OEMPreloadJob( const Reference < XMultiServiceFactory >& xFactory );
- virtual ~OEMPreloadJob();
-
- 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 );
-
-
- static const char* interfaces[];
- static const char* implementationName;
- static const char* serviceName;
- static Reference<XInterface> SAL_CALL CreateInstance(
- const Reference< XMultiServiceFactory >&);
-
-
-};
-}
-
-#endif // _SOCOMP_OEMJOB_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
deleted file mode 100644
index 014df23..0000000
--- a/desktop/source/so_comp/services.cxx
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "evaluation.hxx"
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <uno/environment.h>
-#include <cppuhelper/factory.hxx>
-#include <unotools/configmgr.hxx>
-
-#include "oemjob.hxx"
-#include "evaluation.hxx"
-
-#include <string.h>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-using namespace ::desktop;
-
-using ::rtl::OUString;
-
-static const char* pServices[] =
-{
- SOEvaluation::serviceName,
- OEMPreloadJob::serviceName,
- NULL
-};
-
-static const char* pImplementations[] =
-{
- SOEvaluation::implementationName,
- OEMPreloadJob::implementationName,
- NULL
-};
-
-typedef Reference<XInterface>(* fProvider)(const Reference<XMultiServiceFactory>&);
-
-static const fProvider pInstanceProviders[] =
-{
- SOEvaluation::CreateInstance,
- OEMPreloadJob::CreateInstance,
- NULL
-};
-
-static const char** pSupportedServices[] =
-{
- SOEvaluation::interfaces,
- OEMPreloadJob::interfaces,
- NULL
-};
-
-static Sequence<OUString>
-getSupportedServiceNames(int p) {
- const char **names = pSupportedServices[p];
- Sequence<OUString> aSeq;
- for(int i = 0; names[i] != NULL; i++) {
- aSeq.realloc(i+1);
- aSeq[i] = OUString::createFromAscii(names[i]);
- }
- return aSeq;
-}
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char** ppEnvironmentTypeName,
- uno_Environment**)
-{
- *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
- const sal_Char* pImplementationName,
- void* pServiceManager,
- void*)
-{
- // Set default return value for this operation - if it failed.
- if ( pImplementationName && pServiceManager )
- {
- Reference< XSingleServiceFactory > xFactory;
- Reference< XMultiServiceFactory > xServiceManager(
- reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
- // search implementation
- for (int i = 0; (pImplementations[i]!=NULL); i++) {
- if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) {
- // found implementation
- xFactory = Reference<XSingleServiceFactory>(cppu::createSingleFactory(
- xServiceManager, OUString::createFromAscii(pImplementationName),
- pInstanceProviders[i], getSupportedServiceNames(i)));
- if ( xFactory.is() ) {
- // Factory is valid - service was found.
- xFactory->acquire();
- return xFactory.get();
- }
- }
- } // for()
- }
- // Return with result of this operation.
- return NULL;
-}
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/socomp.component b/desktop/source/so_comp/socomp.component
deleted file mode 100755
index a530352..0000000
--- a/desktop/source/so_comp/socomp.component
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* 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.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.SharedLibrary"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.desktop.Evaluation">
- <service name="com.sun.star.office.Evaluation"/>
- </implementation>
- <implementation name="com.sun.star.comp.desktop.OEMPreloadJob">
- <service name="com.sun.star.office.OEMPreloadJob"/>
- </implementation>
-</component>
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 5a3094a..697334a 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -50,24 +50,13 @@
#include "app.hrc"
#include <shlobj.h>
#include <objidl.h>
-#include <stdio.h>
-#include <io.h>
#include <osl/thread.h>
#include <setup_native/qswin32.h>
#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
#include <set>
using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
using namespace ::osl;
@@ -442,21 +431,6 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
lP
// -------------------------------
-static sal_Bool checkOEM() {
- Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
- Reference<XJob> rOemJob(rFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.OEMPreloadJob"))),
- UNO_QUERY );
- Sequence<NamedValue> args;
- sal_Bool bResult = sal_False;
- if (rOemJob.is())
- {
- Any aResult = rOemJob->execute(args);
- aResult >>= bResult;
- } else bResult = sal_True;
- return bResult;
-}
-
LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
@@ -471,35 +445,29 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
lP
{
#if defined(USE_APP_SHORTCUTS)
case IDM_OPEN:
- if ( !ShutdownIcon::bModalMode && checkOEM() )
+ if ( !ShutdownIcon::bModalMode )
ShutdownIcon::FileOpen();
break;
case IDM_WRITER:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( WRITER_URL ) ),
OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_CALC:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( CALC_URL ) ),
OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_IMPRESS:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM(
IMPRESS_WIZARD_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_DRAW:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( DRAW_URL ) ),
OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_BASE:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( BASE_URL ) ),
OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_MATH:
- if (checkOEM())
ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( MATH_URL ) ),
OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
break;
case IDM_TEMPLATE:
- if ( !ShutdownIcon::bModalMode && checkOEM())
+ if ( !ShutdownIcon::bModalMode )
ShutdownIcon::FromTemplate();
break;
#endif
--
1.7.1
From 0adba5aaa56e11934f926f64b9d22294342a7f47 Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sat, 2 Jul 2011 18:10:01 +0200
Subject: [PATCH] Remove preload library related code
---
extensions/prj/build.lst | 3 +-
extensions/prj/d.lst | 1 -
extensions/source/preload/makefile.mk | 93 -----
extensions/source/preload/modulepreload.cxx | 34 --
extensions/source/preload/oemwiz.cxx | 445 -------------------------
extensions/source/preload/oemwiz.hxx | 156 ---------
extensions/source/preload/preload.component | 34 --
extensions/source/preload/preload.hrc | 58 ----
extensions/source/preload/preload.src | 290 ----------------
extensions/source/preload/preloadservices.cxx | 73 ----
extensions/source/preload/preloadservices.hxx | 57 ----
extensions/source/preload/services.cxx | 87 -----
extensions/source/preload/unoautopilot.hxx | 109 ------
extensions/source/preload/unoautopilot.inl | 128 -------
14 files changed, 1 insertions(+), 1567 deletions(-)
delete mode 100644 extensions/source/preload/makefile.mk
delete mode 100644 extensions/source/preload/modulepreload.cxx
delete mode 100644 extensions/source/preload/oemwiz.cxx
delete mode 100644 extensions/source/preload/oemwiz.hxx
delete mode 100644 extensions/source/preload/preload.component
delete mode 100644 extensions/source/preload/preload.hrc
delete mode 100644 extensions/source/preload/preload.src
delete mode 100644 extensions/source/preload/preloadservices.cxx
delete mode 100644 extensions/source/preload/preloadservices.hxx
delete mode 100644 extensions/source/preload/services.cxx
delete mode 100644 extensions/source/preload/unoautopilot.hxx
delete mode 100644 extensions/source/preload/unoautopilot.inl
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index b3e7b22..fd883a2 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -25,14 +25,13 @@ ex extensions\source\abpilot nmake - all ex_abpilot ex_in
ex extensions\source\logging nmake - all ex_logging ex_inc NULL
ex extensions\source\oooimprovecore nmake - all ex_oooimprovecore ex_inc NULL
ex extensions\source\oooimprovement nmake - all ex_oooimprovement ex_inc NULL
-ex extensions\source\preload nmake - all ex_preload ex_inc NULL
ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL
ex extensions\source\nsplugin\source nmake - u ex_nsplugin
ex_inc NULL
ex extensions\source\nsplugin\source nmake - w ex_nsplugin
ex_inc NULL
ex extensions\source\update\feed nmake - all ex_updchkfeed ex_inc NULL
ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL
-ex extensions\util nmake - all ex_util ex_preload ex_abpilot
ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
+ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots
ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
# Fails at the moment
# ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index 9d7b7de..8f726eb 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -49,7 +49,6 @@ mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\oooimprovement.component %_DEST%\xml\oooimprovement.component
..\%__SRC%\misc\pcr.component %_DEST%\xml\pcr.component
..\%__SRC%\misc\pl.component %_DEST%\xml\pl.component
-..\%__SRC%\misc\preload.component %_DEST%\xml\preload.component
..\%__SRC%\misc\res.component %_DEST%\xml\res.component
..\%__SRC%\misc\scn.component %_DEST%\xml\scn.component
..\%__SRC%\misc\updatefeed.component %_DEST%\xml\updatefeed.component
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
deleted file mode 100644
index 8bd6226..0000000
--- a/extensions/source/preload/makefile.mk
+++ /dev/null
@@ -1,93 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=preload
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=preload
-CDEFS+=-DCOMPMOD_RESPREFIX=preload
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/services.obj\
- $(SLO)$/modulepreload.obj\
- $(SLO)$/preloadservices.obj\
- $(SLO)$/oemwiz.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= preload.src
-
-RESLIB1NAME=preload
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/preload.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
- $(SFXLIB) \
- $(SVTOOLLIB)\
- $(VCLLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/preload.component
-
-$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- preload.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt preload.component
diff --git a/extensions/source/preload/modulepreload.cxx
b/extensions/source/preload/modulepreload.cxx
deleted file mode 100644
index ead9753..0000000
--- a/extensions/source/preload/modulepreload.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-
-#include "componentmodule.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
deleted file mode 100644
index a41acf0..0000000
--- a/extensions/source/preload/oemwiz.cxx
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-#include "oemwiz.hxx"
-#include "componentmodule.hxx"
-#include <tools/debug.hxx>
-#include <sfx2/docfile.hxx>
-#include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
-#include <vcl/msgbox.hxx>
-#include <unotools/pathoptions.hxx>
-#include "preload.hrc"
-#include <svx/svxids.hrc>
-#include <sfx2/app.hxx>
-#include <svtools/xtextedt.hxx>
-#include "osl/diagnose.h"
-#include "tools/urlobj.hxx"
-
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svx/dialogs.hrc>
-
-//.........................................................................
-namespace preload
-{
-//.........................................................................
-
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::beans;
-//.........................................................................
-
- struct OEMPreloadDialog_Impl
- {
- SfxItemSet* pSet;
- TabPage* pWelcomePage;
- TabPage* pLicensePage;
- TabPage* pUserDataPage;
-
- OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog);
- ~OEMPreloadDialog_Impl()
- {
- delete pWelcomePage;
- delete pLicensePage;
- delete pUserDataPage;
- delete pSet;
- }
- void WriteUserData();
- };
-
- OEMPreloadDialog_Impl::OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog)
- {
- SfxItemPool& rPool = SFX_APP()->GetPool();
- pSet = new SfxItemSet(rPool, SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS);
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- if ( pFact )
- {
- CreateTabPage pFunc = pFact->GetTabPageCreatorFunc(RID_SFXPAGE_GENERAL);
- pUserDataPage = (*pFunc)(pDialog, *pSet);
- ((SfxTabPage*)pUserDataPage)->Reset(*pSet);
- }
- else
- pUserDataPage = NULL;
- pWelcomePage = new OEMWelcomeTabPage(pDialog);
- pLicensePage = new OEMLicenseTabPage(pDialog);
- }
-
- void OEMPreloadDialog_Impl::WriteUserData()
- {
- if ( pUserDataPage )
- ((SfxTabPage*)pUserDataPage)->FillItemSet(*pSet);
- }
-
- //=====================================================================
- //= OEMPreloadDialog
- //=====================================================================
- //---------------------------------------------------------------------
- OEMPreloadDialog::OEMPreloadDialog( Window* _pParent,
- const Reference< XPropertySet >& /*_rxObjectModel*/, const Reference<
XMultiServiceFactory >& /*_rxORB*/ )
- :WizardDialog(_pParent, ModuleRes(RID_DLG_OEMWIZARD)/*, _rxObjectModel, _rxORB*/)
- ,aPrevPB(this, ModuleRes(PB_PREV ))
- ,aNextPB(this, ModuleRes(PB_NEXT ))
- ,aCancelPB(this, ModuleRes(PB_CANCEL ))
- ,aAcceptST(ModuleRes(ST_ACCEPT))
- ,aFinishST(ModuleRes(ST_FINISH))
- ,aLicense(ModuleRes(ST_LICENSE_AGREEMENT))
- ,aUserData(ModuleRes(ST_INSERT_USER_DATA))
- ,pImpl(new OEMPreloadDialog_Impl(this))
- {
- FreeResource();
- aDlgTitle = GetText();
- aPrevPB.Enable(sal_False);
- aNextST = aNextPB.GetText();
- aPrevPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
- aNextPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
- AddButton( &aPrevPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- AddButton( &aNextPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- AddButton( &aCancelPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
-
- SetPrevButton(&aPrevPB);
- SetNextButton(&aNextPB);
-
- AddPage( pImpl->pWelcomePage );
- AddPage( pImpl->pLicensePage );
- if ( pImpl->pUserDataPage )
- AddPage( pImpl->pUserDataPage );
- SetPage( OEM_WELCOME, pImpl->pWelcomePage );
- SetPage( OEM_LICENSE, pImpl->pLicensePage );
- if ( pImpl->pUserDataPage )
- SetPage( OEM_USERDATA, pImpl->pUserDataPage );
- ShowPage( OEM_WELCOME );
- }
-
- OEMPreloadDialog::~OEMPreloadDialog( )
- {
- delete pImpl;
- }
-
- IMPL_LINK(OEMPreloadDialog, NextPrevPageHdl, PushButton*, pButton)
- {
- if(pButton == &aPrevPB)
- {
- if(GetCurLevel())
- ShowPage(GetCurLevel() - 1);
- }
- else if(OEM_USERDATA > GetCurLevel())
- ShowPage(GetCurLevel() + 1);
- else
- {
- pImpl->WriteUserData();
- Finnish(RET_OK);
- }
-
- String sTitle(aDlgTitle);
-
- switch(GetCurLevel())
- {
- case OEM_WELCOME:
- aNextPB.SetText(aNextST);
- aNextPB.Enable(sal_True);
- break;
- case OEM_LICENSE:
- sTitle += aLicense;
- aNextPB.SetText(aNextST);
- aCancelPB.GrabFocus();
- break;
- case OEM_USERDATA:
- sTitle += aUserData;
- aNextPB.SetText(aFinishST);
- break;
- }
- SetText(sTitle);
- aPrevPB.Enable(GetCurLevel() != OEM_WELCOME);
- return 0;
- }
-
- sal_Bool OEMPreloadDialog::LoadFromLocalFile(const String& rFileName, String& rContent)
- {
- SvtPathOptions aPathOpt;
- String sFileName = aPathOpt.GetUserConfigPath();//GetModulePath();
- INetURLObject aURLObject(sFileName);
- OSL_ASSERT(aURLObject.getSegmentCount() >= 2);
- aURLObject.removeSegment(); //remove '/config'
- aURLObject.removeSegment(); //remove '/user'
- sFileName = aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI);
- sFileName += rFileName;
-
- SfxMedium aMedium( sFileName,STREAM_READ, sal_True );
- SvStream* pInStream = aMedium.GetInStream();
- if( !pInStream )
- return sal_False;
-
- pInStream->ReadCString( rContent, RTL_TEXTENCODING_UTF8 );
-
- xub_StrLen nPos;
- while ( ( nPos = rContent.Search( 12 )) != STRING_NOTFOUND )
- rContent.Erase( nPos, 1 );
- return sal_True;
- }
-
-
- void OEMPreloadDialog::SetCancelString( const String& rText )
- {
- aCancelPB.SetText(rText);
- }
-
- OEMWelcomeTabPage::OEMWelcomeTabPage(Window* pParent) :
- TabPage(pParent, ModuleRes(RID_TP_WELCOME)),
- aInfoFT(this, ModuleRes(FT_INFO))
- {
- FreeResource();
- }
-
- OEMWelcomeTabPage::~OEMWelcomeTabPage()
- {
- }
-
- OEMLicenseTabPage::OEMLicenseTabPage(OEMPreloadDialog* pParent) :
- TabPage(pParent, ModuleRes(RID_TP_LICENSE)),
- aLicenseML(this, ModuleRes(ML_LICENSE)),
- aInfo1FT(this, ModuleRes(FT_INFO1)),
- aInfo2FT(this, ModuleRes(FT_INFO2)),
- aInfo3FT(this, ModuleRes(FT_INFO3)),
- aInfo2_1FT(this, ModuleRes(FT_INFO2_1)),
- aInfo3_1FT(this, ModuleRes(FT_INFO3_1)),
- aCBAccept(this, ModuleRes(CB_ACCEPT)),
- aPBPageDown(this, ModuleRes(PB_PAGEDOWN)),
- aArrow(this, ModuleRes(IMG_ARROW)),
- aStrAccept( ModuleRes(LICENCE_ACCEPT) ),
- aStrNotAccept( ModuleRes(LICENCE_NOTACCEPT) ),
- bEndReached(sal_False),
- pPreloadDialog(pParent)
- {
- FreeResource();
-
- aLicenseML.SetEndReachedHdl( LINK(this, OEMLicenseTabPage, EndReachedHdl) );
- aLicenseML.SetScrolledHdl( LINK(this, OEMLicenseTabPage, ScrolledHdl) );
-
- aPBPageDown.SetClickHdl( LINK(this, OEMLicenseTabPage, PageDownHdl) );
- aCBAccept.SetClickHdl( LINK(this, OEMLicenseTabPage, AcceptHdl) );
-
- // We want a automatic repeating page down button
- WinBits aStyle = aPBPageDown.GetStyle();
- aStyle |= WB_REPEAT;
- aPBPageDown.SetStyle( aStyle );
-
- aOldCancelText = pPreloadDialog->GetCancelString();
- pPreloadDialog->SetCancelString( aStrNotAccept );
-
- String aText = aInfo2FT.GetText();
- aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText()
);
- aInfo2FT.SetText( aText );
- }
-
- OEMLicenseTabPage::~OEMLicenseTabPage()
- {
- }
-
- void OEMLicenseTabPage::ActivatePage()
- {
- if(!aLicenseML.GetText().Len())
- {
- aLicenseML.SetLeftMargin( 5 );
- String sLicense;
-#ifdef UNX
- OEMPreloadDialog::LoadFromLocalFile(String::CreateFromAscii("LICENSE"), sLicense);
-#else
- OEMPreloadDialog::LoadFromLocalFile(String::CreateFromAscii("license.txt"), sLicense);
-#endif
- aLicenseML.SetText( sLicense );
- }
-
- EnableControls();
- }
-
- //------------------------------------------------------------------------
- IMPL_LINK( OEMLicenseTabPage, AcceptHdl, CheckBox *, EMPTYARG )
- {
- EnableControls();
- return 0;
- }
-
- //------------------------------------------------------------------------
- IMPL_LINK( OEMLicenseTabPage, PageDownHdl, PushButton *, EMPTYARG )
- {
- aLicenseML.ScrollDown( SCROLL_PAGEDOWN );
- return 0;
- }
-
- //------------------------------------------------------------------------
- IMPL_LINK( OEMLicenseTabPage, EndReachedHdl, LicenceView *, EMPTYARG )
- {
- bEndReached = sal_True;
-
- EnableControls();
- aCBAccept.GrabFocus();
-
- return 0;
- }
-
- //------------------------------------------------------------------------
- IMPL_LINK( OEMLicenseTabPage, ScrolledHdl, LicenceView *, EMPTYARG )
- {
- EnableControls();
-
- return 0;
- }
-
- //------------------------------------------------------------------------
- void OEMLicenseTabPage::EnableControls()
- {
- if( !bEndReached &&
- ( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) )
- bEndReached = sal_True;
-
- if ( bEndReached )
- {
- Point aPos( 0, aInfo3_1FT.GetPosPixel().Y() );
- aArrow.SetPosPixel( aPos );
- aCBAccept.Enable();
- }
- else
- {
- Point aPos( 0, aInfo2_1FT.GetPosPixel().Y() );
- aArrow.SetPosPixel( aPos );
- aCBAccept.Disable();
- }
-
- if ( aLicenseML.IsEndReached() )
- aPBPageDown.Disable();
- else
- aPBPageDown.Enable();
-
- if ( aCBAccept.IsChecked() )
- {
- PushButton *pNext = pPreloadDialog->GetNextButton();
- if ( ! pNext->IsEnabled() )
- {
- pPreloadDialog->SetCancelString( aOldCancelText );
- pNext->Enable(sal_True);
- }
- }
- else
- {
- PushButton *pNext = pPreloadDialog->GetNextButton();
- if ( pNext->IsEnabled() )
- {
- pPreloadDialog->SetCancelString( aStrNotAccept );
- pNext->Enable(sal_False);
- }
- }
- }
-
- //------------------------------------------------------------------------
- //------------------------------------------------------------------------
- //------------------------------------------------------------------------
- LicenceView::LicenceView( Window* pParent, const ResId& rResId )
- : MultiLineEdit( pParent, rResId )
- {
- SetLeftMargin( 5 );
-
- mbEndReached = IsEndReached();
-
- StartListening( *GetTextEngine() );
- }
-
- //------------------------------------------------------------------------
- LicenceView::~LicenceView()
- {
- maEndReachedHdl = Link();
- maScrolledHdl = Link();
-
- EndListeningAll();
- }
-
- //------------------------------------------------------------------------
- void LicenceView::ScrollDown( ScrollType eScroll )
- {
- ScrollBar* pScroll = GetVScrollBar();
-
- if ( pScroll )
- pScroll->DoScrollAction( eScroll );
- }
-
- //------------------------------------------------------------------------
- sal_Bool LicenceView::IsEndReached() const
- {
- sal_Bool bEndReached;
-
- ExtTextView* pView = GetTextView();
- ExtTextEngine* pEdit = GetTextEngine();
- sal_uLong nHeight = pEdit->GetTextHeight();
- Size aOutSize = pView->GetWindow()->GetOutputSizePixel();
- Point aBottom( 0, aOutSize.Height() );
-
- if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
- bEndReached = sal_True;
- else
- bEndReached = sal_False;
-
- return bEndReached;
- }
-
- //------------------------------------------------------------------------
- void LicenceView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
- {
- if ( rHint.IsA( TYPE(TextHint) ) )
- {
- sal_Bool bLastVal = EndReached();
- sal_uLong nId = ((const TextHint&)rHint).GetId();
-
- if ( nId == TEXT_HINT_PARAINSERTED )
- {
- if ( bLastVal )
- mbEndReached = IsEndReached();
- }
- else if ( nId == TEXT_HINT_VIEWSCROLLED )
- {
- if ( ! mbEndReached )
- mbEndReached = IsEndReached();
- maScrolledHdl.Call( this );
- }
-
- if ( EndReached() && !bLastVal )
- {
- maEndReachedHdl.Call( this );
- }
- }
- }
-
- //------------------------------------------------------------------------
-
-//.........................................................................
-} // namespace preload
-//.........................................................................
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
deleted file mode 100644
index ab74b5e..0000000
--- a/extensions/source/preload/oemwiz.hxx
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- 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 _EXTENSIONS_PRELOAD_OEMWIZ_HXX_
-#define _EXTENSIONS_PRELOAD_OEMWIZ_HXX_
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/wizdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/fixed.hxx>
-#include <svtools/svmedit.hxx>
-#include <svl/lstner.hxx>
-#include <vcl/scrbar.hxx>
-
-//.........................................................................
-namespace preload
-{
- #define OEM_WELCOME 0
- #define OEM_LICENSE 1
- #define OEM_USERDATA 2
-
-//.........................................................................
- //=====================================================================
- //= OEMPreloadDialog
- //=====================================================================
- struct OEMPreloadDialog_Impl;
- class OEMPreloadDialog : public WizardDialog
- {
- PushButton aPrevPB;
- PushButton aNextPB;
- CancelButton aCancelPB;
-
- String aNextST;
- String aAcceptST;
- String aFinishST;
- String aDlgTitle;
- String aLicense;
- String aUserData;
- OEMPreloadDialog_Impl* pImpl;
-
- DECL_LINK(NextPrevPageHdl, PushButton*);
- protected:
-
- public:
- OEMPreloadDialog(
- Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
_rxObjectModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
& _rxORB
- );
- ~OEMPreloadDialog();
-
- const String& GetAcceptString()const {return aAcceptST;}
- const String GetCancelString() const {return aCancelPB.GetText();}
- void SetCancelString( const String& rText );
-
- static sal_Bool LoadFromLocalFile(const String& rFileName, String& rContent);
- };
- class OEMWelcomeTabPage : public TabPage
- {
- FixedText aInfoFT;
- public:
- OEMWelcomeTabPage(Window* pParent);
- ~OEMWelcomeTabPage();
- };
- class LicenceView : public MultiLineEdit, public SfxListener
- {
- sal_Bool mbEndReached;
- Link maEndReachedHdl;
- Link maScrolledHdl;
-
- public:
- LicenceView( Window* pParent, const ResId& rResId );
- ~LicenceView();
-
- void ScrollDown( ScrollType eScroll );
-
- sal_Bool IsEndReached() const;
- sal_Bool EndReached() const { return mbEndReached; }
- void SetEndReached( sal_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 );
- private:
- using MultiLineEdit::Notify;
- };
- class OEMLicenseTabPage : public TabPage
- {
- LicenceView aLicenseML;
- FixedText aInfo1FT;
- FixedText aInfo2FT;
- FixedText aInfo3FT;
- FixedText aInfo2_1FT;
- FixedText aInfo3_1FT;
- CheckBox aCBAccept;
- PushButton aPBPageDown;
- FixedImage aArrow;
- String aStrAccept;
- String aStrNotAccept;
- String aOldCancelText;
- sal_Bool bEndReached;
-
- OEMPreloadDialog* pPreloadDialog;
-
- void EnableControls();
-
- DECL_LINK( AcceptHdl, CheckBox * );
- DECL_LINK( PageDownHdl, PushButton * );
- DECL_LINK( EndReachedHdl, LicenceView * );
- DECL_LINK( ScrolledHdl, LicenceView * );
-
- public:
- OEMLicenseTabPage(OEMPreloadDialog* pParent);
- ~OEMLicenseTabPage();
-
- virtual void ActivatePage();
- };
-
-//.........................................................................
-} // namespace preload
-//.........................................................................
-
-#endif // _EXTENSIONS_PRELOAD_OEMWIZ_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/preload.component
b/extensions/source/preload/preload.component
deleted file mode 100644
index 56a8a0d..0000000
--- a/extensions/source/preload/preload.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* 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.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.SharedLibrary"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="org.openoffice.comp.preload.OEMPreloadWizard">
- <service name="org.openoffice.comp.preload.OEMPreloadWizard"/>
- </implementation>
-</component>
diff --git a/extensions/source/preload/preload.hrc b/extensions/source/preload/preload.hrc
deleted file mode 100644
index a7d9725..0000000
--- a/extensions/source/preload/preload.hrc
+++ /dev/null
@@ -1,58 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_
-#define _EXTENSIONS_PRELOAD_PRELOAD_HRC_
-
-#define RID_DLG_OEMWIZARD 1024
-#define RID_TP_LICENSE 1025
-#define RID_TP_WELCOME 1027
-
-
-#define PB_PREV 1
-#define PB_NEXT 2
-#define PB_CANCEL 3
-
-#define ST_ACCEPT 5
-#define ST_FINISH 6
-#define FT_INFO 7
-#define ML_README 8
-#define FT_INFO1 9
-#define FT_INFO2 10
-#define ML_LICENSE 11
-#define ST_LICENSE_AGREEMENT 12
-#define ST_INSERT_USER_DATA 13
-#define IMG_ARROW 14
-#define FT_INFO2_1 15
-#define FT_INFO3_1 16
-#define FT_INFO3 17
-#define PB_PAGEDOWN 18
-#define CB_ACCEPT 19
-#define LICENCE_ACCEPT 20
-#define LICENCE_NOTACCEPT 21
-
-#endif
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
deleted file mode 100644
index 17ccbf8..0000000
--- a/extensions/source/preload/preload.src
+++ /dev/null
@@ -1,290 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_
-#include "preload.hrc"
-#endif
-
-ModalDialog RID_DLG_OEMWIZARD
-{
- HelpID = "extensions:ModalDialog:RID_DLG_OEMWIZARD";
- Text = "%PRODUCTNAME %PRODUCTVERSION";
-
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
- PushButton PB_PREV
- {
- HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_PREV";
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "<< Back" ;
- };
- PushButton PB_NEXT
- {
- HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_NEXT";
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "Next >>" ;
- };
- CancelButton PB_CANCEL
- {
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- String ST_ACCEPT
- {
- Text [ en-US ] = "Accept";
- };
- String ST_FINISH
- {
- Text [ en-US ] = "Finish";
- };
- String ST_LICENSE_AGREEMENT
- {
- Text [ en-US ] = " - Software License Agreement";
- };
-
- String ST_INSERT_USER_DATA
- {
- Text [ en-US ] = "- User Data";
- };
-};
-TabPage RID_TP_WELCOME
-{
- HelpID = "extensions:TabPage:RID_TP_WELCOME";
-// HelpId = ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- Text [ en-US ] = "Welcome";
- FixedText FT_INFO
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 174 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start the %PRODUCTNAME
%PRODUCTVERSION OEM, "
- "please enter your personal data in the dialog following the license text. Important
information is contained "
- "in the readme files which are located in the %PRODUCTNAME product directory. Please read
these files carefully. "
- "You can also find detailed information at the Oracle website \n\n"
- "http://www.oracle.com/us/products/applications/open-office.";;
- };
-};
-
-#define LICENSE_DIALOG_WIDTH 260
-#define LICENSE_DIALOG_HEIGTH 185
-#define LICENSE_RIGHT_BORDER 7
-#define LICENSE_BOTTOM_BORDER 0
-#define LICENSE_ROW_1 (7)
-#define LICENSE_COL_1 (7)
-
-#define OFFSET 2
-#define COL2_WIDTH 10
-#define OFFSET_IMG 10
-#define FT_HEIGHT 8
-#define PB_HEIGHT 14
-#define PD_WIDTH 40
-
-#define LICENCE_HEIGHT 102
-#define LICENSE_ROW_2 (LICENSE_ROW_1 + OFFSET + LICENCE_HEIGHT)
-#define LICENSE_ROW_3 (LICENSE_ROW_2 + OFFSET + FT_HEIGHT)
-#define LICENSE_ROW_4 (LICENSE_ROW_3 + OFFSET + 3*FT_HEIGHT )
-#define LICENSE_ROW_5 (LICENSE_ROW_4 + OFFSET + FT_HEIGHT)
-
-/*
-#define LICENSE_ROW_5 (LICENSE_DIALOG_HEIGTH - LICENSE_BOTTOM_BORDER - OFFSET - FT_HEIGHT)
-#define LICENSE_ROW_4 (LICENSE_ROW_5 - OFFSET - FT_HEIGHT)
-#define LICENSE_ROW_3 (LICENSE_ROW_4 - OFFSET - 3*FT_HEIGHT)
-#define LICENSE_ROW_2 (LICENSE_ROW_3 - OFFSET - FT_HEIGHT)
-#define LICENCE_HEIGHT (LICENSE_ROW_2-LICENSE_ROW_1-OFFSET)
-*/
-
-
-#define LICENSE_COL_2 (LICENSE_COL_1 + OFFSET_IMG)
-#define LICENSE_COL_3 (LICENSE_COL_2 + COL2_WIDTH +1)
-#define LICENSE_COL_4 (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - PD_WIDTH)
-
-#define LICENSE_WIDTH (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - LICENSE_ROW_1)
-#define COL3_WIDTH (LICENSE_COL_4 - LICENSE_COL_3)
-
-
-TabPage RID_TP_LICENSE
-{
- HelpID = "extensions:TabPage:RID_TP_LICENSE";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGTH ) ;
- Text [ en-US ] = "License Agreement";
-
- MultiLineEdit ML_LICENSE
- {
- HelpID = "extensions:MultiLineEdit:RID_TP_LICENSE:ML_LICENSE";
- PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENCE_HEIGHT ) ;
- Border = TRUE ;
- VScroll = TRUE ;
- ReadOnly = TRUE ;
- };
-
- FixedText FT_INFO1
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_2 ) ;
- Size = MAP_APPFONT ( LICENSE_WIDTH , FT_HEIGHT ) ;
- Text [ en-US ] = "Please follow these steps to proceed with the installation:" ;
- };
-
- FixedImage IMG_ARROW
- {
- Pos = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_3 ) ;
- Size = MAP_PIXEL ( 16 , 16 ) ;
- Fixed = Image
- {
- ImageBitmap = Bitmap
- {
- File = "arrow.bmp" ;
- File[ ar ] = "m_arrow.bmp" ;
- };
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
- };
- };
-
- FixedText FT_INFO2_1
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_2 , LICENSE_ROW_3 ) ;
- Size = MAP_APPFONT ( COL2_WIDTH , FT_HEIGHT ) ;
- Text [ en-US ] = "1." ;
- };
-
- FixedText FT_INFO2
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_3 , LICENSE_ROW_3 ) ;
- Size = MAP_APPFONT ( COL3_WIDTH, 3*FT_HEIGHT ) ;
- Text [ en-US ] = "View the complete License Agreement. Please use the scroll bar or the
'%PAGEDOWN' button in this dialog to view the entire license text." ;
- };
-
- PushButton PB_PAGEDOWN
- {
- HelpID = "extensions:PushButton:RID_TP_LICENSE:PB_PAGEDOWN";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
- Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
- Text [ en-US ] = "Page Down" ;
- };
-
- FixedText FT_INFO3_1
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_2 , LICENSE_ROW_4 ) ;
- Size = MAP_APPFONT ( COL2_WIDTH, FT_HEIGHT ) ;
- Text [ en-US ] = "2." ;
- };
-
- FixedText FT_INFO3
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_4 ) ;
- Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ;
- Text [ en-US ] = "Accept the License Agreement." ;
- };
-
- CheckBox CB_ACCEPT
- {
- HelpID = "extensions:CheckBox:RID_TP_LICENSE:CB_ACCEPT";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_5 ) ;
- Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ;
- Text [ en-US ] = "I accept the terms of the Agreement." ;
- };
-
- String LICENCE_ACCEPT
- {
- Text [ en-US ] = "~Accept" ;
- };
-
- String LICENCE_NOTACCEPT
- {
- Text [ en-US ] = "Decline" ;
- };
-
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/source/preload/preloadservices.cxx
b/extensions/source/preload/preloadservices.cxx
deleted file mode 100644
index f23d653..0000000
--- a/extensions/source/preload/preloadservices.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-#include "preloadservices.hxx"
-#include "componentmodule.hxx"
-#include "unoautopilot.hxx"
-#include "oemwiz.hxx"
-
-// the registration methods
-extern "C" void SAL_CALL createRegistryInfo_OEMPreloadDialog()
-{
- static ::preload::OMultiInstanceAutoRegistration<
- ::preload::OUnoAutoPilot< ::preload::OEMPreloadDialog, ::preload::OEMPreloadSI >
- > aAutoRegistration;
-}
-static const char cServiceName[] = "org.openoffice.comp.preload.OEMPreloadWizard";
-//.........................................................................
-namespace preload
-{
-//.........................................................................
-
- using namespace ::com::sun::star::uno;
-
- //=====================================================================
- //= OEMPreloadSI
- //=====================================================================
- //---------------------------------------------------------------------
- ::rtl::OUString OEMPreloadSI::getImplementationName() const
- {
- return ::rtl::OUString::createFromAscii(cServiceName);
- }
-
- //---------------------------------------------------------------------
- Sequence< ::rtl::OUString > OEMPreloadSI::getServiceNames() const
- {
- Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString::createFromAscii(cServiceName);
- return aReturn;
- }
-
-
-//.........................................................................
-} // namespace preload
-//.........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/preloadservices.hxx
b/extensions/source/preload/preloadservices.hxx
deleted file mode 100644
index ba51e05..0000000
--- a/extensions/source/preload/preloadservices.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- 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 _EXTENSIONS_PRELOAD_PRELOADSERVICES_HXX_
-#define _EXTENSIONS_PRELOAD_PRELOADSERVICES_HXX_
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/ustring.hxx>
-
-//.........................................................................
-namespace preload
-{
-//.........................................................................
-
- //=====================================================================
- //= OGroupBoxSI
- //=====================================================================
- /// service info for the OEM preload wizard
- struct OEMPreloadSI
- {
- public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
- getServiceNames() const;
- };
-//.........................................................................
-} // namespace preload
-//.........................................................................
-
-#endif // _EXTENSIONS_PRELOAD_PRELOADSERVICES_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx
deleted file mode 100644
index e2092d6..0000000
--- a/extensions/source/preload/services.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-#include "componentmodule.hxx"
-
-//---------------------------------------------------------------------------------------
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-//---------------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL createRegistryInfo_OEMPreloadDialog();
-
-//---------------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL preload_initializeModule()
-{
- static sal_Bool s_bInit = sal_False;
- if (!s_bInit)
- {
- createRegistryInfo_OEMPreloadDialog();
- ::preload::OModule::setResourceFilePrefix("preload");
- s_bInit = sal_True;
- }
-}
-
-//---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment ** /*ppEnv*/
- )
-{
- preload_initializeModule();
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
- const sal_Char* pImplementationName,
- void* pServiceManager,
- void* /*pRegistryKey*/)
-{
- Reference< XInterface > xRet;
- if (pServiceManager && pImplementationName)
- {
- xRet = ::preload::OModule::getComponentFactory(
- ::rtl::OUString::createFromAscii(pImplementationName),
- static_cast< XMultiServiceFactory* >(pServiceManager));
- }
-
- if (xRet.is())
- xRet->acquire();
- return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/unoautopilot.hxx b/extensions/source/preload/unoautopilot.hxx
deleted file mode 100644
index dd485d8..0000000
--- a/extensions/source/preload/unoautopilot.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- 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 _EXTENSIONS_PRELOAD_UNOAUTOPILOT_HXX_
-#define _EXTENSIONS_PRELOAD_UNOAUTOPILOT_HXX_
-
-#include <svtools/genericunodialog.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include "componentmodule.hxx"
-#include <cppuhelper/typeprovider.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-//.........................................................................
-namespace preload
-{
-//.........................................................................
-
- //=====================================================================
- //= IServiceInfo
- //=====================================================================
- /** interface for the SERVICEINFO template parameter of the OUnoAutoPilot class
- */
- struct IServiceInfo
- {
- public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
- getServiceNames() const;
- };
-
- //=====================================================================
- //= OUnoAutoPilot
- //=====================================================================
- typedef ::svt::OGenericUnoDialog OUnoAutoPilot_Base;
- template <class TYPE, class SERVICEINFO>
- class OUnoAutoPilot
- :public OUnoAutoPilot_Base
- ,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > >
- ,public OModuleResourceClient
- {
- OUnoAutoPilot(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-
- protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
- m_xObjectModel;
-
- public:
- // XTypeProvider
- virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException);
-
- // XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >
getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_Static(void) throw(
::com::sun::star::uno::RuntimeException );
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- SAL_CALL Create(const ::com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >&);
-
- // XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>
SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-
- // OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
- protected:
- // OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent);
- virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
- };
-
-#include "unoautopilot.inl"
-
-//.........................................................................
-} // namespace dbp
-//.........................................................................
-
-#endif // _EXTENSIONS_PRELOAD_UNOAUTOPILOT_HXX_
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/unoautopilot.inl b/extensions/source/preload/unoautopilot.inl
deleted file mode 100644
index 6e4dd18..0000000
--- a/extensions/source/preload/unoautopilot.inl
+++ /dev/null
@@ -1,128 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// no include protecttion
-// this file is included from unoautopilot.hxx directly
-
-//=====================================================================
-//= OUnoAutoPilot
-//=====================================================================
-template <class TYPE, class SERVICEINFO>
-OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxORB)
- :OUnoAutoPilot_Base(_rxORB)
-{
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE,
SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException)
-{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OUnoAutoPilot<TYPE,
SERVICEINFO>::Create(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
-{
- return *(new OUnoAutoPilot<TYPE, SERVICEINFO>(_rxFactory));
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::rtl::OUString SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName()
throw(::com::sun::star::uno::RuntimeException)
-{
- return getImplementationName_Static();
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::rtl::OUString OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName_Static()
throw(::com::sun::star::uno::RuntimeException)
-{
- return SERVICEINFO().getImplementationName();
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::comphelper::StringSequence SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException)
-{
- return getSupportedServiceNames_Static();
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::comphelper::StringSequence OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames_Static()
throw(::com::sun::star::uno::RuntimeException)
-{
- return SERVICEINFO().getServiceNames();
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
OUnoAutoPilot<TYPE, SERVICEINFO>::getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException)
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo(
createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
-}
-
-//---------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::cppu::IPropertyArrayHelper& OUnoAutoPilot<TYPE, SERVICEINFO>::getInfoHelper()
-{
- return *const_cast<OUnoAutoPilot*>(this)->getArrayHelper();
-}
-
-//--------------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-::cppu::IPropertyArrayHelper* OUnoAutoPilot<TYPE, SERVICEINFO>::createArrayHelper( ) const
-{
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps;
- describeProperties(aProps);
- return new ::cppu::OPropertyArrayHelper(aProps);
-}
-
-//--------------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent)
-{
- return new TYPE(_pParent, m_xObjectModel, m_aContext.getLegacyServiceFactory());
-}
-
-//--------------------------------------------------------------------------
-template <class TYPE, class SERVICEINFO>
-void OUnoAutoPilot<TYPE, SERVICEINFO>::implInitialize(const com::sun::star::uno::Any& _rValue)
-{
- ::com::sun::star::beans::PropertyValue aArgument;
- if (_rValue >>= aArgument)
- if (0 == aArgument.Name.compareToAscii("ObjectModel"))
- {
- aArgument.Value >>= m_xObjectModel;
- return;
- }
-
- OUnoAutoPilot_Base::implInitialize(_rValue);
-}
-
--
1.7.1
From 6c731ee32c1b50135143336c0f524d1b77bcf862 Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sat, 2 Jul 2011 18:04:22 +0200
Subject: [PATCH] Remove preload library related code
---
postprocess/packcomponents/makefile.mk | 1 -
postprocess/rebase/coffbase.txt | 2 --
2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9a4eeae..d71cf40 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -147,7 +147,6 @@ my_components = \
pcr \
pdffilter \
placeware \
- preload \
protocolhandler \
res \
sax \
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 199a894..69665f0 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -208,7 +208,6 @@ pdfimport.uno.dll 0x0000000060bf0000 0x000a0000
placewaremi.dll 0x0000000060bd0000 0x00010000
plmi.dll 0x0000000060b90000 0x00030000
pptimportermi.dll 0x0000000060b70000 0x00010000
-preloadmi.dll 0x0000000060b40000 0x00020000
productregistration.uno.dll 0x0000000060b20000 0x00010000
protocolhandlermi.dll 0x0000000060b00000 0x00010000
proxyfac.uno.dll 0x0000000060ae0000 0x00010000
@@ -260,7 +259,6 @@ smmi.dll 0x000000005e7f0000 0x00090000
smplmail.uno.dll 0x000000005e7d0000 0x00010000
sn_tools.dll 0x000000005e7a0000 0x00020000
so_activex.dll 0x000000005e770000 0x00020000
-socomp.dll 0x000000005e750000 0x00010000
sofficeapp.dll 0x000000005e6e0000 0x00060000
soldepmi.dll 0x000000005e6a0000 0x00030000
solvermi.dll 0x000000005e680000 0x00010000
--
1.7.1
From 5b0f26ac9cd13773cc2e6d98ce85a8ffaeb1b53d Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sat, 2 Jul 2011 18:13:01 +0200
Subject: [PATCH] Remove preload library related code
---
scp2/source/ooo/file_library_ooo.scp | 2 --
scp2/source/ooo/file_resource_ooo.scp | 2 --
scp2/source/ooo/module_hidden_ooo.scp | 1 -
scp2/source/ooo/module_lang_template.scp | 1 -
4 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0c7249f..eb49a0c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1025,8 +1025,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
-STD_LIB_FILE( gid_File_Lib_Preload, preload)
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
#if defined(UNX) && ! defined(QUARTZ)
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index cbd8ff6..7cfbb4f 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -66,8 +66,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr)
STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
-STD_RES_FILE( gid_File_Res_Preload, preload)
-
STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
#ifdef UNX
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index d2d46cd..6f0f436 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -234,7 +234,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Pdffilter,
gid_File_Lib_Pk,
gid_File_Lib_Pl,
- gid_File_Lib_Preload,
gid_File_Lib_Sf_Prothdlr,
gid_File_Lib_Psp,
gid_File_Lib_Res,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 60ee02b..efc2d98 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -74,7 +74,6 @@ Module gid_Module_Langpack_Resource_Template
gid_File_Res_Ofa,
gid_File_Res_Pcr,
gid_File_Res_Pdffilter,
- gid_File_Res_Preload,
gid_File_Res_San,
gid_File_Res_Productregistration,
gid_File_Res_Sb,
--
1.7.1
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.