diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-01-25 15:13:19 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-01-25 15:13:19 +0100 |
commit | 64563d3282294842614f11f6c6f7c1e28211a9ec (patch) | |
tree | b1929c5e13b04e6d7b589df0d23018775a4cfbef /source/text/scalc/guide | |
parent | 8d852d1c804bb12ffc339f56b0d838797200f8b5 (diff) |
switchinline is none of emph's allowed children
fixed with following sed expression:
's#<emph>\(<switchinline[^>]*><caseinline[^>]*>\)\([^>]*\)\(</caseinline><defaultinline>\)\([^<]*\)\(</defaultinline></switchinline>\)\([^<]*</emph>\)#\1<emph>\2</emph>\3<emph>\4</emph>\5<emph>\6#g'
Change-Id: I03d36f4c52e78ca48fc2f94b275ffad7329071e3
Diffstat (limited to 'source/text/scalc/guide')
-rw-r--r-- | source/text/scalc/guide/csv_formula.xhp | 4 | ||||
-rw-r--r-- | source/text/scalc/guide/formula_value.xhp | 2 | ||||
-rw-r--r-- | source/text/scalc/guide/note_insert.xhp | 2 | ||||
-rw-r--r-- | source/text/scalc/guide/rounding_numbers.xhp | 4 | ||||
-rw-r--r-- | source/text/scalc/guide/sorted_list.xhp | 2 | ||||
-rw-r--r-- | source/text/scalc/guide/table_view.xhp | 2 | ||||
-rw-r--r-- | source/text/scalc/guide/year2000.xhp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/source/text/scalc/guide/csv_formula.xhp b/source/text/scalc/guide/csv_formula.xhp index e819780e62..f73ef9b01d 100644 --- a/source/text/scalc/guide/csv_formula.xhp +++ b/source/text/scalc/guide/csv_formula.xhp @@ -48,7 +48,7 @@ <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="18">You will see the <item type="menuitem">Text Import</item> dialog. Click <item type="menuitem">OK</item>.</paragraph> </listitem> </list> - <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph> + <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph> <paragraph xml-lang="en-US" id="hd_id3154022" role="heading" level="2" l10n="U" oldref="3">To Export Formulas and Values as CSV Files</paragraph> <list type="ordered"> <listitem> @@ -56,7 +56,7 @@ </listitem> <listitem> <paragraph xml-lang="en-US" id="par_id3166423" role="listitem" l10n="U" oldref="5">If you want to export the formulas as formulas, for example, in the form =SUM(A1:B5), proceed as follows:</paragraph> - <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph> + <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - View</emph>.</paragraph> <paragraph xml-lang="en-US" id="par_id3150200" role="listitem" l10n="U" oldref="7">Under <emph>Display</emph>, mark the <emph>Formulas</emph> check box. Click <emph>OK</emph>.</paragraph> <paragraph xml-lang="en-US" id="par_id3154484" role="listitem" l10n="U" oldref="8">If you want to export the calculation results instead of the formulas, do not mark <emph>Formulas</emph>.</paragraph> </listitem> diff --git a/source/text/scalc/guide/formula_value.xhp b/source/text/scalc/guide/formula_value.xhp index faee50d229..bb7832dd66 100644 --- a/source/text/scalc/guide/formula_value.xhp +++ b/source/text/scalc/guide/formula_value.xhp @@ -41,7 +41,7 @@ <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="2">If you want to display the formulas in the cells, for example in the form =SUM(A1:B5), proceed as follows:</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph> +<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - View</emph>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="4">In the <emph>Display</emph> area mark the <emph>Formulas</emph> box. Click OK.</paragraph> diff --git a/source/text/scalc/guide/note_insert.xhp b/source/text/scalc/guide/note_insert.xhp index f7747e4338..22587c05dd 100644 --- a/source/text/scalc/guide/note_insert.xhp +++ b/source/text/scalc/guide/note_insert.xhp @@ -55,7 +55,7 @@ <paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph> +<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph> </listitem> </list> <paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph> diff --git a/source/text/scalc/guide/rounding_numbers.xhp b/source/text/scalc/guide/rounding_numbers.xhp index a763120f51..731fc70d5c 100644 --- a/source/text/scalc/guide/rounding_numbers.xhp +++ b/source/text/scalc/guide/rounding_numbers.xhp @@ -61,7 +61,7 @@ <paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To change this everywhere</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph> +<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc</emph>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="10">Go to the <emph>Calculate</emph> page. Modify the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph> @@ -70,7 +70,7 @@ <paragraph role="heading" id="hd_id3154755" xml-lang="en-US" level="3" l10n="U" oldref="11">To calculate with the rounded off numbers instead of the internal exact values</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph> +<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc</emph>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the <emph>Precision as shown</emph> field and exit the dialog with OK.</paragraph> diff --git a/source/text/scalc/guide/sorted_list.xhp b/source/text/scalc/guide/sorted_list.xhp index 665fdc79c4..df455f3ad4 100644 --- a/source/text/scalc/guide/sorted_list.xhp +++ b/source/text/scalc/guide/sorted_list.xhp @@ -47,7 +47,7 @@ <paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="7">Sort lists allow you to type one piece of information in a cell, then drag it to fill in a consecutive list of items.</paragraph> <paragraph xml-lang="en-US" id="par_id3148645" role="paragraph" l10n="U" oldref="4">For example, enter the text "Jan" or "January" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months.</paragraph> <paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> if you do not want to fill the cells with different values.</paragraph> - <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph> + <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph> <section id="relatedtopics"> <embed href="text/scalc/guide/calc_series.xhp#calc_series"/> diff --git a/source/text/scalc/guide/table_view.xhp b/source/text/scalc/guide/table_view.xhp index 49dc7b5773..d868de2520 100644 --- a/source/text/scalc/guide/table_view.xhp +++ b/source/text/scalc/guide/table_view.xhp @@ -43,7 +43,7 @@ <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To hide column and line headers in a table:</paragraph> <list type="unordered"> <listitem> -<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph> +<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph> </listitem> </list> <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph> diff --git a/source/text/scalc/guide/year2000.xhp b/source/text/scalc/guide/year2000.xhp index 3aa168dd68..99e9fe4e4f 100644 --- a/source/text/scalc/guide/year2000.xhp +++ b/source/text/scalc/guide/year2000.xhp @@ -39,7 +39,7 @@ <paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="17">The year in a date entry is often entered as two digits. Internally, the year is managed by $[officename] as four digits, so that in the calculation of the difference from 1/1/99 to 1/1/01, the result will correctly be two years.</paragraph> <list type="unordered"> <listitem> -<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph> +<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph> </listitem> </list> <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="20">This means that if you enter a date of 1/1/30 or higher, it will be treated internally as 1/1/1930 or higher. All lower two-digit years apply to the 20xx century. So, for example, 1/1/20 is converted into 1/1/2020.</paragraph> |