summaryrefslogtreecommitdiffstats
path: root/helpcontent2
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 05:03:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 05:09:28 +0000
commit97ac77f067910fa5e8206d75160fa63546a9358d (patch)
treee6fa64b43e8150ef65578afa4f1f40f3e19f7fa3 /helpcontent2
parentReleasing progress-linux version 4:24.2.2-3~progress7.99u1. (diff)
downloadlibreoffice-97ac77f067910fa5e8206d75160fa63546a9358d.tar.xz
libreoffice-97ac77f067910fa5e8206d75160fa63546a9358d.zip
Merging upstream version 4:24.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'helpcontent2')
-rw-r--r--helpcontent2/help3xsl/prism.css1
-rw-r--r--helpcontent2/helpers/unocmds.txt2
-rw-r--r--helpcontent2/source/text/shared/01/02230400.xhp1
-rw-r--r--helpcontent2/source/text/shared/04/01010000.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/pdf_params.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/usingthemes.xhp1
-rw-r--r--helpcontent2/source/text/simpress/01/06060000.xhp1
7 files changed, 6 insertions, 6 deletions
diff --git a/helpcontent2/help3xsl/prism.css b/helpcontent2/help3xsl/prism.css
index 4610909810..54f0bf021e 100644
--- a/helpcontent2/help3xsl/prism.css
+++ b/helpcontent2/help3xsl/prism.css
@@ -39,7 +39,6 @@ pre[class*="language-"] {
pre[class*="language-"] > code {
position: relative;
- z-index: 1;
border-left: 10px solid #358ccb;
box-shadow: -1px 0px 0px 0px #358ccb, 0px 0px 0px 1px #dfdfdf;
background-color: #fdfdfd;
diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt
index e5ece05cf1..835c1f4817 100644
--- a/helpcontent2/helpers/unocmds.txt
+++ b/helpcontent2/helpers/unocmds.txt
@@ -338,7 +338,7 @@
.uno:EditDoc;shared/02/07070000.xhp
.uno:EditFootnote;swriter/01/02150000.xhp
.uno:EditGlossary;swriter/01/02120000.xhp
-.uno:EditHeaderAndFooter;scalc/01/02120000.xhp
+.uno:EditHeaderAndFooter;scalc/01/02120100.xhp
.uno:EditHyperlink;shared/02/09070000.xhp
.uno:EditLinks;shared/01/02180000.xhp
.uno:EditPrintArea;scalc/01/05080300.xhp
diff --git a/helpcontent2/source/text/shared/01/02230400.xhp b/helpcontent2/source/text/shared/01/02230400.xhp
index 107b773128..38de1cfc24 100644
--- a/helpcontent2/source/text/shared/01/02230400.xhp
+++ b/helpcontent2/source/text/shared/01/02230400.xhp
@@ -29,6 +29,7 @@
</meta>
<body>
<bookmark branch="hid/.uno:AcceptChanges" xml-lang="en-US" id="bm_id3149991" localize="false"/>
+ <bookmark branch="hid/SIDEBAR_SWMANAGECHANGESDECK" id="bm_id711703164589557" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinecontrol/tabcontrol/@@nowidget@@" id="bm_id3154025" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinecontrol/tabcontrol" id="bm_id3154025" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW_HID_REDLINE_CTRL" id="bm_id2513258" localize="false"/>
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 6ce842fd24..b13f80396c 100644
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -240,7 +240,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3158414" role="tablecontent"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+H</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3158414" role="tablecontent"><switchinline select="sys"><caseinline select="MAC">Command+Option+F</caseinline><defaultinline>Ctrl+H</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150090" role="tablecontent">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/pdf_params.xhp b/helpcontent2/source/text/shared/guide/pdf_params.xhp
index 04d172be1d..04d51074dd 100644
--- a/helpcontent2/source/text/shared/guide/pdf_params.xhp
+++ b/helpcontent2/source/text/shared/guide/pdf_params.xhp
@@ -926,7 +926,7 @@
<paragraph id="par_id731682125169856" localize="false" role="tablecontent"><literal>PreparedPasswords</literal></paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id831682125169857" role="tablecontent"></paragraph>
+ <paragraph id="par_id831682125169857" localize="false" role="tablecontent"></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id871682125169858" localize="false" role="tablecontent"></paragraph>
@@ -940,7 +940,7 @@
<paragraph id="par_id241682125214902" localize="false" role="tablecontent"><literal>PreparedPermissionPassword</literal></paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id401682125214903" role="tablecontent"></paragraph>
+ <paragraph id="par_id401682125214903" localize="false" role="tablecontent"></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id251682125214904" localize="false" role="tablecontent">string</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/usingthemes.xhp b/helpcontent2/source/text/shared/guide/usingthemes.xhp
index df1ab52bd9..26ead5291b 100644
--- a/helpcontent2/source/text/shared/guide/usingthemes.xhp
+++ b/helpcontent2/source/text/shared/guide/usingthemes.xhp
@@ -22,7 +22,6 @@
</bookmark>
<section id="usingthemesHead">
<h1 id="hd_id911691103974397"><variable id="h1"><link href="text/shared/guide/usingthemes.xhp">Using Document Themes</link></variable></h1>
- <paragraph id="par_id991691103974400" role="paragraph"></paragraph>
</section>
<paragraph role="paragraph" id="par_id451691109216603">Theme is the concept of bundling color, font and format settings. The colors, fonts and format settings names are hard coded in the document. When switching themes in the document, the elements containing the hardcoded names switch colors, fonts and format settings accordingly to the new theme.</paragraph>
<h2 id="hd_id761691104702168">To Apply a Theme to the Document</h2>
diff --git a/helpcontent2/source/text/simpress/01/06060000.xhp b/helpcontent2/source/text/simpress/01/06060000.xhp
index b3c695d854..6a51b64d83 100644
--- a/helpcontent2/source/text/simpress/01/06060000.xhp
+++ b/helpcontent2/source/text/simpress/01/06060000.xhp
@@ -39,6 +39,7 @@
<bookmark_value>animations;list of</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:CustomAnimation" id="bm_id2649006" localize="false"/>
+<bookmark branch="hid/SIDEBAR_SDCUSTOMANIMATIONDECK" id="bm_id821703261800630" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/customanimationspanel/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/customanimationspanel/CustomAnimationsPanel" id="bm_id3151244" localize="false"/>
<h1 id="hd_id3148837"><link href="text/simpress/01/06060000.xhp">Animation Pane</link></h1>