source/text/scalc/00/sheet_menu.xhp | 4 ++--
source/text/scalc/01/04060107.xhp | 2 +-
source/text/scalc/01/05120000.xhp | 2 ++
source/text/schart/01/04010000.xhp | 1 -
source/text/schart/01/04050100.xhp | 3 +--
source/text/shared/guide/start_parameters.xhp | 10 +++++-----
source/text/shared/guide/template_manager.xhp | 2 +-
source/text/simpress/guide/gluepoints.xhp | 4 ++--
source/text/swriter/01/mailmerge05.xhp | 3 +--
source/text/swriter/guide/protection.xhp | 4 ++--
source/text/swriter/librelogo/LibreLogo.xhp | 4 ++--
11 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 7d4439d5b834de3cb9b7d0d1dc8afe41d30c76b2
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 22:41:42 2017 +0200
bookmark is no valid child of list
Change-Id: I29f56351df69aca3f04d4a88f1a44073f120e327
diff --git a/source/text/schart/01/04050100.xhp
b/source/text/schart/01/04050100.xhp
index c0037b468..90046172d 100644
--- a/source/text/schart/01/04050100.xhp
+++ b/source/text/schart/01/04050100.xhp
@@ -118,8 +118,7 @@
<listitem>
<paragraph id="par_id4349192" role="paragraph" xml-lang="en-US">To insert
a trend line for a data series, select the data series in the chart. Choose
<item type="menuitem">Insert - Trend Line</item>, or right-click to open the
context menu, and choose <item type="menuitem">Insert Trend
Line</item>.</paragraph>
</listitem>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuMeanValues"
id="bm_id7854243" localize="false"/>
- <listitem>
+ <listitem><bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuMeanValues"
id="bm_id7854243" localize="false"/>
<paragraph id="par_id180820161539033867" role="paragraph"
xml-lang="en-US">Mean Value Lines are special trend lines that show the mean
value. Use <item type="menuitem">Insert - Mean Value Lines</item> to insert
mean value lines for data series.</paragraph>
<embed href="text/schart/01/04030000.xhp#context"/>
</listitem>
commit 0471f5a415ad52f9bb666477fd3ba33e202b87b7
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 22:35:17 2017 +0200
no CDATA (random literals) allowed as child in body
Change-Id: I432e8f0b5a4e8168d94987a2ef44d679cbb5c024
diff --git a/source/text/schart/01/04010000.xhp
b/source/text/schart/01/04010000.xhp
index 715ebe789..b88b41505 100644
--- a/source/text/schart/01/04010000.xhp
+++ b/source/text/schart/01/04010000.xhp
@@ -40,7 +40,6 @@
<bookmark xml-lang="en-US"
branch="hid/modules/schart/ui/inserttitledlg/maintitle" id="bm_id3146314"
localize="false"/>
<paragraph role="heading" id="hd_id3150207" xml-lang="en-US"
level="3">Title</paragraph>
<paragraph role="paragraph" id="par_id3150371" xml-lang="en-US"><ahelp
hid="modules/schart/ui/inserttitledlg/maintitle">Enter the desired title for
the chart.</ahelp> This will be displayed at the top of the chart.</paragraph>
-X
<bookmark xml-lang="en-US"
branch="hid/modules/schart/ui/inserttitledlg/subtitle" id="bm_id3146315"
localize="false"/>
<paragraph role="heading" id="hd_id3146980" xml-lang="en-US"
level="3">Subtitle</paragraph>
<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US"><ahelp
hid="modules/schart/ui/inserttitledlg/subtitle">Enter the desired subtitle for
the chart.</ahelp> This will be displayed under the title set in the
<emph>Title</emph> field.</paragraph>
commit dd1425ce62fde38d1501634238c3da97f4c641bc
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 22:25:28 2017 +0200
no paragraph or section outside body allowed
Change-Id: I955eb36ad43b4338fbd7aa9cd59c1138c27cc578
diff --git a/source/text/scalc/00/sheet_menu.xhp
b/source/text/scalc/00/sheet_menu.xhp
index 824a4bc50..04e6e6ac0 100644
--- a/source/text/scalc/00/sheet_menu.xhp
+++ b/source/text/scalc/00/sheet_menu.xhp
@@ -37,8 +37,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US"><variable
id="insert_page_break_row">Choose <emph>Sheet - Insert Page Break - Row
Break</emph></variable></paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US"><variable
id="insert_page_break_column">Choose <emph>Sheet - Insert Page Break - Column
Break</emph></variable></paragraph>
-</body>
<paragraph id="par_id3153093" role="paragraph" xml-lang="en-US"><variable
id="delete_page_break">Choose <emph>Sheet - Delete Page
Break</emph></variable></paragraph>
<paragraph id="par_id3153191" role="paragraph" xml-lang="en-US"><variable
id="delete_page_break_row">Choose <emph>Sheet - Delete Page Break - Row
Break</emph></variable></paragraph>
<paragraph id="par_id3145645" role="paragraph" xml-lang="en-US"><variable
id="delete_page_break_column">Choose <emph>Sheet - Delete Page Break - Column
Break</emph></variable></paragraph>
-</helpdocument>
\ No newline at end of file
+</body>
+</helpdocument>
diff --git a/source/text/swriter/01/mailmerge05.xhp
b/source/text/swriter/01/mailmerge05.xhp
index 489ed17dc..44a9229c9 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -62,9 +62,8 @@
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US"><ahelp
hid=".">Select a magnification for the print preview.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US">Use the
commands in the context menu of the preview to move the view up and
down.</paragraph>
<paragraph id="hd_idN10584" role="paragraph" xml-lang="en-US">Press the
<emph>Finish</emph> button and use the <link
href="text/swriter/mailmergetoolbar.xhp">Mail Merge Toolbar</link> to finish
the mail merge process.</paragraph>
-
-</body>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US"><link
href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link>
overview</paragraph>
</section>
+</body>
</helpdocument>
commit bac5cf45db2a0c38c67e5f10118511f7ef562373
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 22:14:09 2017 +0200
switchinline still is no valid child of "item" or "emph"
Change-Id: I175560732e50bbf96f652a77a7674e7283b3583c
diff --git a/source/text/scalc/01/04060107.xhp
b/source/text/scalc/01/04060107.xhp
index 46203e749..92ec7c4ad 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -695,7 +695,7 @@
<paragraph id="par_id3166145" role="code"
xml-lang="en-US">TRANSPOSE(A1:D2)</paragraph>
-<paragraph id="par_id3178518" role="paragraph" xml-lang="en-US">Then
<emph>make sure to enter it as matrix formula with <switchinline
select="sys"><caseinline
select="MAC">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline></emph>.
The result will be as follows:</paragraph>
+<paragraph id="par_id3178518" role="paragraph" xml-lang="en-US">Then
<emph>make sure to enter it as matrix formula with </emph><switchinline
select="sys"><caseinline
select="MAC"><emph>Shift+Command+Enter</emph></caseinline><defaultinline><emph>Shift+Ctrl+Enter</emph></defaultinline></switchinline>.
The result will be as follows:</paragraph>
<table id="tbl_id6215816">
<tablerow>
diff --git a/source/text/shared/guide/template_manager.xhp
b/source/text/shared/guide/template_manager.xhp
index e1f3fb3b4..efab02b6b 100644
--- a/source/text/shared/guide/template_manager.xhp
+++ b/source/text/shared/guide/template_manager.xhp
@@ -48,7 +48,7 @@
<section id="howtoget">
<paragraph id="par_id04162017072349624" role="paragraph"
xml-lang="en-US">Choose menu <item type="menuitem">File - New â
Templates.</item></paragraph>
<paragraph id="par_id041620170723496526" role="paragraph"
xml-lang="en-US">Choose menu <item type="menuitem">File â Template â Manage
Templates.</item></paragraph>
-<paragraph id="par_id041620170723493622" role="paragraph"
xml-lang="en-US">Enter <item type="menuitem"><switchinline
select="sys"><caseinline
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+N
</item>in any %PRODUCTNAME module.</paragraph>
+<paragraph id="par_id041620170723493622" role="paragraph"
xml-lang="en-US">Enter <switchinline select="sys"><caseinline
select="MAC"><item
type="menuitem">Command</item></caseinline><defaultinline><item
type="menuitem">Ctrl</item></defaultinline></switchinline><item
type="menuitem">+Shift+N </item>in any %PRODUCTNAME module.</paragraph>
<paragraph id="par_id041620170723497279" role="paragraph"
xml-lang="en-US">Press the <item type="menuitem">Templates </item>button in the
Start Center.</paragraph>
<paragraph id="par_id041620170723509119" role="paragraph"
xml-lang="en-US">Select any template type from the <item
type="menuitem">Templates </item>button of the Start Center.</paragraph>
</section>
diff --git a/source/text/swriter/guide/protection.xhp
b/source/text/swriter/guide/protection.xhp
index 36d587c66..982e15c36 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -153,11 +153,11 @@
<paragraph id="hd_id1811201623985" role="heading" level="2"
xml-lang="en-US">Protection of the whole <item
type="productname">%PRODUCTNAME</item> Writer document from changes.</paragraph>
<paragraph id="par_id31544811" role="paragraph" xml-lang="en-US">You can
protect the contents of <item type="productname">%PRODUCTNAME</item> Writer
document from changes, with one of the following file formats: .doc, .docx,
.odt, .ott.</paragraph>
<paragraph id="par_id18112016398104" role="warning" localize="false"
xml-lang="en-US"><embedvar
href="text/swriter/guide/protection.xhp#protwarn"/></paragraph>
-<paragraph id="par_id18112016812973" role="paragraph" xml-lang="en-US">To
enable the protection of the whole document, go to <emph><switchinline
select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME -
Preferences</item></caseinline><defaultinline><item type="menuitem">Tools -
Options</item></defaultinline></switchinline><item type="menuitem"> -
%PRODUCTNAME Writer - Compatibility</item></emph> and choose <emph>Protect
form</emph>. To disable protection, uncheck it.</paragraph>
+<paragraph id="par_id18112016812973" role="paragraph" xml-lang="en-US">To
enable the protection of the whole document, go to <switchinline
select="sys"><caseinline select="MAC"><emph><item type="menuitem">%PRODUCTNAME
- Preferences</item></emph></caseinline><defaultinline><emph><item
type="menuitem">Tools -
Options</item></emph></defaultinline></switchinline><emph><item
type="menuitem"> - %PRODUCTNAME Writer - Compatibility</item></emph> and choose
<emph>Protect form</emph>. To disable protection, uncheck it.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
<paragraph id="par_idN10B8C" role="paragraph" localize="false"
xml-lang="en-US"> <embedvar
href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
</paragraph>
<paragraph id="par_id7858516" role="paragraph" xml-lang="en-US"><link
href="text/shared/guide/protection.xhp">Protecting Other
Contents</link></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 4787848911c83efdc46534af4285a09c8eee4569
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 22:07:12 2017 +0200
readd woraround for nested lists to be valid against DTD
thus partial revert of 2e141341684eb610834db92693d715f3fd01d0dd
Change-Id: I9909c267286e22623283f343f26e1ac36473c602
diff --git a/source/text/scalc/01/05120000.xhp
b/source/text/scalc/01/05120000.xhp
index 83856237e..ee3a0db7f 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -49,6 +49,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id31494134" role="listitem">If
you select <emph>Cell value is</emph>:</paragraph>
+ <switch select="sys"><comment>FIXME: Hack to get a nested
list</comment><default>
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id31494135"
role="listitem">Select a condition in the drop down list for the format to be
applied to the selected cells and enter the value.</paragraph>
@@ -63,6 +64,7 @@
<paragraph xml-lang="en-US" id="par_id31494138"
role="listitem">In the <emph>Range</emph> field, define the range of cells
concerned by the conditional formatting. Click on the <emph>Shrink</emph>
button to minimize the dialog box. Click again on the button to come back to
the dialog box once the range is selected.</paragraph>
</listitem>
</list>
+ </default></switch>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id31494139" role="listitem">If you
select <emph>Formula is</emph> as a reference, enter a cell reference.
diff --git a/source/text/simpress/guide/gluepoints.xhp
b/source/text/simpress/guide/gluepoints.xhp
index c3eeb5e56..6dc0cd2a2 100644
--- a/source/text/simpress/guide/gluepoints.xhp
+++ b/source/text/simpress/guide/gluepoints.xhp
@@ -37,7 +37,7 @@
<listitem>
<paragraph role="paragraph" id="par_id091920080304108" xml-lang="en-US">Do one
of the following to get existing glue points visible for all
elements:</paragraph>
</listitem>
-<listitem>
+<listitem><switch select="sys"><comment>FIXME: Hack to get a nested
list</comment><default>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id0919200803041082" xml-lang="en-US">Click
the <emph>Glue Point</emph> icon on the Drawing toolbar.</paragraph>
@@ -46,7 +46,7 @@
<paragraph role="paragraph" id="par_id0919200803041186"
xml-lang="en-US">Choose <item type="menuitem">Edit - Glue
Points</item>.</paragraph>
</listitem>
</list>
-</listitem>
+</default></switch></listitem>
<listitem>
<paragraph role="paragraph" id="par_id0919200803041160" xml-lang="en-US">Click
the <emph>Insert Glue Point</emph> icon on the Gluepoints toolbar.</paragraph>
</listitem>
diff --git a/source/text/swriter/librelogo/LibreLogo.xhp
b/source/text/swriter/librelogo/LibreLogo.xhp
index 5cf35de22..d00551956 100644
--- a/source/text/swriter/librelogo/LibreLogo.xhp
+++ b/source/text/swriter/librelogo/LibreLogo.xhp
@@ -59,7 +59,7 @@
<listitem>
<paragraph role="listitem" xml-lang="en-US" id="par_490">Program
blocks and lists are different</paragraph>
</listitem>
- <listitem>
+ <listitem><switch select="sys"><comment>FIXME: Hack to get a nested
list</comment><default>
<list type="unordered">
<listitem>
<paragraph role="listitem" xml-lang="en-US"
id="par_500">Program blocks need space or new line at parenthesization: REPEAT
10 [ FORWARD 10 LEFT 36 ]</paragraph>
@@ -68,7 +68,7 @@
<paragraph role="listitem" xml-lang="en-US" id="par_510">Lists
need close parenthesization: POSITION [0, 0], and not POSITION [ 0, 0
]</paragraph>
</listitem>
</list>
- </listitem>
+ </default></switch></listitem>
<listitem>
<paragraph role="listitem" xml-lang="en-US" id="par_520">1-line
function declarations are not supported (TO and END need new lines).</paragraph>
</listitem>
commit 49debfe3023f1e84f7ef8fcbaeb7583eba164b68
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed May 17 21:59:59 2017 +0200
table requires id attribute
Change-Id: Icd2de9c8f0be2f5c35952f227b4ba38b38e2c04c
diff --git a/source/text/shared/guide/start_parameters.xhp
b/source/text/shared/guide/start_parameters.xhp
index 40d579c2f..d230cc607 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -216,7 +216,7 @@
</table>
<paragraph id="hd_id20161204103115358" role="heading" level="3"
xml-lang="en-US">User/programmatic interface control</paragraph>
- <table>
+ <table id="tbl_id20170517001">
<tablerow>
<tablecell>
<paragraph id="par_id20161204095215085" role="tablehead"
localize="false" xml-lang="en-US"><embedvar
href="text/shared/guide/start_parameters.xhp#parameter"/></paragraph>
@@ -315,7 +315,7 @@
</table>
<paragraph id="par_id201612041220386" role="heading" level="3"
xml-lang="en-US">Developer arguments</paragraph>
- <table>
+ <table id="tbl_id20170517002">
<tablerow>
<tablecell>
<paragraph id="par_id20161204095215085" role="tablehead"
localize="false" xml-lang="en-US"><embedvar
href="text/shared/guide/start_parameters.xhp#parameter"/></paragraph>
@@ -344,7 +344,7 @@
<paragraph id="par_id20161204122420839" role="heading" level="3"
xml-lang="en-US">New document creation arguments</paragraph>
<paragraph id="par_id20161204122414892" role="note" xml-lang="en-US">The
arguments create an empty document of specified kind. Only one of them may be
used in one command line. If filenames are specified after an argument, then it
tries to open those files in the specified component.</paragraph>
- <table>
+ <table id="tbl_id20170517003">
<tablerow>
<tablecell>
<paragraph id="par_id20161204095215085" role="tablehead"
localize="false" xml-lang="en-US"><embedvar
href="text/shared/guide/start_parameters.xhp#parameter"/></paragraph>
@@ -412,7 +412,7 @@
</table>
<paragraph id="par_id20161204125123476" role="heading" level="3"
xml-lang="en-US">File open arguments</paragraph>
<paragraph id="par_id20161204125411030" role="note" xml-lang="en-US">The
arguments define how following filenames are treated. New treatment begins
after the argument and ends at the next argument. The default treatment is to
open documents for editing, and create new documents from document
templates.</paragraph>
- <table>
+ <table id="tbl_id20170517004">
<tablerow>
<tablecell>
<paragraph id="par_id20161204095215085" role="tablehead"
localize="false" xml-lang="en-US"><embedvar
href="text/shared/guide/start_parameters.xhp#parameter"/></paragraph>
@@ -512,7 +512,7 @@
</tablerow>
</table>
<paragraph id="par_id20161204014126760" role="heading" level="3"
xml-lang="en-US">Ignored switches</paragraph>
- <table>
+ <table id="tbl_id20170517005">
<tablerow>
<tablecell>
<paragraph id="par_id20161204095215085" role="tablehead"
localize="false" xml-lang="en-US"><embedvar
href="text/shared/guide/start_parameters.xhp#parameter"/></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
