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/sbasic | |
| 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/sbasic')
| -rw-r--r-- | source/text/sbasic/shared/00000002.xhp | 2 | ||||
| -rw-r--r-- | source/text/sbasic/shared/00000003.xhp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/text/sbasic/shared/00000002.xhp b/source/text/sbasic/shared/00000002.xhp index 5cfdc64324..f2f6ac2a25 100644 --- a/source/text/sbasic/shared/00000002.xhp +++ b/source/text/sbasic/shared/00000002.xhp @@ -44,7 +44,7 @@ </section> <section id="measurementunits"> <paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="32">Measurement Units</paragraph> -<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - (Document Type) - General</emph>.</paragraph> +<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - (Document Type) - General</emph>.</paragraph> </section> <section id="twips"> <bookmark xml-lang="en-US" branch="index" id="bm_id3145801"><bookmark_value>twips; definition</bookmark_value> diff --git a/source/text/sbasic/shared/00000003.xhp b/source/text/sbasic/shared/00000003.xhp index ae947c5a90..0007edade8 100644 --- a/source/text/sbasic/shared/00000003.xhp +++ b/source/text/sbasic/shared/00000003.xhp @@ -32,7 +32,7 @@ <body> <paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="1" l10n="U" oldref="1">Information</paragraph> <section id="languageformat"> -<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph> +<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph> <paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="103">The same applies to the locale settings for date, time and currency formats. The Basic format code will be interpreted and displayed according to your locale setting.</paragraph> </section> <section id="farbcodes"> |