You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/08/12 18:05:00 UTC
[openoffice] branch AOO418 updated (d8c68a9 -> 787546a)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from d8c68a9 Small adjustment for More-Button
new 1fef760 Removed Help page for Improvement program (can be deleted later)
new 8d931aa Removed improvement.xhp from makefiles
new 787546a Removed improvement.xhp from makefiles (finally)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../source/text/shared/optionen/01010000.xhp | 20 ++++++++++----------
.../source/text/shared/optionen/makefile.mk | 1 -
main/helpcontent2/util/sbasic/makefile.mk | 1 -
main/helpcontent2/util/scalc/makefile.mk | 1 -
main/helpcontent2/util/schart/makefile.mk | 1 -
main/helpcontent2/util/sdatabase/makefile.mk | 1 -
main/helpcontent2/util/sdraw/makefile.mk | 1 -
main/helpcontent2/util/simpress/makefile.mk | 1 -
main/helpcontent2/util/smath/makefile.mk | 1 -
main/helpcontent2/util/swriter/makefile.mk | 1 -
10 files changed, 10 insertions(+), 19 deletions(-)
[openoffice] 02/03: Removed improvement.xhp from makefiles
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8d931aaf19640630d6e4e45aba12d9d62da409ca
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Aug 11 11:26:55 2020 +0200
Removed improvement.xhp from makefiles
(cherry picked from commit 65f20295cb7f9e03daf4f5d0c12af0f41a344bee)
---
main/helpcontent2/util/sbasic/makefile.mk | 2 +-
main/helpcontent2/util/scalc/makefile.mk | 2 +-
main/helpcontent2/util/schart/makefile.mk | 2 +-
main/helpcontent2/util/sdatabase/makefile.mk | 2 +-
main/helpcontent2/util/sdraw/makefile.mk | 2 +-
main/helpcontent2/util/simpress/makefile.mk | 2 +-
main/helpcontent2/util/smath/makefile.mk | 2 +-
main/helpcontent2/util/swriter/makefile.mk | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/main/helpcontent2/util/sbasic/makefile.mk b/main/helpcontent2/util/sbasic/makefile.mk
index 52b743a..b9b25eb 100644
--- a/main/helpcontent2/util/sbasic/makefile.mk
+++ b/main/helpcontent2/util/sbasic/makefile.mk
@@ -1231,7 +1231,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/scalc/makefile.mk b/main/helpcontent2/util/scalc/makefile.mk
index 59f787a..5babf5e 100644
--- a/main/helpcontent2/util/scalc/makefile.mk
+++ b/main/helpcontent2/util/scalc/makefile.mk
@@ -1244,7 +1244,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/schart/makefile.mk b/main/helpcontent2/util/schart/makefile.mk
index fc943e9..fe11337 100644
--- a/main/helpcontent2/util/schart/makefile.mk
+++ b/main/helpcontent2/util/schart/makefile.mk
@@ -932,7 +932,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/sdatabase/makefile.mk b/main/helpcontent2/util/sdatabase/makefile.mk
index d22a4fc..eab6da7 100644
--- a/main/helpcontent2/util/sdatabase/makefile.mk
+++ b/main/helpcontent2/util/sdatabase/makefile.mk
@@ -930,7 +930,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/sdraw/makefile.mk b/main/helpcontent2/util/sdraw/makefile.mk
index c61dbb7..6c11c0b 100644
--- a/main/helpcontent2/util/sdraw/makefile.mk
+++ b/main/helpcontent2/util/sdraw/makefile.mk
@@ -1165,7 +1165,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/simpress/makefile.mk b/main/helpcontent2/util/simpress/makefile.mk
index 2272bad..bc52222 100644
--- a/main/helpcontent2/util/simpress/makefile.mk
+++ b/main/helpcontent2/util/simpress/makefile.mk
@@ -1175,7 +1175,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/smath/makefile.mk b/main/helpcontent2/util/smath/makefile.mk
index b2f202a..145c87d 100644
--- a/main/helpcontent2/util/smath/makefile.mk
+++ b/main/helpcontent2/util/smath/makefile.mk
@@ -1010,7 +1010,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/swriter/makefile.mk b/main/helpcontent2/util/swriter/makefile.mk
index 1bd8555..8193de0 100644
--- a/main/helpcontent2/util/swriter/makefile.mk
+++ b/main/helpcontent2/util/swriter/makefile.mk
@@ -1322,7 +1322,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
- text$/shared$/optionen$/improvement.xhp \
+# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
[openoffice] 03/03: Removed improvement.xhp from makefiles (finally)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 787546a0bd53c78489200311961fb621d00e1e69
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Aug 12 19:16:38 2020 +0200
Removed improvement.xhp from makefiles (finally)
(cherry picked from commit b08fe871c064e16e15519260ef810cabe7c18ab7)
---
main/helpcontent2/source/text/shared/optionen/makefile.mk | 1 -
main/helpcontent2/util/sbasic/makefile.mk | 1 -
main/helpcontent2/util/scalc/makefile.mk | 1 -
main/helpcontent2/util/schart/makefile.mk | 1 -
main/helpcontent2/util/sdatabase/makefile.mk | 1 -
main/helpcontent2/util/sdraw/makefile.mk | 1 -
main/helpcontent2/util/simpress/makefile.mk | 1 -
main/helpcontent2/util/smath/makefile.mk | 1 -
main/helpcontent2/util/swriter/makefile.mk | 1 -
9 files changed, 9 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/optionen/makefile.mk b/main/helpcontent2/source/text/shared/optionen/makefile.mk
index 78872a1..9fa182a 100644
--- a/main/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/main/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -108,7 +108,6 @@ XHPFILES = \
01160100.xhp \
01160200.xhp \
01160201.xhp \
-# improvement.xhp \
java.xhp \
javaclasspath.xhp \
javaparameters.xhp \
diff --git a/main/helpcontent2/util/sbasic/makefile.mk b/main/helpcontent2/util/sbasic/makefile.mk
index b9b25eb..5656819 100644
--- a/main/helpcontent2/util/sbasic/makefile.mk
+++ b/main/helpcontent2/util/sbasic/makefile.mk
@@ -1231,7 +1231,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/scalc/makefile.mk b/main/helpcontent2/util/scalc/makefile.mk
index 5babf5e..30e96e4 100644
--- a/main/helpcontent2/util/scalc/makefile.mk
+++ b/main/helpcontent2/util/scalc/makefile.mk
@@ -1244,7 +1244,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/schart/makefile.mk b/main/helpcontent2/util/schart/makefile.mk
index fe11337..4765a1a 100644
--- a/main/helpcontent2/util/schart/makefile.mk
+++ b/main/helpcontent2/util/schart/makefile.mk
@@ -932,7 +932,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/sdatabase/makefile.mk b/main/helpcontent2/util/sdatabase/makefile.mk
index eab6da7..98a57fd 100644
--- a/main/helpcontent2/util/sdatabase/makefile.mk
+++ b/main/helpcontent2/util/sdatabase/makefile.mk
@@ -930,7 +930,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/sdraw/makefile.mk b/main/helpcontent2/util/sdraw/makefile.mk
index 6c11c0b..e94324d 100644
--- a/main/helpcontent2/util/sdraw/makefile.mk
+++ b/main/helpcontent2/util/sdraw/makefile.mk
@@ -1165,7 +1165,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/simpress/makefile.mk b/main/helpcontent2/util/simpress/makefile.mk
index bc52222..cfa33ef 100644
--- a/main/helpcontent2/util/simpress/makefile.mk
+++ b/main/helpcontent2/util/simpress/makefile.mk
@@ -1175,7 +1175,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/smath/makefile.mk b/main/helpcontent2/util/smath/makefile.mk
index 145c87d..37c1349 100644
--- a/main/helpcontent2/util/smath/makefile.mk
+++ b/main/helpcontent2/util/smath/makefile.mk
@@ -1010,7 +1010,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
diff --git a/main/helpcontent2/util/swriter/makefile.mk b/main/helpcontent2/util/swriter/makefile.mk
index 8193de0..2b257f1 100644
--- a/main/helpcontent2/util/swriter/makefile.mk
+++ b/main/helpcontent2/util/swriter/makefile.mk
@@ -1322,7 +1322,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01160100.xhp \
text$/shared$/optionen$/01160200.xhp \
text$/shared$/optionen$/01160201.xhp \
-# text$/shared$/optionen$/improvement.xhp \
text$/shared$/optionen$/java.xhp \
text$/shared$/optionen$/javaclasspath.xhp \
text$/shared$/optionen$/javaparameters.xhp \
[openoffice] 01/03: Removed Help page for Improvement program (can
be deleted later)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1fef7604670a37f69a4fa90b3bc4b7cd24792e32
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Aug 10 20:05:11 2020 +0200
Removed Help page for Improvement program (can be deleted later)
(cherry picked from commit eedafe4c15d880f9d3441193186150cf95a9fb68)
---
.../source/text/shared/optionen/01010000.xhp | 20 ++++++++++----------
.../source/text/shared/optionen/makefile.mk | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/optionen/01010000.xhp b/main/helpcontent2/source/text/shared/optionen/01010000.xhp
index c2800cb..135a3ca 100644
--- a/main/helpcontent2/source/text/shared/optionen/01010000.xhp
+++ b/main/helpcontent2/source/text/shared/optionen/01010000.xhp
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
+
<!--***********************************************************
- *
+ *
* 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
@@ -10,21 +11,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
+
<meta>
<topic id="textsharedoptionen01010000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">$[officename]</title>
@@ -34,7 +34,7 @@
<body>
<!-- removed HID SID_GENERAL_OPTIONS -->
<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="1" l10n="U" oldref="1">$[officename]</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
</variable> These settings are saved automatically.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
@@ -52,7 +52,7 @@
<embed href="text/shared/optionen/01013000.xhp#accessibility"/>
<embed href="text/shared/optionen/java.xhp#java"/>
<embed href="text/shared/optionen/online_update.xhp#online_update"/>
- <embed href="text/shared/optionen/improvement.xhp#improvement"/>
+<!-- <embed href="text/shared/optionen/improvement.xhp#improvement"/> -->
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/main/helpcontent2/source/text/shared/optionen/makefile.mk b/main/helpcontent2/source/text/shared/optionen/makefile.mk
index 5c8a422..78872a1 100644
--- a/main/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/main/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -108,7 +108,7 @@ XHPFILES = \
01160100.xhp \
01160200.xhp \
01160201.xhp \
- improvement.xhp \
+# improvement.xhp \
java.xhp \
javaclasspath.xhp \
javaparameters.xhp \