summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-07-05 08:56:15 +0000
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-07-05 10:35:30 +0000
commit860a82766f2c6d4fad340bf6ab283a7cd22a1fd5 (patch)
tree0a1cb2bd0bf836fb2cf3e22bd10c3f0b8b9380aa
parentloplugin:loopvartoosmall (diff)
downloadcore-860a82766f2c6d4fad340bf6ab283a7cd22a1fd5.tar.gz
core-860a82766f2c6d4fad340bf6ab283a7cd22a1fd5.zip
Remove last traces of First Start Wizard
Change-Id: Idf7171ecfd90edf47fb29d44b8036578a2e6ad61 Reviewed-on: https://gerrit.libreoffice.org/26935 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rwxr-xr-xl10ntools/source/gRun.sh2
-rw-r--r--officecfg/Configuration_officecfg.mk1
-rw-r--r--officecfg/files.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/FirstStartWizard.xcu47
-rw-r--r--officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs54
-rw-r--r--postprocess/CustomTarget_registry.mk2
6 files changed, 1 insertions, 106 deletions
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index e0f3206f73d4..8a83dc6e2e95 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -657,7 +657,7 @@ ${MYCMD} --files mysqlc/source/DataAccess.xcu
${MYCMD} --files mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
-${MYCMD} --base officecfg/registry/data/org/openoffice --files FirstStartWizard.xcu Inet.xcu Interaction.xcu
+${MYCMD} --base officecfg/registry/data/org/openoffice --files Inet.xcu Interaction.xcu
${MYCMD} --base officecfg/registry/data/org/openoffice/Office --files Accelerators.xcu Addons.xcu BasicIDE.xcu Calc.xcu Canvas.xcu Common.xcu Compatibility.xcu DataAccess.xcu Embedding.xcu ExtendedColorScheme.xcu ExtensionDependencies.xcu ExtensionManager.xcu FormWizard.xcu Histories.xcu Impress.xcu Jobs.xcu Linguistic.xcu Logging.xcu Math.xcu Paths.xcu PresentationMinimizer.xcu PresenterScreen.xcu ProtocolHandler.xcu Recovery.xcu ReportDesign.xcu Scripting.xcu Security.xcu TableWizard.xcu TypeDetection.xcu
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 1768f4e425a8..01741a5efdb7 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/System.xcu \
org/openoffice/UserProfile.xcu \
org/openoffice/VCL.xcu \
- org/openoffice/FirstStartWizard.xcu \
org/openoffice/Interaction.xcu \
org/openoffice/Office/Calc.xcu \
org/openoffice/Office/BasicIDE.xcu \
diff --git a/officecfg/files.mk b/officecfg/files.mk
index 904f4b70a250..69d0cf1e0a9f 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -7,7 +7,6 @@
#
officecfg_XCSFILES := \
- FirstStartWizard \
Inet \
Interaction \
LDAP \
diff --git a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
deleted file mode 100644
index 8070d449914f..000000000000
--- a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
- -->
-<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="FirstStartWizard" oor:package="org.openoffice">
- <node oor:name="TabPages">
- <node oor:name="Registration">
- <node oor:name="RegistrationOptions">
- <node oor:name="NowButton" oor:op="replace">
- <prop oor:name="Visible">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="LaterButton" oor:op="replace">
- <prop oor:name="Visible">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="NeverButton" oor:op="replace">
- <prop oor:name="Visible">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="AlreadyRegisteredButton" oor:op="replace">
- <prop oor:name="Visible">
- <value>true</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
-</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
deleted file mode 100644
index 3f3fb5ee9f01..000000000000
--- a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
- -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="FirstStartWizard" oor:package="org.openoffice" xml:lang="en-US">
- <info>
- <desc>Contains properties regarding the first start wizard.</desc>
- </info>
- <templates>
- <group oor:name="Option">
- <info>
- <desc>Describes properties of a wizard tab page option.</desc>
- </info>
- <prop oor:name="Visible" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>Determine if an option is visible or not.</desc>
- </info>
- <value>true</value>
- </prop>
- </group>
- </templates>
- <component>
- <group oor:name="TabPages">
- <info>
- <desc>Contains properties for the various first start wizard tab pages.</desc>
- </info>
- <group oor:name="Registration">
- <info>
- <desc>Specifies properties of the registration tab page.</desc>
- </info>
- <set oor:name="RegistrationOptions" oor:node-type="Option">
- <info>
- <desc>Specifies radio button properties of the registration tab page.</desc>
- </info>
- </set>
- </group>
- </group>
- </component>
-</oor:component-schema>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 6a9e2d19e457..0d4e93ec5177 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -122,7 +122,6 @@ postprocess_FILES_lingucomponent := \
$(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu \
postprocess_FILES_main := \
- $(postprocess_XCS)/FirstStartWizard.xcs \
$(postprocess_XCS)/Inet.xcs \
$(postprocess_XCS)/Interaction.xcs \
$(postprocess_XCS)/LDAP.xcs \
@@ -208,7 +207,6 @@ postprocess_FILES_main := \
$(postprocess_XCS)/ucb/Hierarchy.xcs \
$(postprocess_XCS)/ucb/InteractionHandler.xcs \
$(postprocess_XCS)/ucb/Store.xcs \
- $(postprocess_XCU)/FirstStartWizard.xcu \
$(postprocess_XCU)/Inet.xcu \
$(postprocess_XCU)/Interaction.xcu \
$(postprocess_XCU)/Office/Accelerators.xcu \