summaryrefslogtreecommitdiff
path: root/source/text/swriter/01
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/swriter/01
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/swriter/01')
-rw-r--r--source/text/swriter/01/04090200.xhp4
-rw-r--r--source/text/swriter/01/04120211.xhp2
-rw-r--r--source/text/swriter/01/04150000.xhp2
3 files changed, 4 insertions, 4 deletions
diff --git a/source/text/swriter/01/04090200.xhp b/source/text/swriter/01/04090200.xhp
index d9771a2b20..ceee3b2362 100644
--- a/source/text/swriter/01/04090200.xhp
+++ b/source/text/swriter/01/04090200.xhp
@@ -149,7 +149,7 @@
<paragraph xml-lang="en-US" id="par_id3150097" role="note" l10n="CHG" oldref="45">The "equal" comparative operator must be represented by two equal signs (==) in a condition. For example, if you define a variable "x" with the value of 1, you can enter the condition as x==1.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3148791" role="heading" level="2" l10n="U"
oldref="95">User Data</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="U" oldref="97">The following table lists user data variables and their meanings:</paragraph>
<table id="tbl_id3153139">
<tablerow>
@@ -344,7 +344,7 @@
<paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
<paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
<paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
oldref="59">Examples of Conditions in Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
diff --git a/source/text/swriter/01/04120211.xhp b/source/text/swriter/01/04120211.xhp
index 542a84859f..e818dfb06e 100644
--- a/source/text/swriter/01/04120211.xhp
+++ b/source/text/swriter/01/04120211.xhp
@@ -45,7 +45,7 @@
<paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/tocindexpage/title">Enter a title for the selected index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/readonly" id="bm_id3154477" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U" oldref="9">Protected against manual changes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/tocindexpage/readonly">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/tocindexpage/readonly">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
</section>
<section id="verzfuer">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/scope" id="bm_id3155904" localize="false"/>
diff --git a/source/text/swriter/01/04150000.xhp b/source/text/swriter/01/04150000.xhp
index aa7c1b1904..15fce2fedd 100644
--- a/source/text/swriter/01/04150000.xhp
+++ b/source/text/swriter/01/04150000.xhp
@@ -49,7 +49,7 @@
<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW">To insert a table into a table, click in a cell in the table and choose <emph>Table - Insert - Table</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
<embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/inserttable/nameedit" id="bm_id3147514" localize="false"/>
<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="2" l10n="U" oldref="4">Name</paragraph>