tdf#132371 Review menu Format - Page

+ fix on Page help page, refactor.

Change-Id: I834c35b03d7e25fb18cda09aff304c733040625d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92876
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

6 files changed, 135 insertions, 141 deletions

diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp
index 17b458d63e..e5518c6040 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -123,10 +123,26 @@
                     </caseinline><caseinline select="CALC"><emph>Object - </emph></caseinline></switchinline><emph>Area - Shadow</emph> tab.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_id3147441" role="paragraph"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Text Box and Shape - </emph>
                     </caseinline><caseinline select="CALC"><emph>Object - </emph></caseinline></switchinline><emph>Area - Gradients</emph> tab.</variable></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph"><variable id="schraffur">Choose <menuitem>Format - </menuitem><switchinline select="appl"><caseinline select="WRITER"><menuitem>Text Box and Shape - </menuitem>
-                    </caseinline><caseinline select="CALC"><menuitem>Object - </menuitem></caseinline><caseinline select="IMPRESS"><menuitem>Object and Shape - </menuitem></caseinline></switchinline><menuitem>Area</menuitem><emph> - Hatch</emph> tab.</variable></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph"><variable id="page_hatch"><switchinline select="appl"><caseinline select="WRITER">Choose <menuitem>Format - Page Style - Area</menuitem><emph> - Hatch</emph> tab.</caseinline>
-                    <caseinline select="DRAW">Choose <menuitem>Page - Properties - Background</menuitem><emph> - Hatch</emph> tab.</caseinline><caseinline select="IMPRESS">Choose <menuitem>Slide - Properties - Background</menuitem><emph> - Hatch</emph> tab.</caseinline></switchinline></variable></paragraph>
+    <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph">
+        <variable id="schraffur">Choose <menuitem>Format - </menuitem>
+            <switchinline select="appl">
+                <caseinline select="WRITER"><menuitem>Text Box and Shape - </menuitem></caseinline>
+                <caseinline select="CALC"><menuitem>Object - </menuitem></caseinline>
+                <caseinline select="IMPRESS"><menuitem>Object and Shape - </menuitem></caseinline>
+            </switchinline>
+            <menuitem>Area - Hatch</menuitem> tab.
+        </variable>
+    </paragraph>
+    <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph">
+        <variable id="page_hatch">
+            <switchinline select="appl">
+                <caseinline select="WRITER">Choose <menuitem>Format - Page Style - Area</menuitem></caseinline>
+                <caseinline select="DRAW">Choose <menuitem>Page - Properties - Background</menuitem></caseinline>
+                <caseinline select="IMPRESS">Choose <menuitem>Slide - Properties - Background</menuitem></caseinline>
+            </switchinline>
+            <emph> - Hatch</emph> tab.
+        </variable>
+    </paragraph>
     <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Text Box and Shape - </emph>
                     </caseinline><caseinline select="CALC"><emph>Object - </emph></caseinline></switchinline><emph>Area - Bitmaps</emph> tab.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Text Box and Shape - Text Attributes</emph>
diff --git a/source/text/shared/01/05040200.xhp b/source/text/shared/01/05040200.xhp
index c9d9d57ae0..3702faca77 100644
--- a/source/text/shared/01/05040200.xhp
+++ b/source/text/shared/01/05040200.xhp
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
 
 <!--
@@ -41,142 +40,121 @@
 </bookmark><comment>mw made "binding space;" a one level entry and added "gutter" and "margins;pages"</comment>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/PageFormatPage" id="bm_id3149877" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/@@nowidget@@" id="bm_id3149877" localize="false"/>
-<paragraph role="heading" id="hd_id3150620" xml-lang="en-US" level="1"><link href="text/shared/01/05040200.xhp" name="Page">Page</link></paragraph>
+<h1 id="hd_id3150620"><link href="text/shared/01/05040200.xhp" name="Page">Page</link></h1>
 <paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/PageFormatPage">Allows you to define page layouts for single and multiple-page documents, as well as a numbering and paper formats.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00040500.xhp#seite"/>
 </section>
-<paragraph id="par_id090120160133439102" role="paragraph" xml-lang="en-US"><image id="img_id090120160131201466" src="media/screenshots/cui/ui/pageformatpage/PageFormatPage.png"
-width="8.6457in" height="5.9063in"><alt xml-lang="en-US" id="alt_id090120160131201466">Page format tab page</alt></image></paragraph>
+<paragraph id="par_id090120160133439102" role="paragraph" xml-lang="en-US"><image id="img_id090120160131201466" src="media/screenshots/cui/ui/pageformatpage/PageFormatPage.png" width="8.6457in" height="5.9063in"><alt xml-lang="en-US" id="alt_id090120160131201466">Page format tab page</alt></image></paragraph>
 <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
-<paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2">Paper format</paragraph>
+<h2 id="hd_id3149549">Paper format</h2>
 <paragraph role="paragraph" id="par_id3150710" xml-lang="en-US">Select from a list of predefined paper sizes, or define a custom paper format.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboPageFormat" id="bm_id3147834" localize="false"/>
-<paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="3">Format</paragraph>
+<h3 id="hd_id3153394">Format</h3>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboPageFormat">Select a predefined paper size, or create a custom format by entering the dimensions for the paper in the <emph>Height </emph>and <emph>Width </emph>boxes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinWidth" id="bm_id3155893" localize="false"/>
-<paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3">Width</paragraph>
+<h3 id="hd_id3154823">Width</h3>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinWidth">Displays the width of the selected paper format. To define a custom format, enter a width here.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinHeight" id="bm_id3155392" localize="false"/>
-<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3">Height</paragraph>
+<h3 id="hd_id3147008">Height</h3>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinHeight">Displays the height of the selected paper format. To define a custom format, enter a height here.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/radiobuttonPortrait" id="bm_id3147276" localize="false"/>
-<paragraph role="heading" id="hd_id3146798" xml-lang="en-US" level="3">Portrait</paragraph>
+<h3 id="hd_id3146798">Portrait</h3>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/radiobuttonPortrait">Displays and prints the current document with the paper oriented vertically.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/radiobuttonLandscape" id="bm_id3159116" localize="false"/>
-<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3">Landscape</paragraph>
+<h3 id="hd_id3150976">Landscape</h3>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/radiobuttonLandscape">Displays and prints the current document with the paper oriented horizontally.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboTextFlowBox" id="bm_id3146774" localize="false"/>
-<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3">Text direction</paragraph>
+<h3 id="hd_id3156153">Text direction</h3>
 <paragraph role="paragraph" id="par_id3154380" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboTextFlowBox">Select the text direction that you want to use in your document.</ahelp> The "right-to-left (vertical)" text flow direction rotates all layout settings to the right by 90 degrees, except for the header and footer.</paragraph>
+<embed href="text/shared/00/00000001.xhp#vorschau"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboPaperTray" id="bm_id3154516" localize="false"/>
-<paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3">Paper tray</paragraph>
+<h3 id="hd_id3156327">Paper tray</h3>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboPaperTray">Select the paper source for your printer. If you want, you can assign different paper trays to different page styles. For example, assign a different tray to the First Page style and load the tray with your company's letterhead paper.</ahelp><comment>UFI: #i31234#</comment></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2">Margins</paragraph>
+<h2 id="hd_id3150275">Margins</h2>
 <paragraph role="paragraph" id="par_id3153348" xml-lang="en-US">Specify the amount of space to leave between the edges of the page and the document text.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinMargLeft" id="bm_id3148943" localize="false"/>
-<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="3">Left / Inner</paragraph>
+<h3 id="hd_id3153061">Left / Inner</h3>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinMargLeft">Enter the amount of space to leave between the left edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the inner text margin and the inner edge of the page.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinMargRight" id="bm_id3154758" localize="false"/>
-<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3">Right / Outer</paragraph>
+<h3 id="hd_id3154923">Right / Outer</h3>
 <paragraph role="paragraph" id="par_id3147304" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinMargRight">Enter the amount of space to leave between the right edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the outer text margin and the outer edge of the page.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinMargTop" id="bm_id3148739" localize="false"/>
-<paragraph role="heading" id="hd_id3161657" xml-lang="en-US" level="3">Top</paragraph>
+<h3 id="hd_id3161657">Top</h3>
 <paragraph role="paragraph" id="par_id3154226" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinMargTop">Enter the amount of space to leave between the upper edge of the page and the document text.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinMargBot" id="bm_id3153797" localize="false"/>
-<paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3">Bottom</paragraph>
+<h3 id="hd_id3153381">Bottom</h3>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/spinMargBot">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp></paragraph>
+
+
+
+<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboPageLayout" id="bm_id3153104" localize="false"/>
+<h2 id="hd_id3147381">Layout settings</h2>
+<switch select="appl">
+    <case select="DRAW"></case>
+    <case select="IMPRESS"></case>
+    <default>
+        <h3 id="hd_id3145744">Page layout</h3>
+        <paragraph role="paragraph" id="par_id3154218" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboPageLayout">Specify whether the current style should show odd pages, even pages, or both odd and even pages.</ahelp></paragraph>
+        <h4 id="hd_id3154946">Right and left</h4>
+        <paragraph role="paragraph" id="par_id3153058" xml-lang="en-US">The current page style shows both odd and even pages with left and right margins as specified.</paragraph>
+        <h4 id="hd_id3147287">Mirrored</h4>
+        <paragraph role="paragraph" id="par_id3147317" xml-lang="en-US">The current page style shows both odd and even pages with inner and outer margins as specified. Use this layout if you want to bind the printed pages like a book. Enter the binding space as the "Inner" margin.</paragraph>
+        <h4 id="hd_id3155308">Only right</h4>
+        <paragraph role="paragraph" id="par_id3152885" xml-lang="en-US">The current page style shows only odd (right) pages. Even pages are shown as blank pages.</paragraph>
+        <h4 id="hd_id3157309">Only left</h4>
+        <paragraph role="paragraph" id="par_id3147326" xml-lang="en-US">The current page style shows only even (left) pages. Odd pages are shown as blank pages.</paragraph>
+    </default>
+</switch>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboLayoutFormat" id="bm_id3149417" localize="false"/>
+<switch select="appl">
+    <case select="IMPRESS">
+        <h3 id="hd_id661587746131795">Slide Numbers</h3>
+        <paragraph role="paragraph" id="par_id371587747950454">Select the slide numbering format that you want to use for the current slide style.</paragraph>
+    </case>
+    <default>
+        <h3 id="hd_id511587746163578">Page Numbers</h3>
+        <paragraph role="paragraph" id="par_id3153745" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboLayoutFormat">Select the page numbering format that you want to use for the current page style.</ahelp></paragraph>
+    </default>
+</switch>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/checkRegisterTrue" id="bm_id3159123" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="cui/ui/pageformatpage/checkRegisterTrue">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
-</caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboRegisterStyle" id="bm_id3147426" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="WRITER">Reference Style
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboRegisterStyle"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="CALC">Table alignment
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
-</caseinline></switchinline></paragraph>
+
+<switch select="appl">
+    <case select="WRITER">
+        <h3 id="hd_id3150488">Register-true</h3>
+        <paragraph role="paragraph" id="par_id3151112" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkRegisterTrue">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.</paragraph>
+        <paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
+        <h4 id="hd_id3150686">Reference Style</h4>
+        <paragraph role="paragraph" id="par_id3146146" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboRegisterStyle">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.</ahelp></paragraph>
+    </case>
+</switch>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/checkbuttonHorz" id="bm_id3149270" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="CALC">Horizontal
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkbuttonHorz"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/checkbuttonVert" id="bm_id3154063" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="CALC">Vertical
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkbuttonVert"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2">Layout settings</paragraph>
-
-<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Page Layout</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157962" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Select the page layout style to use in the current document.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboPageLayout" id="bm_id3153104" localize="false"/>
-<paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Page layout</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154218" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboPageLayout"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Specify whether the current style should show odd pages, even pages, or both odd and even pages.</defaultinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154946" xml-lang="en-US" level="4"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Right and left</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153058" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>The current page style shows both odd and even pages with left and right margins as specified.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="4"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Mirrored</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>The current page style shows both odd and even pages with inner and outer margins as specified. Use this layout if you want to bind the printed pages like a book. Enter the binding space as the "Inner" margin.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155308" xml-lang="en-US" level="4"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Only right</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>The current page style shows only odd (right) pages. Even pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3157309" xml-lang="en-US" level="4"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>Only left</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">
-</caseinline><caseinline select="IMPRESS">
-</caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
+<switch select="appl">
+    <case select="CALC">
+        <h3 id="hd_id3147480">Table alignment</h3>
+        <paragraph role="paragraph" id="par_id3150417" xml-lang="en-US">Specify the alignment options for the cells on a printed page.</paragraph>
+        <paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+        <h4 id="hd_id3147047">Horizontal</h4>
+        <paragraph role="paragraph" id="par_id3153878" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkbuttonHorz">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+        <paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
+        <h4 id="hd_id3153522">Vertical</h4>
+        <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkbuttonVert">Centers the cells vertically on the printed page.</ahelp></paragraph>
+    </case>
+</switch>
 
-<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboLayoutFormat" id="bm_id3149417" localize="false"/>
-<paragraph role="heading" id="hd_id3083281" xml-lang="en-US" level="3">Format</paragraph>
-<paragraph role="paragraph" id="par_id3153745" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/comboLayoutFormat">Select the page numbering format that you want to use for the current page style.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/checkAdaptBox" id="bm_id3156178" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473965" xml-lang="en-US"><ahelp hid="." visibility="hidden">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151318" xml-lang="en-US" level="3"><switchinline select="appl"><caseinline select="OFFICE">
-</caseinline><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</caseinline><caseinline select="CHART">
-</caseinline><caseinline select="MATH">
-</caseinline><caseinline select="IMAGE">
-</caseinline><defaultinline>AutoFit object to page format</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3144746" xml-lang="en-US"><switchinline select="appl"><caseinline select="OFFICE">
-</caseinline><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</caseinline><caseinline select="CHART">
-</caseinline><caseinline select="MATH">
-</caseinline><caseinline select="IMAGE">
-</caseinline><defaultinline><ahelp hid="cui/ui/pageformatpage/checkAdaptBox">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></defaultinline></switchinline></paragraph>
+<switch select="appl">
+    <case select="WRITER"></case>
+    <case select="CALC"></case>
+    <default>
+        <h3 id="hd_id3151318">Fit object to page format</h3>
+        <paragraph role="paragraph" id="par_id3144746" xml-lang="en-US"><ahelp hid="cui/ui/pageformatpage/checkAdaptBox">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></paragraph>
+    </default>
+</switch>
+
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3149123" xml-lang="en-US"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
 <switch select="appl">
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 51190e0f32..fb6afad07f 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -27,7 +27,7 @@
       </topic>
    </meta>
    <body>
-      <paragraph xml-lang="en-US" id="hd_id3150758" role="heading" level="1">Format Menu</paragraph>
+      <h1 id="hd_id3150758">Format Menu</h1>
       <section id="initialen">
          <paragraph xml-lang="en-US" id="par_id3153618" role="paragraph">Choose <emph>Format - Paragraph - Drop Caps</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph">Choose <emph>View - Styles -</emph> open context menu <emph>Modify/New - Drop Caps</emph> tab.</paragraph>
@@ -52,7 +52,7 @@
           </list>
       </section>
       <section id="formatseite">
-         <paragraph xml-lang="en-US" id="par_id3152947" role="paragraph">Choose <menuitem>Format - Page</menuitem>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152947" role="paragraph">Choose <menuitem>Format - Page Style</menuitem>.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153536" role="paragraph">Choose <menuitem>View - Styles</menuitem> - open context menu <emph>New/Modify</emph> (for Page Styles).</paragraph>
       </section>
       <section id="abnumerierung">
@@ -62,14 +62,14 @@
       </section>
       <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph"><variable id="spaltenber">Choose <menuitem>Format - Sections - Options</menuitem> button.</variable></paragraph>
       <section id="spaltens">
-         <paragraph xml-lang="en-US" id="par_id3150836" role="paragraph">Choose <emph>Format - Page - Columns</emph> tab.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150836" role="paragraph">Choose <emph>Format - Page Style - Columns</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149687" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Columns</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph">Choose <emph>View - Styles</emph> - open context menu <emph>Modify/New - Columns</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3151336" role="paragraph">Choose <emph>Insert - Frame - Frame - Columns</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3143276" role="paragraph">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab.</paragraph>
       </section>
       <section id="fussnoteform">
-         <paragraph xml-lang="en-US" id="par_id3149817" role="paragraph">Choose <emph>Format - Page - Footnote</emph> tab.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149817" role="paragraph">Choose <emph>Format - Page Style - Footnote</emph> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph">Choose <emph>View - Styles</emph> - open context menu <emph>Modify/New - Footnote</emph> tab.</paragraph>
       </section>
       <section id="fussendnoten">
@@ -352,7 +352,7 @@
 
       </section>
       <section id="textraster">
-         <paragraph xml-lang="en-US" id="par_id3150140" role="paragraph">Menu <emph>Format - Page</emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150140" role="paragraph">Menu <emph>Format - Page Style </emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled</paragraph>
       </section>
    </body>
 </helpdocument>
diff --git a/source/text/swriter/01/05040000.xhp b/source/text/swriter/01/05040000.xhp
index c33a787cb3..41e4d0f744 100644
--- a/source/text/swriter/01/05040000.xhp
+++ b/source/text/swriter/01/05040000.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,7 +16,6 @@
  *   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="textswriter0105040000xml" indexer="include" status="PUBLISH">
@@ -31,9 +28,11 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:PageDialog" id="bm_id3145246" localize="false"/>
-<paragraph role="heading" id="hd_id3150016" xml-lang="en-US" level="1">Page Style</paragraph>
-<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US"><variable id="seitetext"><ahelp hid=".uno:PageDialog">Specify the formatting styles and the layout for the current page style, including page margins, headers and footers, and the page background.</ahelp>
-</variable></paragraph>
+<section id="PageStyle">
+<h1 id="hd_id3150016"><link href="text/swriter/01/05040000.xhp" name="Page Style">Page Style</link></h1>
+<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US"><ahelp hid=".uno:PageDialog">Specify the formatting styles and the layout for the current page style, including page margins, headers and footers, and the page background.</ahelp>
+</paragraph>
+</section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#formatseite"/>
 </section>
diff --git a/source/text/swriter/guide/pageorientation.xhp b/source/text/swriter/guide/pageorientation.xhp
index 7d4cca52d4..fefe50738f 100644
--- a/source/text/swriter/guide/pageorientation.xhp
+++ b/source/text/swriter/guide/pageorientation.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriterguidepageorientationxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Changing Page Orientation (Landscape or Portrait)</title>
@@ -39,15 +39,15 @@
       <bookmark_value>sideways orientation of pages</bookmark_value>
       <bookmark_value>scope of page styles</bookmark_value>
 </bookmark><comment>MW changed "page styles;..." and added one entry</comment>
-<paragraph xml-lang="en-US" id="par_idN106FF" role="heading" level="1"><variable id="pageorientation"><link href="text/swriter/guide/pageorientation.xhp">Changing Page Orientation</link>
-</variable></paragraph>
+<h1 id="par_idN106FF"><variable id="pageorientation"><link href="text/swriter/guide/pageorientation.xhp">Changing Page Orientation</link>
+</variable></h1>
       <paragraph xml-lang="en-US" id="par_id6418042" role="paragraph">All page properties for Writer text documents, like for example the page orientation, are defined by page styles. By default, a new text document uses the “Default” page style for all pages. If you open an existing text document, different page styles may have been applied to the different pages. </paragraph>
       <paragraph xml-lang="en-US" id="par_id8324533" role="paragraph">It is important to know that changes that you apply to a page property will only affect the pages that use the current page style. The current page style is listed in the Status Bar at the lower window border.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7524033" role="heading" level="2">To Change the Page Orientation for All Pages</paragraph>
+      <h2 id="par_id7524033">To Change the Page Orientation for All Pages</h2>
       <paragraph xml-lang="en-US" id="par_id6307260" role="paragraph">If your text document consists only of pages with the same page style, you can change the page properties directly:</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id5256508" role="listitem">Choose <emph>Format - Page</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id5256508" role="listitem">Choose <menuitem>Format - Page Style</menuitem>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id9681997" role="listitem">Click the <emph>Page</emph> tab.</paragraph>
@@ -59,10 +59,10 @@
             <paragraph xml-lang="en-US" id="par_id7069002" role="listitem">Click <emph>OK</emph>.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="hd_id4202398" role="heading" level="2">To Change the Page Orientation Only for Some Pages</paragraph>
+      <h2 id="hd_id4202398">To Change the Page Orientation Only for Some Pages</h2>
       <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph">$[officename] uses page styles to specify the orientation of the pages in a document. Page styles define more page properties, as for example header and footer or page margins. You can either change the “Default” page style for the current document, or you can define own page styles and apply those page styles to any parts of your text. </paragraph>
       <paragraph xml-lang="en-US" id="par_id1449324" role="paragraph">At the end of this help page, we'll discuss the scope of page styles in detail. If you are unsure about the page style concept, please read the section at the end of this page.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1480758" role="note">Unlike character styles or paragraph styles, the page styles don't know a hierarchy. You can create a new page style based on the properties of an existing page style, but when you later change the source style, the new page style does not automatically inherit the changes.</paragraph>
+      <note id="par_id1480758">Unlike character styles or paragraph styles, the page styles don't know a hierarchy. You can create a new page style based on the properties of an existing page style, but when you later change the source style, the new page style does not automatically inherit the changes.</note>
       <paragraph xml-lang="en-US" id="par_id2962126" role="paragraph">To change the page orientation for all pages that share the same page style, you first need a page style, then apply that style:</paragraph>
       <list type="ordered">
          <listitem>
@@ -92,14 +92,14 @@
       </list>
       <paragraph xml-lang="en-US" id="par_id1658375" role="listitem">Now you have defined a proper page style with the name "My Landscape". To apply the new style, double-click the "My Landscape" page style in the <emph>Styles</emph> window. All pages in the current scope of page styles will be changed. If you defined the "next style" to be a different style, only the first page of the current scope of page styles will be changed.</paragraph>
       <section id="scope">
-         <paragraph xml-lang="en-US" id="hd_id6082949" role="heading" level="2">The Scope of Page Styles</paragraph>
+         <h2 id="hd_id6082949">The Scope of Page Styles</h2>
          <paragraph xml-lang="en-US" id="par_id2858668" role="paragraph">You should be aware of the scope of page styles in %PRODUCTNAME. Which pages of your text document get affected by editing a page style?</paragraph>
-         <paragraph xml-lang="en-US" id="hd_id3278603" role="heading" level="3">One Page Long Styles</paragraph>
-         <paragraph xml-lang="en-US" id="par_id5169225" role="paragraph">A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the "next style", on the <item type="menuitem">Format - Page - Organizer</item> tab page.</paragraph>
+         <h3 id="hd_id3278603">One Page Long Styles</h3>
+         <paragraph xml-lang="en-US" id="par_id5169225" role="paragraph">A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the "next style", on the <menuitem>Format - Page Style - Organizer</menuitem> tab page.</paragraph>
          <paragraph xml-lang="en-US" id="par_id6670125" role="paragraph">A one page long style starts from the lower border of the current page style range up to the next page break. The next page break appears automatically when the text flows to the next page, which is sometimes called a "soft page break". Alternatively, you can insert a manual page break.</paragraph>
          <paragraph xml-lang="en-US" id="par_id2118594" role="paragraph">To insert a manual page break at the cursor position, press <item type="keycode">Ctrl+Enter</item> or choose <item type="menuitem">Insert - Manual Break</item> and just click OK.</paragraph>
-         <paragraph xml-lang="en-US" id="hd_id166020" role="heading" level="3">Manually Defined Range of a Page style</paragraph>
-         <paragraph xml-lang="en-US" id="par_id6386913" role="paragraph">The “Default” page style does not set a different "next style" on the <item type="menuitem">Format - Page - Organizer</item> tab page. Instead, the "next style" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by "page breaks with style". All the pages between any two "page breaks with style" use the same page style.</paragraph>
+         <h3 id="hd_id166020">Manually Defined Range of a Page style</h3>
+         <paragraph xml-lang="en-US" id="par_id6386913" role="paragraph">The “Default” page style does not set a different "next style" on the <menuitem>Format - Page Style - Organizer</menuitem> tab page. Instead, the "next style" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by "page breaks with style". All the pages between any two "page breaks with style" use the same page style.</paragraph>
          <paragraph xml-lang="en-US" id="par_id6062196" role="paragraph">You can insert a "page break with style" directly at the cursor position. Alternatively, you can apply the "page break with style" property to a paragraph or to a paragraph style.</paragraph>
          <paragraph xml-lang="en-US" id="par_id6054261" role="paragraph">Perform any one of the following commands:</paragraph>
          <list type="unordered">
@@ -123,4 +123,4 @@
       <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
       <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index d5b03e6e58..3cd4e74a7e 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -31,29 +31,30 @@
 <section id="format">
 <bookmark xml-lang="en-US" branch="hid/.uno:FormatMenu" id="bm_id3047160" localize="false"/>
 
-<paragraph id="hd_id3147820" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/main0105.xhp" name="Format">Format</link></paragraph>
+<h1 id="hd_id3147820"><link href="text/swriter/main0105.xhp" name="Format">Format</link></h1>
 <paragraph id="par_id3147218" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:FormatMenu">Contains commands for formatting the layout and the contents of your document.</ahelp></paragraph>
 </section>
 <embed href="text/shared/submenu_text.xhp#submenu_text"/>
 <embed href="text/shared/01/05010000.xhp#standard"/>
 
-<paragraph id="hd_id3147261" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></paragraph>
+<h2 id="hd_id3147261"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></h2>
 <embed href="text/shared/01/05020000.xhp#zeichentext"/>
 
-<paragraph id="hd_id3147286" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/05030000.xhp" name="Paragraph">Paragraph</link></paragraph>
+<h2 id="hd_id3147286"><link href="text/shared/01/05030000.xhp" name="Paragraph">Paragraph</link></h2>
 <embed href="text/shared/01/05030000.xhp#absatztext"/>
 
-<paragraph id="hd_id3145784" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/06050000.xhp" name="Numbering/Bullets">Bullets and Numbering</link></paragraph>
+<h2 id="hd_id3145784"><link href="text/shared/01/06050000.xhp" name="Numbering/Bullets">Bullets and Numbering</link></h2>
 <embed href="text/shared/01/06050000.xhp#numauftext"/>
 
-<paragraph id="hd_id3145692" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/05040000.xhp" name="Page">Page</link></paragraph>
-<embed href="text/swriter/01/05040000.xhp#seitetext"/>
+<embed href="text/swriter/01/05040000.xhp#PageStyle"/>
+<!--<h2 id="hd_id3145692"><link href="text/swriter/01/05040000.xhp" name="Page">Page</link></h2>
+<embed href="text/swriter/01/05040000.xhp#seitetext"/>-->
 <embed href="text/shared/01/05060000.xhp#ruby"/>
 
-<paragraph id="hd_id3145743" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/05040500.xhp" name="Columns">Columns</link></paragraph>
+<h2 id="hd_id3145743"><link href="text/swriter/01/05040500.xhp" name="Columns">Columns</link></h2>
 <embed href="text/swriter/01/05040500.xhp#spaltentext"/>
 
-<paragraph id="hd_id3145717" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/02170000.xhp" name="Sections">Sections</link></paragraph>
+<h2 id="hd_id3145717"><link href="text/swriter/01/02170000.xhp" name="Sections">Sections</link></h2>
 <embed href="text/swriter/01/02170000.xhp#bereichetext"/>
 <embed href="text/swriter/01/05150000.xhp#autoformat"/>
 <embed href="text/shared/01/05260000.xhp#verankerung"/>
@@ -65,10 +66,10 @@
 <embed href="text/shared/01/05290000.xhp#gruppe"/>
 <embed href="text/swriter/01/format_object.xhp#object"/>
 
-<paragraph id="hd_id3149910" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/04130000.xhp" name="Frame">Frame</link></paragraph>
+<h2 id="hd_id3149910"><link href="text/swriter/01/04130000.xhp" name="Frame">Frame</link></h2>
 <embed href="text/swriter/01/04130000.xhp#rahm"/>
 
-<paragraph id="hd_id3149935" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/05060000.xhp" name="Image">Image</link></paragraph>
+<h2 id="hd_id3149935"><link href="text/swriter/01/05060000.xhp" name="Image">Image</link></h2>
 <embed href="text/swriter/01/05060000.xhp#grafiktext"/>
 </body>