[Libreoffice-commits] .: 3 commits - configmgr/qa desktop/inc desktop/prj desktop/source framework/source officecfg/registry sfx2/inc sfx2/sdi sfx2/source svx/inc
Matus Kukan
mkukan at kemper.freedesktop.org
Thu Jul 7 00:52:27 PDT 2011
configmgr/qa/unit/data.xcd | 5
desktop/inc/app.hxx | 1
desktop/prj/build.lst | 6
desktop/prj/d.lst | 5
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/registration/com/sun/star/registration/Registration.java | 334 ---
desktop/source/registration/com/sun/star/registration/makefile.mk | 62
desktop/source/registration/com/sun/star/registration/manifest | 2
desktop/source/registration/com/sun/star/registration/productregistration.jar.component | 34
desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java | 201 --
desktop/source/registration/com/sun/star/servicetag/Installer.java | 943 ----------
desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java | 322 ---
desktop/source/registration/com/sun/star/servicetag/RegistrationData.java | 531 -----
desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java | 440 ----
desktop/source/registration/com/sun/star/servicetag/Registry.java | 553 -----
desktop/source/registration/com/sun/star/servicetag/ServiceTag.java | 636 ------
desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java | 64
desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java | 420 ----
desktop/source/registration/com/sun/star/servicetag/SunConnection.java | 292 ---
desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java | 375 ---
desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java | 436 ----
desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java | 55
desktop/source/registration/com/sun/star/servicetag/Util.java | 293 ---
desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java | 232 --
desktop/source/registration/com/sun/star/servicetag/makefile.mk | 79
desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd | 366 ---
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
framework/source/fwe/classes/addonmenu.cxx | 31
framework/source/services/backingwindow.cxx | 19
framework/source/services/backingwindow.hxx | 1
framework/source/uielement/menubarmanager.cxx | 11
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
sfx2/inc/sfx2/sfxcommands.h | 2
sfx2/inc/sfx2/sfxsids.hrc | 3
sfx2/sdi/appslots.sdi | 8
sfx2/sdi/sfx.sdi | 50
sfx2/source/appl/appserv.cxx | 49
sfx2/source/appl/shutdowniconw32.cxx | 36
svx/inc/globlmn_tmpl.hrc | 6
49 files changed, 13 insertions(+), 7997 deletions(-)
New commits:
commit e2e69bc270f39182400cb9f12f121eb5aec7da3a
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 18:43:19 2011 +0200
Remove socomp library related code
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
commit cfa789a5b0eeb90b7b1ca821d910905eda48cfe1
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 17:21:45 2011 +0200
Remove online registration related code
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 97e0aed..cd1cdd3 100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3578,11 +3578,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:OnlineRegistrationDlg" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Registration...</value>
- </prop>
- </node>
<node oor:name=".uno:GoToStartSel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">Select to File Begin</value>
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index f4df73e..d55f2fa 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star::beans;
// Please look at sfx2/inc/sfxsids.hrc the values are defined there. Due to build dependencies
// we cannot include the header file.
const sal_uInt16 SID_HELPMENU = (SID_SFX_START + 410);
-const sal_uInt16 SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
namespace framework
{
@@ -213,40 +212,21 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
if ( pHelpMenu )
{
- static const char REFERENCECOMMAND_AFTER[] = ".uno:OnlineRegistrationDlg";
static const char REFERENCECOMMAND_BEFORE[] = ".uno:About";
// Add-Ons help menu items should be inserted after the "registration" menu item
- bool bAddAfter = true;
sal_uInt16 nItemCount = pHelpMenu->GetItemCount();
- sal_uInt16 nRegPos = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
- sal_uInt16 nInsPos = nRegPos;
sal_uInt16 nInsSepAfterPos = MENU_APPEND;
sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START;
AddonsOptions aOptions;
- if ( nRegPos == USHRT_MAX )
- {
- // try to detect the online registration dialog menu item with the command URL
- sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
- nRegPos = pHelpMenu->GetItemPos( nId );
- nInsPos = nRegPos;
- }
-
- if ( nRegPos == USHRT_MAX )
- {
- // second try:
- // try to detect the about menu item with the command URL
- sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
- nRegPos = pHelpMenu->GetItemPos( nId );
- nInsPos = nRegPos;
- bAddAfter = false;
- }
+ // try to detect the about menu item with the command URL
+ sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
+ sal_uInt16 nInsPos = pHelpMenu->GetItemPos( nId );
Sequence< Sequence< PropertyValue > > aAddonSubMenu;
const Sequence< Sequence< PropertyValue > >& rAddonHelpMenuEntries = aOptions.GetAddonsHelpMenu();
- nInsPos = bAddAfter ? AddonMenuManager::GetNextPos( nInsPos ) : nInsPos;
if ( nInsPos < nItemCount && pHelpMenu->GetItemType( nInsPos ) != MENUITEM_SEPARATOR )
nInsSepAfterPos = nInsPos;
@@ -261,10 +241,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
if ( pHelpMenu->GetItemType( nInsSepAfterPos ) != MENUITEM_SEPARATOR )
pHelpMenu->InsertSeparator( nInsSepAfterPos );
}
- if ( nRegPos < MENU_APPEND )
- pHelpMenu->InsertSeparator( nRegPos+1 );
- else
- pHelpMenu->InsertSeparator( nItemCount );
+ pHelpMenu->InsertSeparator( nItemCount );
}
}
}
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 4317c99..e85cb06 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -905,25 +905,6 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
pNodePath = "/org.openoffice.Office.Common/Help/StartCenter";
pNode = "AddFeatureURL";
break;
- case nItemId_Reg:
- try
- {
- // create the Desktop component which can load components
- Reference < lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
- if( xFactory.is() )
- {
- Reference< task::XJobExecutor > xProductRegistration(
- xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.setup.ProductRegistration" ) ) ),
- UNO_QUERY_THROW );
-
- // tell it that the user wants to register
- xProductRegistration->trigger( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RegistrationRequired" ) ) );
- }
- }
- catch (const Exception&)
- {
- }
- break;
case nItemId_Info:
pNodePath = "/org.openoffice.Office.Common/Help/StartCenter";
pNode = "InfoURL";
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index f3a6721..425018d 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -135,7 +135,6 @@ namespace framework
std::vector< LoadRecentFile > maRecentFiles;
static const int nItemId_Extensions = 1;
- static const int nItemId_Reg = 2;
static const int nItemId_Info = 3;
static const int nItemId_TplRep = 4;
static const int nShadowTop = 32;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 132c555..d3c5e4c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -782,7 +782,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
- static const char REFERENCECOMMAND_AFTER[] = ".uno:OnlineRegistrationDlg";
static const char REFERENCECOMMAND_BEFORE[] = ".uno:About";
// retrieve menu extension item
@@ -793,24 +792,18 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
// remove all old window list entries from menu
sal_uInt16 nNewItemId( 0 );
sal_uInt16 nInsertPos( MENU_APPEND );
- sal_uInt16 nAfterPos( MENU_APPEND );
sal_uInt16 nBeforePos( MENU_APPEND );
- String aCommandAfter( String::CreateFromAscii ( REFERENCECOMMAND_AFTER ));
String aCommandBefore( String::CreateFromAscii ( REFERENCECOMMAND_BEFORE ));
for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ )
{
sal_uInt16 nItemId = pMenu->GetItemId( n );
nNewItemId = std::max( nItemId, nNewItemId );
- if ( pMenu->GetItemCommand( nItemId ) == aCommandAfter )
- nAfterPos = n+1;
- else if ( pMenu->GetItemCommand( nItemId ) == aCommandBefore )
+ if ( pMenu->GetItemCommand( nItemId ) == aCommandBefore )
nBeforePos = n;
}
++nNewItemId;
- if ( nAfterPos != MENU_APPEND )
- nInsertPos = nAfterPos;
- else if ( nBeforePos != MENU_APPEND )
+ if ( nBeforePos != MENU_APPEND )
nInsertPos = nBeforePos;
pMenu->InsertItem( nNewItemId, aMenuItem.aLabel, 0, nInsertPos );
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0610270..e61cca4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3556,11 +3556,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:OnlineRegistrationDlg" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Registration...</value>
- </prop>
- </node>
<node oor:name=".uno:GoToStartSel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Select to File Begin</value>
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index 1ed1e84..106a119 100755
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -253,7 +253,6 @@
#define CMD_SID_SHOWPOPUPS ".uno:ShowPopups"
#define CMD_SID_BASICIDE_SHOWSBX ".uno:ShowSbx"
#define CMD_SID_SOURCEVIEW ".uno:SourceView"
-#define CMD_SID_ONLINE_REGISTRATION_DLG ".uno:StartRegistrationDialog"
#define CMD_SID_STATUSBARTEXT ".uno:StatusBar"
#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible"
#define CMD_SID_BASICIDE_STAT_DATE ".uno:StatusGetDate"
@@ -308,7 +307,6 @@
#define CMD_SID_ADDONHELP ".uno:AddonHelp"
#define CMD_SID_FORMATMENUSTATE ".uno:FormatMenuState"
#define CMD_SID_INET_DLG ".uno:InternetDialog"
-#define CMD_SID_ONLINE_REGISTRATION ".uno:OnlineRegistrationDlg"
#define CMD_SID_OFFICE_CHECK_PLZ ".uno:CheckPLZ"
#define CMD_SID_ADDRESS_DATA_SOURCE ".uno:AutoPilotAddressDataSource"
#define CMD_FN_BUSINESS_CARD ".uno:InsertBusinessCard"
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index d0456cc..a228916 100755
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -206,9 +206,6 @@
#define SID_BASEURL (SID_SFX_START + 1518)
#define SID_TEMPLATE (SID_SFX_START + 1519)
-#define SID_ONLINE_REGISTRATION (SID_SFX_START + 1537)
-
-#define SID_ONLINE_REGISTRATION_DLG (SID_SFX_START + 1540)
#define SID_CONTENTTYPE (SID_SFX_START + 1541)
#define SID_SAVETO (SID_SFX_START + 1546)
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 026f8bb..0dbdfb3 100755
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -232,14 +232,6 @@ shell SfxApplication
//----------------------------------------------------------------------
- SID_ONLINE_REGISTRATION
- [
- ExecMethod = OfaExec_Impl;
- StateMethod = OfaState_Impl;
- ]
-
- //----------------------------------------------------------------------
-
SID_OFFICE_CHECK_PLZ
[
ExecMethod = OfaExec_Impl;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index b40e842..a8d7c29 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5967,31 +5967,6 @@ SfxBoolItem SourceView SID_SOURCEVIEW
]
//--------------------------------------------------------------------------
-SfxVoidItem StartRegistrationDialog SID_ONLINE_REGISTRATION_DLG
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_SPECIAL;
-]
-
-//--------------------------------------------------------------------------
SfxStringItem StatusBar SID_STATUSBARTEXT
[
@@ -7414,31 +7389,6 @@ SfxVoidItem InternetDialog SID_INET_DLG
]
//--------------------------------------------------------------------------
-SfxVoidItem OnlineRegistrationDlg SID_ONLINE_REGISTRATION
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
SfxBoolItem CheckPLZ SID_OFFICE_CHECK_PLZ
(SfxStringItem PLZ SID_OFFICE_CHECK_PLZ)
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index ca10e6b..8afc98a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -741,12 +741,6 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
}
}
-static const ::rtl::OUString& getProductRegistrationServiceName( )
-{
- static ::rtl::OUString s_sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.setup.ProductRegistration"));
- return s_sServiceName;
-}
-
typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*);
typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
@@ -991,30 +985,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
break;
}
- case SID_ONLINE_REGISTRATION:
- {
- try
- {
- // create the ProductRegistration component
- Reference< com::sun::star::lang::XMultiServiceFactory > xORB( ::comphelper::getProcessServiceFactory() );
- Reference< com::sun::star::task::XJobExecutor > xProductRegistration;
- if ( xORB.is() )
- xProductRegistration = xProductRegistration.query( xORB->createInstance( getProductRegistrationServiceName() ) );
- DBG_ASSERT( xProductRegistration.is(), "OfficeApplication::ExecuteApp_Impl: could not create the service!" );
-
- // tell it that the user wants to register
- if ( xProductRegistration.is() )
- {
- xProductRegistration->trigger( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegistrationRequired")) );
- }
- }
- catch( const ::com::sun::star::uno::Exception& )
- {
- OSL_FAIL( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
- }
- }
- break;
-
case SID_BASICIDE_APPEAR:
{
SfxViewFrame* pView = lcl_getBasicIDEViewFrame( NULL );
@@ -1332,25 +1302,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
{
- const sal_uInt16 *pRanges = rSet.GetRanges();
- DBG_ASSERT(pRanges && *pRanges, "Set without Region");
- while ( *pRanges )
- {
- for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
- {
- switch(nWhich)
- {
- case SID_ONLINE_REGISTRATION:
- {
- ::utl::RegOptions aOptions;
- if ( !aOptions.allowMenu() )
- rSet.DisableItem( SID_ONLINE_REGISTRATION );
- }
- break;
- }
- }
- }
-
SvtModuleOptions aModuleOpt;
if( !aModuleOpt.IsWriter())
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 3089dec..bb37f11 100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -909,12 +909,6 @@
HelpID = SID_SHOW_CREDITS ; \
Text [ en-US ] = "%PRODUCTNAME Credits..." ;
-#define ITEM_HELP_ONLINE_REGISTRATION \
- Identifier = SID_ONLINE_REGISTRATION ; \
- Command = ".uno:OnlineRegistrationDlg" ; \
- Text [ en-US ] = "~Registration..." ; \
-
-
#define ITEM_HELP_ABOUT \
Identifier = SID_ABOUT ; \
Command = ".uno:About" ; \
commit ab9091b8937dcc9df599c3fd45a2e5f24d0e099f
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 18:22:48 2011 +0200
Remove productregistration.jar library related code
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index dbc8c22..e9a287a 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -43,9 +43,6 @@ 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\zipintro nmake - all dt_zipintro NULL
dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL
-dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL
-dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL
-dt desktop\source\registration\com\sun\star\registration nmake - all sn_regjob sn_svctag NULL
dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 047b46d..38bdf49 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -147,7 +147,6 @@ 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\productregistration.jar.component %_DEST%\xml\productregistration.jar.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/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java
deleted file mode 100755
index d00ed1d..0000000
--- a/desktop/source/registration/com/sun/star/registration/Registration.java
+++ /dev/null
@@ -1,334 +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.
- *
- ************************************************************************/
-package com.sun.star.registration;
-
-import com.sun.star.beans.NamedValue;
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.frame.DispatchResultEvent;
-import com.sun.star.frame.DispatchResultState;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.registry.*;
-import com.sun.star.servicetag.*;
-import com.sun.star.system.*;
-import com.sun.star.task.*;
-import com.sun.star.uno.*;
-import com.sun.star.uri.XExternalUriReferenceTranslator;
-import com.sun.star.util.XStringSubstitution;
-
-import java.io.*;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-import java.net.HttpURLConnection;
-
-public class Registration {
-
- public static XSingleServiceFactory __getServiceFactory(String implName,
- XMultiServiceFactory multiFactory, XRegistryKey regKey) {
- XSingleServiceFactory xSingleServiceFactory = null;
-
- if (implName.equals(Registration.class.getName())) {
- xSingleServiceFactory = FactoryHelper.getServiceFactory(_Registration.class, _serviceName, multiFactory, regKey);
- }
-
- return xSingleServiceFactory;
- }
-
- static final String _serviceName = "com.sun.star.comp.framework.DoRegistrationJob";
-
- static public class _Registration implements XJob {
- XComponentContext xComponentContext;
-
- XStringSubstitution xPathSubstService = null;
- XExternalUriReferenceTranslator xUriTranslator = null;
-
- RegistrationData theRegistrationData = null;
-
- public _Registration(XComponentContext xComponentContext) {
- this.xComponentContext = xComponentContext;
- }
-
- private String resolvePath(String path) {
- try {
- if( xPathSubstService == null || xUriTranslator == null ) {
- XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager();
- if( xPathSubstService == null ) {
- Object o = theServiceManager.createInstanceWithContext(
- "com.sun.star.util.PathSubstitution",
- xComponentContext );
- xPathSubstService = (XStringSubstitution)
- UnoRuntime.queryInterface(XStringSubstitution.class, o);
- }
-
- if( xUriTranslator == null ) {
- Object o = theServiceManager.createInstanceWithContext(
- "com.sun.star.uri.ExternalUriReferenceTranslator",
- xComponentContext );
- xUriTranslator = (XExternalUriReferenceTranslator)
- UnoRuntime.queryInterface(XExternalUriReferenceTranslator.class, o);
- }
- }
-
- String s = xPathSubstService.substituteVariables(path, true);
- return xUriTranslator.translateToExternal(s);
- } catch (java.lang.Exception e) {
- return path;
- }
- }
-
- private void openBrowser(String url) {
- try {
- XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager();
-
- Object o = theServiceManager.createInstanceWithContext(
- "com.sun.star.system.SystemShellExecute",
- xComponentContext );
-
- XSystemShellExecute xShellExecuteService = (XSystemShellExecute)
- UnoRuntime.queryInterface(XSystemShellExecute.class, o);
-
- xShellExecuteService.execute( url, "", SystemShellExecuteFlags.DEFAULTS );
- } catch (java.lang.Exception e) {
- }
- }
-
- private ServiceTag getServiceTagFromRegistrationData(File xmlFile, String productURN) {
- try {
- RegistrationData storedRegData = RegistrationData.loadFromXML(new FileInputStream(xmlFile));
- Set<ServiceTag> storedServiceTags = storedRegData.getServiceTags();
-
- Iterator<ServiceTag> tagIterator = storedServiceTags.iterator();
- while( tagIterator.hasNext() ) {
- ServiceTag tag = tagIterator.next();
- if( tag.getProductURN().equals(productURN) ) {
- theRegistrationData = storedRegData;
- return tag;
- }
- }
-
- // product URN has changed, remove registration data file
- xmlFile.delete();
- } catch (IOException e) {
- // fall through intentionally
- } catch (IllegalArgumentException e) {
- // file is damaged (or a name clash appeared)
- xmlFile.delete();
- }
- return null;
- }
-
- /*
- * XJob
- *
- * NOTE: as this Job hets triggered by the the JobExecutor service from first start
- * wizard and registration reminder code (because their frames do not implement
- * XDispatchProvider), making this an XAsyncJob doesn't make sense as the
- * JobExecutor waits for the jobFinished call on the listener passed.
- */
- public Object execute(NamedValue[] args)
- throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception {
-
- final NamedValue[] f_args = args;
-
- new Thread(
- new Runnable () {
- public void run() {
- try {
- executeImpl(f_args);
- } catch(com.sun.star.uno.Exception e) {
- }
- }
- }
- ).start();
-
- NamedValue ret[] = new NamedValue[1];
- ret[0] = new NamedValue( "Deactivate", new Boolean(false) );
- return ret;
- }
-
- public synchronized void executeImpl(NamedValue[] args)
- throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception {
-
- // extract the interesting part of the argument list
- NamedValue[] theJobConfig = null;
- NamedValue[] theEnvironment = null;
-
- int c = args.length;
- for (int i=0; i<c; ++i) {
- if (args[i].Name.equals("JobConfig"))
- theJobConfig = (NamedValue[]) AnyConverter.toArray(args[i].Value);
- else if (args[i].Name.equals("Environment"))
- theEnvironment = (NamedValue[]) AnyConverter.toArray(args[i].Value);
- }
-
- if (theEnvironment==null)
- throw new com.sun.star.lang.IllegalArgumentException("no environment");
-
- boolean saveConfig = false;
-
- String productName = "";
- String productVersion = "";
- String productURN = "";
- String productParent = "";
- String productParentURN = "";
- String productDefinedInstanceID = "";
- String productSource = "";
- String vendor = "";
-
- String urlRegData = null;
- String registrationURL = null;
-
- c = theJobConfig.length;
- for (int i=0; i<c; ++i) {
- if( theJobConfig[i].Name.equals("ProductName") ) {
- productName = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("ProductVersion") ) {
- productVersion = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("ProductURN") ) {
- productURN = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("ProductParent") ) {
- productParent = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("ProductParentURN") ) {
- productParentURN = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("ProductSource") ) {
- productSource = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("Vendor") ) {
- vendor = AnyConverter.toString(theJobConfig[i].Value);
- } else if( theJobConfig[i].Name.equals("RegistrationData") ) {
- urlRegData = resolvePath(AnyConverter.toString(theJobConfig[i].Value));
- } else if( theJobConfig[i].Name.equals("RegistrationURL") ) {
- registrationURL = AnyConverter.toString(theJobConfig[i].Value);
- } else {
- System.err.println( theJobConfig[i].Name + " = " + AnyConverter.toString(theJobConfig[i].Value) );
- }
- }
-
- if (registrationURL==null)
- throw new com.sun.star.lang.IllegalArgumentException("no registration url");
-
- boolean local_only = false;
-
- c = theEnvironment.length;
- for (int i=0; i<c; ++i) {
- if( theEnvironment[i].Name.equals("EventName") ) {
- if( ! AnyConverter.toString(theEnvironment[i].Value).equals("onRegisterNow") ) {
- local_only = true;
- }
- }
- }
-
- try {
-
- /* ensure only one thread accesses/writes registration.xml at a time
- * regardless how many instances of this Job exist.
- */
- synchronized( _serviceName ) {
-
- File xmlRegData = new File( new URI( urlRegData ) );
-
- ServiceTag tag = getServiceTagFromRegistrationData(xmlRegData, productURN);
- if( tag == null ) {
- tag = ServiceTag.newInstance(
- ServiceTag.generateInstanceURN(),
- productName,
- productVersion,
- productURN,
- productParent,
- productParentURN,
- productDefinedInstanceID,
- vendor,
- System.getProperty("os.arch"),
- Installer.getZoneName(),
- productSource);
-
- theRegistrationData = new RegistrationData();
- theRegistrationData.addServiceTag(tag);
- theRegistrationData.storeToXML( new FileOutputStream( xmlRegData ) );
- }
-
- // Store the service tag in local registry, which might have been installed later
- if( Registry.isSupported() ) {
- // ignore communication failures with local service tag client
- try {
- if( Registry.getSystemRegistry().getServiceTag(tag.getInstanceURN()) == null ) {
- Registry.getSystemRegistry().addServiceTag(tag);
- }
- } catch( java.io.IOException e) {
- e.printStackTrace();
- } catch (java.lang.RuntimeException e) {
- e.printStackTrace();
- }
- }
- }
-
- if( ! local_only ) {
- registrationURL = registrationURL.replaceAll("\\$\\{registry_urn\\}", theRegistrationData.getRegistrationURN());
- registrationURL = registrationURL.replaceAll("\\$\\{locale\\}", Locale.getDefault().getLanguage());
-
- HttpURLConnection con = (HttpURLConnection) new URL(registrationURL).openConnection();
- con.setDoInput(true);
- con.setDoOutput(true);
- con.setUseCaches(false);
- con.setAllowUserInteraction(false);
- con.setRequestMethod("POST");
-
- con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
- try {
- con.connect();
-
- OutputStream out = con.getOutputStream();
- theRegistrationData.storeToXML(out);
- out.flush();
- out.close();
-
- int returnCode = con.getResponseCode();
- } catch(java.lang.Exception e) {
- // IOException and UnknownHostException
- }
- openBrowser(registrationURL);
- }
- } catch (java.net.MalformedURLException e) {
- e.printStackTrace();
- throw new com.sun.star.lang.IllegalArgumentException( e.toString() );
- } catch (java.net.URISyntaxException e) {
- e.printStackTrace();
- throw new com.sun.star.lang.IllegalArgumentException( e.toString() );
- } catch (java.io.IOException e) {
- e.printStackTrace();
- throw new com.sun.star.uno.RuntimeException( e.toString() );
- } catch (java.lang.RuntimeException e) {
- e.printStackTrace();
- throw new com.sun.star.uno.RuntimeException( e.toString() );
- }
- }
- }
-}
diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk
deleted file mode 100755
index 8598022..0000000
--- a/desktop/source/registration/com/sun/star/registration/makefile.mk
+++ /dev/null
@@ -1,62 +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.
-#
-#*************************************************************************
-
-PRJNAME = setup_native
-PRJ = ..$/..$/..$/..$/..$/..
-TARGET = productregistration
-PACKAGE = com$/sun$/star$/registration
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_SVCTAGS)" == "YES"
-
-JARFILES = jurt.jar unoil.jar ridl.jar
-JAVAFILES = \
- Registration.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-JARCLASSDIRS = $(PACKAGE) com$/sun$/star$/servicetag
-CUSTOMMANIFESTFILE = manifest
-.ENDIF # "$(ENABLE_SVCTAGS)" == "YES"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/productregistration.jar.component
-
-$(MISC)/productregistration.jar.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)productregistration.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component
diff --git a/desktop/source/registration/com/sun/star/registration/manifest b/desktop/source/registration/com/sun/star/registration/manifest
deleted file mode 100755
index 952aaa8..0000000
--- a/desktop/source/registration/com/sun/star/registration/manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-RegistrationClassName: com.sun.star.registration.Registration
-UNO-Type-Path:
diff --git a/desktop/source/registration/com/sun/star/registration/productregistration.jar.component b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component
deleted file mode 100755
index c022a98..0000000
--- a/desktop/source/registration/com/sun/star/registration/productregistration.jar.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.Java2"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.registration.Registration">
- <service name="com.sun.star.comp.framework.DoRegistrationJob"/>
- </implementation>
-</component>
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
deleted file mode 100755
index c475b75..0000000
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ /dev/null
@@ -1,201 +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.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
-import java.net.URI;
-
-/**
- * BrowserSupport class.
- *
- * The implementation of the com.sun.servicetag API needs to be
- * compiled with JDK 5 as well since the consumer of this API
- * may require to support JDK 5 (e.g. NetBeans).
- *
- * The Desktop.browse() method can be backported in this class
- * if needed. The current implementation only supports JDK 6.
- */
-class BrowserSupport {
- private static boolean isBrowseSupported = false;
- private static Method browseMethod = null;
- private static Object desktop = null;
- private static volatile Boolean result = false;
-
-
- private static void initX() {
- if (desktop != null) {
- return;
- }
- boolean supported = false;
- Method browseM = null;
- Object desktopObj = null;
- try {
- // Determine if java.awt.Desktop is supported
- Class desktopCls = Class.forName("java.awt.Desktop", true, null);
- Method getDesktopM = desktopCls.getMethod("getDesktop");
- browseM = desktopCls.getMethod("browse", URI.class);
-
- Class actionCls = Class.forName("java.awt.Desktop$Action", true, null);
- final Method isDesktopSupportedMethod = desktopCls.getMethod("isDesktopSupported");
- Method isSupportedMethod = desktopCls.getMethod("isSupported", actionCls);
- Field browseField = actionCls.getField("BROWSE");
- // isDesktopSupported calls getDefaultToolkit which can block
- // infinitely, see 6636099 for details, to workaround we call
- // in a thread and time it out, noting that the issue is specific
- // to X11, it does not hurt for Windows.
- Thread xthread = new Thread() {
- public void run() {
- try {
- // support only if Desktop.isDesktopSupported() and
- // Desktop.isSupported(Desktop.Action.BROWSE) return true.
- result = (Boolean) isDesktopSupportedMethod.invoke(null);
- } catch (IllegalAccessException e) {
- // should never reach here
- InternalError x =
- new InternalError("Desktop.getDesktop() method not found");
- x.initCause(e);
- } catch (InvocationTargetException e) {
- // browser not supported
- if (Util.isVerbose()) {
- e.printStackTrace();
- }
- }
- }
- };
- // set it to daemon, so that the vm will exit.
- xthread.setDaemon(true);
- xthread.start();
- try {
- xthread.join(5 * 1000);
- } catch (InterruptedException ie) {
- // ignore the exception
- }
- if (result.booleanValue()) {
- desktopObj = getDesktopM.invoke(null);
- result = (Boolean) isSupportedMethod.invoke(desktopObj, browseField.get(null));
- supported = result.booleanValue();
- }
- } catch (ClassNotFoundException e) {
- // browser not supported
- if (Util.isVerbose()) {
- e.printStackTrace();
- }
- } catch (NoSuchMethodException e) {
- // browser not supported
- if (Util.isVerbose()) {
- e.printStackTrace();
- }
- } catch (NoSuchFieldException e) {
- // browser not supported
- if (Util.isVerbose()) {
- e.printStackTrace();
- }
- } catch (IllegalAccessException e) {
- // should never reach here
- InternalError x =
- new InternalError("Desktop.getDesktop() method not found");
- x.initCause(e);
- throw x;
- } catch (InvocationTargetException e) {
- // browser not supported
- if (Util.isVerbose()) {
- e.printStackTrace();
- }
- }
- isBrowseSupported = supported;
- browseMethod = browseM;
- desktop = desktopObj;
- }
-
- static boolean isSupported() {
- initX();
- return isBrowseSupported;
- }
-
- /**
- * Launches the default browser to display a {@code URI}.
- * If the default browser is not able to handle the specified
- * {@code URI}, the application registered for handling
- * {@code URIs} of the specified type is invoked. The application
- * is determined from the protocol and path of the {@code URI}, as
- * defined by the {@code URI} class.
- * <p>
- * This method calls the Desktop.getDesktop().browse() method.
- * <p>
- * @param uri the URI to be displayed in the user default browser
- *
- * @throws NullPointerException if {@code uri} is {@code null}
- * @throws UnsupportedOperationException if the current platform
- * does not support the {@link Desktop.Action#BROWSE} action
- * @throws IOException if the user default browser is not found,
- * or it fails to be launched, or the default handler application
- * failed to be launched
- * @throws IllegalArgumentException if the necessary permissions
- * are not available and the URI can not be converted to a {@code URL}
- */
- static void browse(URI uri) throws IOException {
- if (uri == null) {
- throw new NullPointerException("null uri");
- }
- if (!isSupported()) {
- throw new UnsupportedOperationException("Browse operation is not supported");
- }
-
- // Call Desktop.browse() method
- try {
- if (Util.isVerbose()) {
- System.out.println("desktop: " + desktop + ":browsing..." + uri);
- }
- browseMethod.invoke(desktop, uri);
- } catch (IllegalAccessException e) {
- // should never reach here
- InternalError x =
- new InternalError("Desktop.getDesktop() method not found");
- x.initCause(e);
- throw x;
- } catch (InvocationTargetException e) {
- Throwable x = e.getCause();
- if (x != null) {
- if (x instanceof UnsupportedOperationException) {
- throw (UnsupportedOperationException) x;
- } else if (x instanceof IllegalArgumentException) {
- throw (IllegalArgumentException) x;
- } else if (x instanceof IOException) {
- throw (IOException) x;
- } else if (x instanceof SecurityException) {
- throw (SecurityException) x;
- } else {
- // ignore
- }
- }
- }
- }
-}
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
deleted file mode 100755
index 41d328c..0000000
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ /dev/null
@@ -1,943 +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.
- *
- ************************************************************************/
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list