summaryrefslogtreecommitdiff
path: root/source/text/shared/02
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-25 15:13:19 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-25 15:13:19 +0100
commit64563d3282294842614f11f6c6f7c1e28211a9ec (patch)
treeb1929c5e13b04e6d7b589df0d23018775a4cfbef /source/text/shared/02
parent8d852d1c804bb12ffc339f56b0d838797200f8b5 (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/shared/02')
-rw-r--r--source/text/shared/02/01170000.xhp2
-rw-r--r--source/text/shared/02/01170003.xhp2
-rw-r--r--source/text/shared/02/02020000.xhp2
3 files changed, 3 insertions, 3 deletions
diff --git a/source/text/shared/02/01170000.xhp b/source/text/shared/02/01170000.xhp
index 191822be24..078235464b 100644
--- a/source/text/shared/02/01170000.xhp
+++ b/source/text/shared/02/01170000.xhp
@@ -73,7 +73,7 @@
<paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="CHG" oldref="45">To create a form, open a document and use the Form Controls toolbar to add and define the form controls. If you want, you can also link the form to a database, so that you can use the controls to manipulate a database.</paragraph>
<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="46">When you create a form in an HTML document, you can use the form to send data over the Internet.</paragraph>
-<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>.</paragraph>
+<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Load/Save - HTML Compatibility</emph>.</paragraph>
<paragraph role="heading" id="par_idN10C39" xml-lang="en-US" level="2" l10n="NEW">To add a control to a document</paragraph>
<list type="ordered">
<listitem>
diff --git a/source/text/shared/02/01170003.xhp b/source/text/shared/02/01170003.xhp
index 46999a8525..87ee82ac19 100644
--- a/source/text/shared/02/01170003.xhp
+++ b/source/text/shared/02/01170003.xhp
@@ -28,7 +28,7 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
-<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
<paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document.</paragraph>
<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
</body>
diff --git a/source/text/shared/02/02020000.xhp b/source/text/shared/02/02020000.xhp
index 0785204db9..f4836c2a73 100644
--- a/source/text/shared/02/02020000.xhp
+++ b/source/text/shared/02/02020000.xhp
@@ -39,7 +39,7 @@
<paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
<section id="syschriftart">
<table id="tbl_id3159399">
<tablerow>