This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new e312442 Fixed Background -> Area
e312442 is described below
commit e3124422f43dd0a36c31fca08948a2683f4cb0d6
Author: mseidel <[email protected]>
AuthorDate: Mon Mar 15 20:33:57 2021 +0100
Fixed Background -> Area
(cherry picked from commit 1b7d3ba7ca995366a07aee68c1ea0a32a81b0fc8)
---
.../source/text/shared/guide/background.xhp | 32 +++++++++-------------
.../source/text/swriter/guide/background.xhp | 13 ++++-----
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/guide/background.xhp
b/main/helpcontent2/source/text/shared/guide/background.xhp
index 6861f30..9f1539d 100644
--- a/main/helpcontent2/source/text/shared/guide/background.xhp
+++ b/main/helpcontent2/source/text/shared/guide/background.xhp
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--***********************************************************
- *
+ *
* 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
@@ -11,22 +9,21 @@
* 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.
- *
+ *
***********************************************************-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidebackgroundxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Defining Background Colors or Background
Graphics</title>
@@ -34,9 +31,7 @@
</topic>
</meta>
<body>
-
-
-
+
<bookmark xml-lang="en-US" branch="index"
id="bm_id3149346"><bookmark_value>backgrounds; defining
colors/pictures</bookmark_value>
<bookmark_value>colors; backgrounds</bookmark_value>
<bookmark_value>pictures; backgrounds</bookmark_value>
@@ -45,32 +40,31 @@
<bookmark_value>text, see also text documents, paragraphs and
characters</bookmark_value>
</bookmark>
<comment>MW deleted 6 entries and changed "pages;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1"
l10n="U" oldref="1"><variable id="background"><link
href="text/shared/guide/background.xhp" name="Defining Graphics or Colors in
the Background of Pages (Watermark)">Defining Graphics or Colors in the
Background of Pages (Watermark)</link>
+ <paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1"
l10n="U" oldref="1"><variable id="background"><link
href="text/shared/guide/background.xhp" name="Defining Graphics or Colors in
the Background of Pages (Watermark)">Defining Graphics or Colors in the
Background of Pages (Watermark)</link>
</variable></paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3153878" role="listitem" l10n="U"
oldref="25">Choose <emph>Format - Page</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149581" role="listitem" l10n="U"
oldref="26">On the <emph>Background</emph> tab page, select a background color
or a background graphic.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149581" role="listitem" l10n="U"
oldref="26">On the <emph>Area</emph> tab page, select a background color or a
background graphic.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154097" role="note" l10n="U"
oldref="27">In spreadsheets this background appears only in the print behind
the cells not formatted elsewhere.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
-
-
+
<switch select="appl">
-
+
<case select="IMPRESS">
<embed href="text/simpress/guide/background.xhp#background"/>
-
+
</case>
-
+
</switch>
<paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U"
oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab
page"><emph>Background</emph> tab page</link></paragraph>
<paragraph xml-lang="en-US" id="par_id2711569" role="paragraph"
l10n="NEW"><link href="text/swriter/guide/background.xhp">Backgrounds in
Text</link></paragraph>
<paragraph xml-lang="en-US" id="par_id8591570" role="paragraph"
l10n="NEW"><link href="text/scalc/guide/background.xhp">Backgrounds in
Spreadsheets</link></paragraph>
-
+
</section>
</body>
</helpdocument>
diff --git a/main/helpcontent2/source/text/swriter/guide/background.xhp
b/main/helpcontent2/source/text/swriter/guide/background.xhp
index 0596e20..9bc3156 100644
--- a/main/helpcontent2/source/text/swriter/guide/background.xhp
+++ b/main/helpcontent2/source/text/swriter/guide/background.xhp
@@ -2,7 +2,7 @@
<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 +10,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="textswriterguidebackgroundxhp" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">Defining Background Colors or
Background Graphics</title>
@@ -64,7 +63,7 @@
<paragraph xml-lang="en-US" id="par_id3158430" role="listitem"
l10n="U" oldref="9">Choose <emph>Format - Paragraph</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3151245" role="listitem"
l10n="U" oldref="10">On the <emph>Background</emph> tab page, select the
background color or a background graphic.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="listitem"
l10n="U" oldref="10">On the <emph>Area</emph> tab page, select the background
color or a background graphic.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id0104201010554939" role="tip"
l10n="NEW">To select an object in the background, hold down the <switchinline
select="sys"><caseinline
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>
key and click the object. Alternatively, use the Navigator to select the
object.</paragraph>
@@ -104,4 +103,4 @@
<paragraph xml-lang="en-US" id="par_id478530" role="paragraph"
l10n="NEW"><link href="text/swriter/guide/pagebackground.xhp">Page Backgrounds
as Page Styles</link></paragraph>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
