[Libreoffice-commits] .: offapi/com offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/registry
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 20 02:51:42 PDT 2012
offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/setup/ProductRegistration.idl | 82 -----------------
officecfg/Configuration_officecfg.mk | 1
officecfg/registry/data/org/openoffice/Office/Jobs.xcu | 39 --------
4 files changed, 123 deletions(-)
New commits:
commit 1f77f1ac177521698ee7c978f218127cb5840046
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 20 11:46:48 2012 +0200
remove remnants of ProductRegistration
Implementation is gone since b2d7ede98716806cc4b3ea8547247175d5f04d18
Change-Id: I3986ca99748f0010d80d2c788723a42a1725e83c
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b053b9b..047a2ec 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1051,7 +1051,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
ViewDescriptor \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
- ProductRegistration \
Setup \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
deleted file mode 100644
index 3dbdf57..0000000
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_setup_ProductRegistration_idl__
-#define __com_sun_star_setup_ProductRegistration_idl__
-
-#include <com/sun/star/task/JobExecutor.idl>
-#include <com/sun/star/task/XJob.idl>
-
-module com { module sun { module star { module setup {
-
-/** provides a mechanism for registering the product.
-
- <p>Two main functionalities are covered by this service:
- <ul><il><em>Triggering Online Registration</em><br/>
- If, by any user interface of your choice, the user tells she wants to register
- their product copy, ProductRegistration is the service of your choice.
- </il><br/>
- <il><em>Executing Registration Requests</em><br/>
- ProductRegistration allows to remind your users to register, using a dialog with various
- choices.
- </il>
- </ul></p>
-
- @since OOo 1.1.2
-*/
-published service ProductRegistration
-{
- /** allows to trigger certain events.
-
- <p>The string argument of <method scope="com::sun::star::task">XJobExecutor::trigger</method> is
- used to determine the type of the event. Currently supported events are:<br/>
- <ul><li><b>RegistrationRequired</b><br/>
- Determines that the registration is required to be executed.<br/>
- This is usually triggered by some user interaction, for instance upon choosing a menu item
- called <em>Registration</em>.</p>
- </li>
- </ul>
- </p>
- */
- service com::sun::star::task::JobExecutor;
-
- /** allows the registration request to be scheduled automatically.
-
- <p>There are processes which allow to schedule events and jobs, for instance there
- can be configuration settings scheduling which operations are to be executed upon an program
- startup. Such processes usually require the jobs to be executed to support the
- <type scope="com::sun::star::task">XJob</type> interface.</p>
-
- <p>That's why this service supports the <type scope="com::sun::star::task">XJob</type>, too.<br/>
- Calling the <method scope="com::sun::star::task">XJob::execute</method> method results in displaying a
- dialog which asks the user to register. This is done once per session, means you need to restart the
- process which called this.</p>
-
- <p>At the moment, there is no specification about how to use the arguments given in the
- <method scope="com::sun::star::task">XJob::execute</method> method, but this may change in future versions of the service
- descriptions, so to keep your implementation compatible, you should not use these arguments.</p>
- */
- interface com::sun::star::task::XJob;
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 503a0a4..5780ce6 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Compatibility.xcu \
org/openoffice/Office/ExtensionManager.xcu \
org/openoffice/Office/Impress.xcu \
- org/openoffice/Office/Jobs.xcu \
org/openoffice/Office/Labels.xcu \
org/openoffice/Office/Linguistic.xcu \
org/openoffice/Office/Logging.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
deleted file mode 100644
index 3f64c9b..0000000
--- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
+++ /dev/null
@@ -1,39 +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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="Jobs">
- <node oor:name="RegistrationRequest" oor:op="replace">
- <prop oor:name="Service">
- <value>com.sun.star.setup.ProductRegistration</value>
- </prop>
- </node>
- </node>
- <node oor:name="Events">
- </node>
-</oor:component-data>
More information about the Libreoffice-commits
mailing list