[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - 9 commits - AllLangHelp_swriter.mk source/text
Gabor Kelemen
kelemeng at gnome.hu
Tue May 30 08:43:48 UTC 2017
AllLangHelp_swriter.mk | 1
source/text/schart/01/04050000.xhp | 55 +++++++++++++++++++--------
source/text/shared/00/00000200.xhp | 2
source/text/shared/01/02230200.xhp | 2
source/text/shared/01/02230402.xhp | 12 ++---
source/text/shared/01/digitalsignatures.xhp | 2
source/text/shared/guide/macro_recording.xhp | 2
source/text/shared/main0212.xhp | 6 +-
source/text/shared/optionen/mailmerge.xhp | 2
source/text/swriter/01/05130000.xhp | 8 +--
source/text/swriter/01/05990000.xhp | 37 ------------------
11 files changed, 56 insertions(+), 73 deletions(-)
New commits:
commit abc932000dba2965239cc24433088303f89a4aa4
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Tue May 30 08:16:46 2017 +0200
Fix ahelps and bookmarks on X/Y Error Bars page
Change-Id: Ic551d68721a5c045e62f279add57942ea7a879cb
Reviewed-on: https://gerrit.libreoffice.org/38177
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd)
Reviewed-on: https://gerrit.libreoffice.org/38198
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/schart/01/04050000.xhp b/source/text/schart/01/04050000.xhp
index d8097cbaf..69b54d075 100644
--- a/source/text/schart/01/04050000.xhp
+++ b/source/text/schart/01/04050000.xhp
@@ -44,19 +44,15 @@
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_NONE" id="bm_id3862117" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_NONE" id="bm_id3862118" localize="false"/>
<paragraph role="heading" id="hd_id3152989" xml-lang="en-US" level="3">None</paragraph>
-<paragraph role="paragraph" id="par_id3149409" xml-lang="en-US"><ahelp hid="modules/schart/ui/tp_ErrorBars/RB_NONE">Does not show any error bars.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149409" xml-lang="en-US"><ahelp hid=".">Does not show any error bars.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_CONST" id="bm_id3964964" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/MF_POSITIVE" id="bm_id3964968" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/MF_NEGATIVE" id="bm_id3964969" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_CONST" id="bm_id3964966" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/MF_POSITIVE" id="bm_id3964961" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/MF_NEGATIVE" id="bm_id3964963" localize="false"/>
<paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="3">Constant value</paragraph>
-<paragraph role="paragraph" id="par_id3151390" xml-lang="en-US"><ahelp hid="modules/schart/ui/tp_ErrorBars/RB_CONST">Displays constant values that you specify in the Parameters area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151390" xml-lang="en-US"><ahelp hid=".">Displays constant values that you specify in the Parameters area.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_PERCENT" id="bm_id3336588" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_PERCENT" id="bm_id3336589" localize="false"/>
<paragraph role="heading" id="hd_id3159204" xml-lang="en-US" level="3">Percentage</paragraph>
-<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US"><ahelp hid="modules/schart/ui/tp_ErrorBars/RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US"><ahelp hid=".">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_FUNCTION" id="bm_id7856685" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_FUNCTION" id="bm_id7856686" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/LB_FUNCTION" id="bm_id0428200810313556" localize="false"/>
@@ -64,22 +60,49 @@
<paragraph role="heading" id="hd_id8977629" xml-lang="en-US" level="3">Functions</paragraph>
<paragraph role="paragraph" id="par_id7109286" xml-lang="en-US"><ahelp hid=".">Select a function to calculate the error bars.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id5154576" xml-lang="en-US">Standard Error: Displays the standard error.</paragraph>
-<paragraph role="paragraph" id="par_id3157979" xml-lang="en-US"><ahelp hid=".">Variance: Displays the variance calculated from the number of data points and respective values.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153249" xml-lang="en-US"><ahelp hid=".">Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149870" xml-lang="en-US"><ahelp hid=".">Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157979" xml-lang="en-US">Variance: Displays the variance calculated from the number of data points and respective values.</paragraph>
+<paragraph role="paragraph" id="par_id3153249" xml-lang="en-US">Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean.</paragraph>
+<paragraph role="paragraph" id="par_id3149870" xml-lang="en-US">Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_RANGE" id="bm_id3336590" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_RANGE" id="bm_id3336591" localize="false"/>
<paragraph role="heading" id="hd_id350962" xml-lang="en-US" level="3">Cell Range</paragraph>
<paragraph role="paragraph" id="par_id6679586" xml-lang="en-US"><ahelp hid=".">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/IB_RANGE_POSITIVE" id="bm_id3336592" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/IB_RANGE_POSITIVE" id="bm_id3336593" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/IB_RANGE_NEGATIVE" id="bm_id3336594" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/IB_RANGE_NEGATIVE" id="bm_id3336595" localize="false"/>
<paragraph role="paragraph" id="par_id3872188" xml-lang="en-US"><ahelp hid="." visibility="hidden">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</ahelp></paragraph>
+
<paragraph role="heading" id="hd_id2633747" xml-lang="en-US" level="3">From Data Table</paragraph>
-<paragraph role="paragraph" id="par_id6633503" xml-lang="en-US"><ahelp hid=".">For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars.</ahelp></paragraph><comment>Positive (+)</comment>
-<paragraph role="paragraph" id="par_id0428200810573839" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the value to add to the displayed value as the positive error value.</ahelp></paragraph><comment>Negative (-)</comment>
-<paragraph role="paragraph" id="par_id0428200810573862" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the value to subtract from the displayed value as the negative error value.</ahelp></paragraph><comment>Positive (+) when Cell Range is selected</comment>
-<paragraph role="paragraph" id="par_id0428200810573844" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</ahelp></paragraph><comment>Negative (-) when Cell Range is selected</comment>
+<paragraph role="paragraph" id="par_id6633503" xml-lang="en-US"><ahelp hid=".">For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars.</ahelp></paragraph>
+
+<comment>Positive (+)</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/MF_POSITIVE" id="bm_id3964968" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/MF_POSITIVE" id="bm_id3964961" localize="false"/>
+<paragraph role="paragraph" id="par_id0428200810573839" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the value to add to the displayed value as the positive error value.</ahelp></paragraph>
+
+<comment>Negative (-)</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/MF_NEGATIVE" id="bm_id3964969" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/MF_NEGATIVE" id="bm_id3964963" localize="false"/>
+<paragraph role="paragraph" id="par_id0428200810573862" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the value to subtract from the displayed value as the negative error value.</ahelp></paragraph>
+
+<comment>Positive (+) when Cell Range is selected</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/ED_RANGE_POSITIVE" id="bm_id3964969" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/ED_RANGE_POSITIVE" id="bm_id3964962" localize="false"/>
+<paragraph role="paragraph" id="par_id0428200810573844" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</ahelp></paragraph>
+
+<comment>Negative (-) when Cell Range is selected</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/ED_RANGE_NEGATIVE" id="bm_id3964970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/ED_RANGE_NEGATIVE" id="bm_id3964963" localize="false"/>
<paragraph role="paragraph" id="par_id0428200810573970" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/CB_SYN_POS_NEG" id="bm_id3964971" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/CB_SYN_POS_NEG" id="bm_id3964964" localize="false"/>
<paragraph role="heading" id="hd_id0428200810573977" xml-lang="en-US" level="3">Same value for both</paragraph>
<paragraph role="paragraph" id="par_id0428200810573991" xml-lang="en-US"><ahelp hid=".">Enable to use the positive error values also as negative error values. You can only change the value of the "Positve (+)" box. That value gets copied to the "Negative (-)" box automatically.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156396" xml-lang="en-US" level="2">Error indicator</paragraph>
-<paragraph role="paragraph" id="par_id3150539" xml-lang="en-US"><ahelp hid=".">Specifies the error indicator.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3156396" xml-lang="en-US" level="2">Error Indicator</paragraph>
+<paragraph role="paragraph" id="par_id3150539" xml-lang="en-US">Specifies the error indicator.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_ErrorBars/RB_BOTH" id="bm_id0428200810544351" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/dlg_InsertErrorBars/RB_BOTH" id="bm_id0428200810544352" localize="false"/>
<paragraph role="heading" id="hd_id0428200810574027" xml-lang="en-US" level="3">Positive and Negative</paragraph>
commit 0e0e84cef9acfc4b80cd89cb1b20460552e20df9
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Tue May 23 23:55:59 2017 +0200
PlaceWare filter was dropped so don't mention its format
Change-Id: Ifdfc7ca4de9565f69d8e14b91e219044e5ebd7f8
Reviewed-on: https://gerrit.libreoffice.org/37968
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 9c0f31652cb806846bad8f814006209489c58b6b)
Reviewed-on: https://gerrit.libreoffice.org/38197
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/00/00000200.xhp b/source/text/shared/00/00000200.xhp
index 0bd8b9f37..77301893e 100644
--- a/source/text/shared/00/00000200.xhp
+++ b/source/text/shared/00/00000200.xhp
@@ -33,7 +33,7 @@
<embed href="text/shared/00/00000401.xhp#exportgraphic"/>
</section>
<paragraph role="paragraph" id="par_id1" xml-lang="en-US">When you export graphical elements to a file, you can select the file type. For most supported file types a dialog opens where you can setup export options.</paragraph>
-<paragraph role="paragraph" id="par_id2" xml-lang="en-US">The following file types do not show an options dialog: PWP, RAS, SVG, TIFF, XPM.</paragraph>
+<paragraph role="paragraph" id="par_id2" xml-lang="en-US">The following file types do not show an options dialog: RAS, SVG, TIFF, XPM.</paragraph>
<paragraph role="paragraph" id="par_id3" xml-lang="en-US">The other file types show options dialogs where you can set the width and height of the exported image.</paragraph>
<paragraph role="paragraph" id="par_id4" xml-lang="en-US">Depending on the file type, you can specify some more options. Press Shift+F1 and hover over the control to see an extended help text.</paragraph>
commit 0851ba9c035482160b435530ef7f8150978be0dc
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Tue May 23 07:35:55 2017 +0200
tdf#102930 Fix missing ahelp
Change-Id: Idc360a4e6fd1c13a1e640121159d1227d7feb601
Reviewed-on: https://gerrit.libreoffice.org/37935
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 78931b6027223617d44a209378c88161345eb21d)
Reviewed-on: https://gerrit.libreoffice.org/38196
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/optionen/mailmerge.xhp b/source/text/shared/optionen/mailmerge.xhp
index ae17ac2c8..5999a6bf4 100644
--- a/source/text/shared/optionen/mailmerge.xhp
+++ b/source/text/shared/optionen/mailmerge.xhp
@@ -33,7 +33,7 @@
<section id="mailmerge">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/MailConfigPage" id="bm_id3323771" localize="false"/>
<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge E-mail</link></paragraph>
-<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US">Specifies the user information and server settings for when you send form letters as e-mail messages.</paragraph>
+<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as e-mail messages.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#mailmergeemail"/>
commit 8745d40e9880f07f0914a728a8be03a44383a5c7
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Mon May 22 22:28:37 2017 +0200
Fix more bookmarks one ahelp on the track changes Filter page
Here we need the magic dot as ahelp id
Change-Id: I9991afeae940a0bf0415118353dde8de3d68eede
Reviewed-on: https://gerrit.libreoffice.org/37934
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 9cafc343bfe9c3c4e3edd29cfc14da2ebbe895c3)
Reviewed-on: https://gerrit.libreoffice.org/38195
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/01/02230402.xhp b/source/text/shared/01/02230402.xhp
index 1f5e6f32f..24344fbd2 100644
--- a/source/text/shared/01/02230402.xhp
+++ b/source/text/shared/01/02230402.xhp
@@ -44,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/starttime" id="bm_id3148992" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/enddate" id="bm_id3155450" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/endtime" id="bm_id3149795" localize="false"/><paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="2">Date</paragraph>
-<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US"><ahelp hid="svx/ui/redlinefilterpage/endtime">Filters the list of changes according to the date and the time that you specify.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US"><ahelp hid=".">Filters the list of changes according to the date and the time that you specify.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/startclock" id="bm_id3155179" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/endclock" id="bm_id3156330" localize="false"/><paragraph role="heading" id="hd_id3154811" xml-lang="en-US" level="3">Set Date/Time</paragraph>
<table id="tbl_id3156192">
@@ -55,17 +55,17 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US"><ahelp hid="svx/ui/redlinefilterpage/endclock">Enters the current date and time into the corresponding boxes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US"><ahelp hid=".">Enters the current date and time into the corresponding boxes.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/author" id="bm_id3149955" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/authorlist" id="bm_id3149786" localize="false"/><paragraph role="heading" id="hd_id3155261" xml-lang="en-US" level="2">Author</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US"><ahelp hid="svx/ui/redlinefilterpage/authorlist">Filters the list of changes according to the name of the author that you select from the list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US"><ahelp hid=".">Filters the list of changes according to the name of the author that you select from the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/range" id="bm_id3151246" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/rangeedit" id="bm_id3152472" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="CALC">Range
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="svx/ui/redlinefilterpage/rangeedit">Filters the list of changes according to the range of cells that you specify. To select a range of cells in your sheet, click the <emph>Set Reference </emph>button (<emph>...</emph>).</ahelp>
+<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"><ahelp hid=".">Filters the list of changes according to the range of cells that you specify. To select a range of cells in your sheet, click the <emph>Set Reference </emph>button (<emph>...</emph>).</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/dotdotdot" id="bm_id3149457" localize="false"/><paragraph role="paragraph" id="par_id4441663" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the range of cells that you want to use as a filter.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="CALC">Set Reference
@@ -105,11 +105,11 @@
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/action" id="bm_id3149984" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/actionlist" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="WRITER">Action
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="svx/ui/redlinefilterpage/actionlist">Filters the list of changes according to the type of change that you select in the <emph>Action</emph> box.</ahelp>
+<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid=".">Filters the list of changes according to the type of change that you select in the <emph>Action</emph> box.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/comment" id="bm_id3145264" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx/ui/redlinefilterpage/commentedit" id="bm_id3150105" localize="false"/><paragraph role="heading" id="hd_id3155855" xml-lang="en-US" level="2">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US"><ahelp hid="svx/ui/redlinefilterpage/commentedit">Filters the comments of the changes according to the keyword(s) that you enter. </ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US"><ahelp hid=".">Filters the comments of the changes according to the keyword(s) that you enter. </ahelp></paragraph>
<paragraph role="tip" id="par_id3163820" xml-lang="en-US">You can also use <link href="text/shared/01/02100000.xhp" name="regular expressions">regular expressions</link> (wildcards) when you filter the comments.</paragraph>
</section>
</body>
commit 75bd2a929adff8125299705be9fabc044efa9e2e
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Mon May 22 22:27:09 2017 +0200
Change bogus paragraph role relatedtopics to paragraph
Change-Id: I561cceb2579abf01c3239304dd9aba88235545e6
Reviewed-on: https://gerrit.libreoffice.org/37933
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit bb6df706e558e0a8a617541352b11fc075d20f03)
Reviewed-on: https://gerrit.libreoffice.org/38194
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/01/02230200.xhp b/source/text/shared/01/02230200.xhp
index cc86b27c4..d87c7df66 100644
--- a/source/text/shared/01/02230200.xhp
+++ b/source/text/shared/01/02230200.xhp
@@ -59,7 +59,7 @@
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/showchangesdialog/showrejected" id="bm_id3155829" localize="false"/>
<paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="CALC">Show rejected changes
</caseinline></switchinline></paragraph>
-<paragraph role="relatedtopics" id="par_id3159166" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="modules/scalc/ui/showchangesdialog/showrejected">Shows or hides the changes that were rejected.</ahelp>
+<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="modules/scalc/ui/showchangesdialog/showrejected">Shows or hides the changes that were rejected.</ahelp>
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
commit 6826dc9d462ecaa54a317c51c06aba2d411bc122
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Mon May 22 21:39:47 2017 +0200
Convert bogus head2 roles to "heading level 2" roles
Change-Id: I911bcf79b2ce0f0d8812f8756260861b95624b3b
Reviewed-on: https://gerrit.libreoffice.org/37932
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 3106a05e988e7ed831840b47e8ecbf2961d34d94)
Reviewed-on: https://gerrit.libreoffice.org/38193
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/guide/macro_recording.xhp b/source/text/shared/guide/macro_recording.xhp
index fad4de902..dc7746718 100644
--- a/source/text/shared/guide/macro_recording.xhp
+++ b/source/text/shared/guide/macro_recording.xhp
@@ -66,7 +66,7 @@
<paragraph role="listitem" id="par_id3154138" xml-lang="en-US">Click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="head2" id="hd_id2486342" xml-lang="en-US">Limitations of the macro recorder</paragraph>
+<paragraph role="heading" level="2" id="hd_id2486342" xml-lang="en-US">Limitations of the macro recorder</paragraph>
<paragraph role="paragraph" id="par_id3608508" xml-lang="en-US">The following actions are <emph>not</emph> recorded:</paragraph>
<list type="unordered">
<listitem>
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 7ce16bf51..9f8eb26da 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -79,13 +79,13 @@
<embed href="text/shared/02/12040000.xhp#filterentfernen"/>
<embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBInsertColumns" id="bm_id5734733" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10744" role="head2"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10744" role="heading" level="2"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
<paragraph xml-lang="en-US" id="par_idN10753" role="paragraph"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
<embed href="text/shared/02/12070000.xhp#sydatenintext"/>
<embed href="text/shared/02/12080000.xhp#dateninfelder"/>
<embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id0928200901513623" localize="false"/><comment>Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder</comment>
-<paragraph xml-lang="en-US" id="par_idN10780" role="head2"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10780" role="heading" level="2"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
<paragraph xml-lang="en-US" id="par_idN1078F" role="paragraph"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters.</ahelp></paragraph>
<embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
<embed href="text/shared/02/12140000.xhp#aktdokdat"/>
@@ -93,4 +93,4 @@
<embed href="text/shared/02/12000000.xhp#explorer"/>
<embed href="text/shared/02/12000000.xhp#syexplorer"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 59f6a46cb49eb4c7247bfee8db9d533c6b17b7dc
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Fri May 19 00:37:31 2017 +0200
Remove an empty page Styles
A comment said "to be deleted" :)
Change-Id: I025701664b7b8c6d1691941393a09bd72b43a1b7
Reviewed-on: https://gerrit.libreoffice.org/37931
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 2c1173b8ad3225b52e51545b6339a0fe7b9dc577)
Reviewed-on: https://gerrit.libreoffice.org/38192
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index cc37c7366..adf416fa5 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -154,7 +154,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/01/05170000 \
helpcontent2/source/text/swriter/01/05190000 \
helpcontent2/source/text/swriter/01/05200000 \
- helpcontent2/source/text/swriter/01/05990000 \
helpcontent2/source/text/swriter/01/06030000 \
helpcontent2/source/text/swriter/01/06040000 \
helpcontent2/source/text/swriter/01/06060000 \
diff --git a/source/text/swriter/01/05990000.xhp b/source/text/swriter/01/05990000.xhp
deleted file mode 100644
index 7973c1acf..000000000
--- a/source/text/swriter/01/05990000.xhp
+++ /dev/null
@@ -1,37 +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 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105990000xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Styles</title>
-<filename>/text/swriter/01/05990000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="vorlagen">
-<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1"><link href="text/swriter/01/05990000.xhp" name="Styles">Styles</link><comment>to be deleted</comment></paragraph>
-</section>
-</body>
-</helpdocument>
commit c7d543eee812b974cee11e0d7766af56d54dfafe
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Fri May 19 00:14:31 2017 +0200
Drop an obsolete and a redundant bookmark
Change-Id: I80b0d269def0dc700e6f6da6c76502d78f30fac4
Reviewed-on: https://gerrit.libreoffice.org/37930
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit ead4207b4a6f7ae49ecf9b80a598ecd0fafe7304)
Reviewed-on: https://gerrit.libreoffice.org/38191
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/01/digitalsignatures.xhp b/source/text/shared/01/digitalsignatures.xhp
index 6ed7881ac..de1538ca1 100644
--- a/source/text/shared/01/digitalsignatures.xhp
+++ b/source/text/shared/01/digitalsignatures.xhp
@@ -30,8 +30,6 @@
<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/digitalsignaturesdialog/DigitalSignaturesDialog" id="bm_id3150017" localize="false"/>
<section id="digitalsignatures">
<bookmark xml-lang="en-US" branch="hid/.uno:Signature" id="bm_id9475924" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Signature" id="bm_id127567" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_idN10548" role="paragraph"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
</section>
commit 533edb4dda97c6630ee5329627dc63afedf4b5a2
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Fri May 19 00:09:35 2017 +0200
tdf#107229 Fix reference to the Save as Template menu item
Drop bookmark and ahelp related to old OOo template manager window
Also fix a reference to the Styles and Formatting sidebar
Change-Id: Icfe056ee32e38b45f11f33b65f85c24b05a32107
Reviewed-on: https://gerrit.libreoffice.org/37929
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
(cherry picked from commit 98f16894574b039fc5e7ead6934aa4a0488472b0)
Reviewed-on: https://gerrit.libreoffice.org/38190
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/swriter/01/05130000.xhp b/source/text/swriter/01/05130000.xhp
index 91896e4c2..0061fcc44 100644
--- a/source/text/swriter/01/05130000.xhp
+++ b/source/text/swriter/01/05130000.xhp
@@ -40,12 +40,12 @@
<paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="1">Styles in Writer</paragraph>
<section id="vorlagenkatalogtext">
<paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" localize="false"><comment>UFI: this is no more "Style Catalog" dialog, but we need the links and tables</comment><comment>UFI: another comment: the Style Catalog can be customized to be visible again!!! Dont know it this is temporary bug, workaround, or feature</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US">The following information concerns Writer styles that you can apply using the <link href="text/swriter/01/05140000.xhp">Styles and Formatting</link> window.</paragraph>
+<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US">The following information concerns Writer styles that you can apply using the <link href="text/swriter/01/05140000.xhp">Styles and Formatting</link> deck of the Sidebar.</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US">If you want, you can edit the styles of the current document, and then save the document as a template. To save the document as template, choose <emph>File - </emph><link href="text/shared/01/01110300.xhp" name="Templates - Save"><emph>Templates - Save</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:RID_STYLECATALOG:BT_TOOL" id="bm_id3153921" localize="false"/>
+<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US">If you want, you can edit the styles of the current document, and then save the document as a template. To save the document as template, choose <emph>File - </emph><link href="text/shared/01/01110300.xhp" name="Templates - Save as Template"><emph>Templates - Save as Template</emph></link>.</paragraph>
+
<paragraph role="heading" id="hd_id3150572" xml-lang="en-US" level="2">Style Category</paragraph>
-<paragraph role="paragraph" id="par_id3153721" xml-lang="en-US"><ahelp hid="SFX2:LISTBOX:RID_STYLECATALOG:BT_TOOL">These are the different categories of formatting styles.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153721" xml-lang="en-US">These are the different categories of formatting styles.</paragraph>
<table id="tbl_id3154642">
<tablerow>
<tablecell colspan="" rowspan="">
More information about the Libreoffice-commits
mailing list