source/text/schart/00/00000004.xhp  |   29 ------------------
 source/text/schart/01/04010000.xhp  |   56 +++++++++++++++++++++---------------
 source/text/swriter/01/04070100.xhp |    3 +
 3 files changed, 35 insertions(+), 53 deletions(-)

New commits:
commit ffe473f0fe547ecffe954fa841e128faf307dabc
Author: Gabor Kelemen <kelem...@gnome.hu>
Date:   Thu Jan 19 22:42:19 2017 +0100

    Update Titles (Chart) dialog page
    
    Adapt to UI changes
    Fix bookmarks and ahelps
    Drop description and menu access paths of obsolete
    .uno:ToggleAxisTitle and .uno:ToggleTitle
    
    Change-Id: Ide578bb49778882c65107cb546ba9654c92ef472
    Reviewed-on: https://gerrit.libreoffice.org/33330
    Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
    Tested-by: Gabor Kelemen <kelem...@ubuntu.com>

diff --git a/source/text/schart/00/00000004.xhp 
b/source/text/schart/00/00000004.xhp
index b4f0e7d..f2a9bce 100644
--- a/source/text/schart/00/00000004.xhp
+++ b/source/text/schart/00/00000004.xhp
@@ -157,37 +157,8 @@
 <section id="anordnung">
 <paragraph role="paragraph" id="par_id3150661" xml-lang="en-US" l10n="CHG" 
oldref="61">Choose <emph>Format - Arrangement </emph>(Charts)</paragraph>
 <paragraph role="paragraph" id="par_id3153046" xml-lang="en-US" l10n="CHG" 
oldref="65">Open context menu - choose <emph>Arrangement 
</emph>(Charts)</paragraph>
-<section id="titelanaus">
-<table id="tbl_id3148768">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151020" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="cmd/sc_toggletitle.png" width="0.2228in" 
height="0.2228in"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
-       </image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150467" xml-lang="en-US" l10n="U" 
oldref="48">Title On/Off</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
 </section>
-<section id="achseeinaus">
-<table id="tbl_id3154872">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149775" xml-lang="en-US" l10n="E">
-<image id="img_id3149781" src="cmd/sc_toggleaxistitle.png" width="0.2228in" 
height="0.2228in"><alt id="alt_id3149781" xml-lang="en-US">Icon</alt>
-       </image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147168" xml-lang="en-US" l10n="U" 
oldref="49">Axis Titles On/Off</paragraph>
-</tablecell>
-</tablerow>
-</table>
 
-</section>
 <section id="gitterx">
 <table id="tbl_id3083450">
 <tablerow>
diff --git a/source/text/schart/01/04010000.xhp 
b/source/text/schart/01/04010000.xhp
index b660bf4..f83691e 100644
--- a/source/text/schart/01/04010000.xhp
+++ b/source/text/schart/01/04010000.xhp
@@ -29,32 +29,42 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTitles" 
id="bm_id3146313" localize="false"/><paragraph role="heading" id="hd_id3147345" 
xml-lang="en-US" level="1" l10n="U" oldref="1">Titles</paragraph>
-<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="U" 
oldref="2"><variable id="titel"><ahelp hid=".uno:InsertMenuTitles">Opens a 
dialog to enter or modify the titles in a chart.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTitles" 
id="bm_id3146313" localize="false"/>
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/InsertTitleDialog" 
id="bm_id3146312" localize="false"/>
+<paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="1" 
l10n="U" oldref="1">Titles</paragraph>
+<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="U" 
oldref="2"><variable id="titel"><ahelp hid=".">Opens a dialog to enter or 
modify the titles in a chart.</ahelp>
 </variable> You can define the text for the main title, subtitle and the axis 
labels, and specify if they are displayed.</paragraph>
 <section id="howtoget">
   <embed href="text/schart/00/00000004.xhp#efgttl"/>
 </section>
-<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_MAINTITLE -->
-<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_MAINTITLE --><paragraph role="heading" 
id="hd_id3150207" xml-lang="en-US" level="2" l10n="U" oldref="3">Main 
Title</paragraph>
-<paragraph role="paragraph" id="par_id3150371" xml-lang="en-US" l10n="U" 
oldref="4"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_MAINTITLE">Marking the <emph>Main 
Title</emph> option activates the main title. Enter the desired title in the 
corresponding text field.</ahelp></paragraph>
-<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_SUBTITLE -->
-<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_SUBTITLE --><paragraph role="heading" 
id="hd_id3146980" xml-lang="en-US" level="2" l10n="U" 
oldref="5">Subtitle</paragraph>
-<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US" l10n="U" 
oldref="6"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_SUBTITLE">Marking the 
<emph>Subtitle</emph> option activates the subtitle. Enter the desired title in 
the corresponding text field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToggleTitle" id="bm_id3148870" 
localize="false"/><paragraph role="paragraph" id="par_id3152901" 
xml-lang="en-US" l10n="CHG" oldref="7"><variable id="sytexttitel"><ahelp 
hid=".uno:ToggleTitle">Click <emph>Title On/Off</emph> on the Formatting bar to 
show or hide the title and subtitle.</ahelp>
-</variable></paragraph>
-<embed href="text/schart/00/00000004.xhp#titelanaus"/>
-<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_X_AXIS -->
-<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_X_AXIS --><paragraph role="heading" 
id="hd_id3156018" xml-lang="en-US" level="2" l10n="U" oldref="8">X 
axis</paragraph>
-<paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="U" 
oldref="9"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_X_AXIS">Marking the <emph>X 
axis</emph> option activates the X axis title. Enter the desired title in the 
corresponding text field.</ahelp></paragraph>
-<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Y_AXIS -->
-<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_Y_AXIS --><paragraph role="heading" 
id="hd_id3159226" xml-lang="en-US" level="2" l10n="U" oldref="10">Y 
axis</paragraph>
-<paragraph role="paragraph" id="par_id3154763" xml-lang="en-US" l10n="U" 
oldref="11"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_Y_AXIS">Marking the <emph>Y 
axis</emph> option activates the Y axis title. Enter the desired title in the 
corresponding text field.</ahelp></paragraph>
-<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Z_AXIS -->
-<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_Z_AXIS --><paragraph role="heading" 
id="hd_id3153009" xml-lang="en-US" level="2" l10n="U" oldref="12">Z 
axis</paragraph>
-<paragraph role="paragraph" id="par_id3154710" xml-lang="en-US" l10n="U" 
oldref="13"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_Z_AXIS">Marking the <emph>Z 
axis</emph> option activates the Z axis title. Enter the desired title in the 
corresponding text field.</ahelp> This option is only available for 3-D 
charts.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToggleAxisTitle" id="bm_id3149054" 
localize="false"/><paragraph role="paragraph" id="par_id3153073" 
xml-lang="en-US" l10n="CHG" oldref="14"><variable id="sytextachse"><ahelp 
hid=".uno:ToggleAxisTitle">Click <emph>Axes Title On/Off</emph> on the 
Formatting bar to show or hide the axis labels.</ahelp>
-</variable></paragraph>
-<embed href="text/schart/00/00000004.xhp#achseeinaus"/>
+<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" 
l10n="U" oldref="3">Title</paragraph>
+<paragraph role="paragraph" id="par_id3150371" xml-lang="en-US" l10n="U" 
oldref="4"><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" 
l10n="U" oldref="5">Subtitle</paragraph>
+<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US" l10n="U" 
oldref="6"><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>
+
+<paragraph role="heading" id="hd_id3150208" xml-lang="en-US" 
level="2">Axes</paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/primaryXaxis" id="bm_id3146316" 
localize="false"/>
+<paragraph role="heading" id="hd_id3156018" xml-lang="en-US" level="3" 
l10n="U" oldref="8">X axis</paragraph>
+<paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="U" 
oldref="9"><ahelp hid="modules/schart/ui/inserttitledlg/primaryXaxis">Enter the 
desired title for the X axis of the chart.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/primaryYaxis" id="bm_id3146317" 
localize="false"/>
+<paragraph role="heading" id="hd_id3159226" xml-lang="en-US" level="3" 
l10n="U" oldref="10">Y axis</paragraph>
+<paragraph role="paragraph" id="par_id3154763" xml-lang="en-US" l10n="U" 
oldref="11"><ahelp hid="modules/schart/ui/inserttitledlg/primaryYaxis">Enter 
the desired title for the Y axis of the chart.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/primaryZaxis" id="bm_id3146318" 
localize="false"/>
+<paragraph role="heading" id="hd_id3153009" xml-lang="en-US" level="3" 
l10n="U" oldref="12">Z axis</paragraph>
+<paragraph role="paragraph" id="par_id3154710" xml-lang="en-US" l10n="U" 
oldref="13"><ahelp hid="modules/schart/ui/inserttitledlg/primaryZaxis">Enter 
the desired title for the Z axis of the chart.</ahelp> This option is only 
available for 3-D charts.</paragraph>
+
+<paragraph role="heading" id="hd_id3150209" xml-lang="en-US" 
level="2">Secondary Axes</paragraph>
+<paragraph role="heading" id="hd_id3156019" xml-lang="en-US" level="3">X 
axis</paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/secondaryXaxis" id="bm_id3146319" 
localize="false"/>
+<paragraph role="paragraph" id="par_id3152870" xml-lang="en-US"><ahelp 
hid="modules/schart/ui/inserttitledlg/secondaryXaxis">Enter the desired 
secondary title for the X axis of the chart.</ahelp> This will appear on the 
opposite side of the chart as the X axis title.</paragraph>
+
+<paragraph role="heading" id="hd_id3156020" xml-lang="en-US" level="3">Y 
axis</paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/modules/schart/ui/inserttitledlg/secondaryYaxis" id="bm_id3146320" 
localize="false"/>
+<paragraph role="paragraph" id="par_id3152872" xml-lang="en-US"><ahelp 
hid="modules/schart/ui/inserttitledlg/secondaryYaxis">Enter the desired 
secondary title for the Y axis of the chart.</ahelp> This will appear on the 
opposite side of the chart as the Y axis title.</paragraph>
 </body>
 </helpdocument>
commit c1116f5a81a8f8288639131156b78704ef6c3cea
Author: Gabor Kelemen <kelem...@gnome.hu>
Date:   Thu Jan 19 23:12:54 2017 +0100

    Remove an obsolete bookmark from the Envelope page
    
    Change-Id: I2694dc1232869f9a270cd4b1598608ccceaee164
    Reviewed-on: https://gerrit.libreoffice.org/33332
    Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
    Tested-by: Gabor Kelemen <kelem...@ubuntu.com>

diff --git a/source/text/swriter/01/04070100.xhp 
b/source/text/swriter/01/04070100.xhp
index 29fc1d8..24941f2 100644
--- a/source/text/swriter/01/04070100.xhp
+++ b/source/text/swriter/01/04070100.xhp
@@ -41,7 +41,8 @@
 </section>
   <bookmark branch="hid/modules/swriter/ui/envaddresspage/addredit" 
xml-lang="en-US" id="bm_id3151178" localize="false"/><paragraph role="heading" 
level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" 
oldref="3">Addressee</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145415" xml-lang="en-US" 
oldref="4"><ahelp hid="modules/swriter/ui/envaddresspage/addredit" 
visibility="visible">Enter the delivery address.</ahelp> You can also click in 
this box, and select a database, a table, and field, and then click the arrow 
button to insert the field in the address. If you want, you can apply  
formatting, such as bold and underline, to the address text.</paragraph>
-  <bookmark branch="hid/modules/swriter/ui/envaddresspage/senderedit" 
xml-lang="en-US" id="bm_id3149802" localize="false"/><bookmark 
branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" 
id="bm_id3149806" localize="false"/><paragraph role="heading" level="2" 
id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
+  <bookmark branch="hid/modules/swriter/ui/envaddresspage/senderedit" 
xml-lang="en-US" id="bm_id3149802" localize="false"/>
+<paragraph role="heading" level="2" id="hd_id3154102" l10n="U" 
xml-lang="en-US" oldref="5">Sender</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3153527" 
oldref="6"><ahelp visibility="visible" 
hid="modules/swriter/ui/envaddresspage/senderedit">Includes a return address on 
the envelope. Select the <emph>Sender </emph>check box, and then enter the 
return  address.</ahelp> $[officename] automatically inserts your user data in 
the <emph>Sender </emph>box, but you can also enter the data that you 
want.</paragraph>
   <bookmark branch="hid/modules/swriter/ui/envaddresspage/database" 
xml-lang="en-US" id="bm_id3154474" localize="false"/><paragraph role="heading" 
level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" 
oldref="9">Database</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154480" xml-lang="en-US" 
oldref="10"><ahelp hid="modules/swriter/ui/envaddresspage/database" 
visibility="visible">Select the database containing the address data that you 
want to insert.</ahelp></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to