summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/01
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
commit5ccd1d319b38120437fe69a3b6884e00cf22ee4e (patch)
tree3fbc437a38c99a98250c39533659836eeae1c4c9 /helpcontent2/source/text/swriter/01
parentf01f267f5bf6a19106771b39ad3253913efb0001 (diff)
CWS-TOOLING: integrate CWS hcshared19
Diffstat (limited to 'helpcontent2/source/text/swriter/01')
-rw-r--r--helpcontent2/source/text/swriter/01/01160300.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/02120000.xhp22
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp7
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp116
-rw-r--r--helpcontent2/source/text/swriter/01/04090002.xhp126
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp66
-rw-r--r--helpcontent2/source/text/swriter/01/04090004.xhp80
-rw-r--r--helpcontent2/source/text/swriter/01/04090005.xhp105
-rw-r--r--helpcontent2/source/text/swriter/01/04090006.xhp74
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120212.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04130100.xhp8
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030200.xhp65
-rw-r--r--helpcontent2/source/text/swriter/01/05040500.xhp16
-rw-r--r--helpcontent2/source/text/swriter/01/05060200.xhp58
-rw-r--r--helpcontent2/source/text/swriter/01/05060201.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05090201.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05100000.xhp12
-rw-r--r--helpcontent2/source/text/swriter/01/05100100.xhp58
-rw-r--r--helpcontent2/source/text/swriter/01/05100200.xhp72
-rw-r--r--helpcontent2/source/text/swriter/01/05100500.xhp55
-rw-r--r--helpcontent2/source/text/swriter/01/05100600.xhp55
-rw-r--r--helpcontent2/source/text/swriter/01/05100700.xhp55
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05110000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05110600.xhp57
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05120000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05120600.xhp57
-rw-r--r--helpcontent2/source/text/swriter/01/05130100.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/makefile.mk9
29 files changed, 452 insertions, 815 deletions
diff --git a/helpcontent2/source/text/swriter/01/01160300.xhp b/helpcontent2/source/text/swriter/01/01160300.xhp
index a3480318c9..899a85cc58 100644
--- a/helpcontent2/source/text/swriter/01/01160300.xhp
+++ b/helpcontent2/source/text/swriter/01/01160300.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01160300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -27,7 +27,7 @@
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * for a copy of the LGPLv3 License.
*
************************************************************************-->
diff --git a/helpcontent2/source/text/swriter/01/02120000.xhp b/helpcontent2/source/text/swriter/01/02120000.xhp
index 75b923172e..60f744997d 100644
--- a/helpcontent2/source/text/swriter/01/02120000.xhp
+++ b/helpcontent2/source/text/swriter/01/02120000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02120000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0102120000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0102120000xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoText</title>
<filename>/text/swriter/01/02120000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-07-11T09:47:15">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autotext">
@@ -54,7 +50,7 @@
</section>
<paragraph role="tip" id="par_id3143277" xml-lang="en-US" l10n="CHG" oldref="52">You can also click the arrow next to the <emph>AutoText</emph> icon on the <emph>Insert</emph> bar, and then choose the AutoText that you want to insert.</paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000402.xhp#autotext"/>
+<embed href="text/swriter/00/00000402.xhp#autotext"/>
</section>
<embed href="text/swriter/guide/autotext.xhp#autotext"/>
<paragraph role="heading" id="hd_id3148982" xml-lang="en-US" level="2" l10n="U" oldref="4">AutoText</paragraph>
@@ -95,7 +91,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_RENAME" id="bm_id3150779" localize="false"/>
<paragraph role="heading" id="hd_id3150768" xml-lang="en-US" level="3" l10n="U" oldref="23">Rename</paragraph>
<paragraph role="paragraph" id="par_id3150786" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="." visibility="hidden">Opens the Rename AutoText dialog, where you can change the name of the selected AutoText entry.</ahelp>Opens the <link href="text/swriter/01/02120100.xhp" name="Rename Text Block">Rename AutoText</link> dialog, where you can change the name of the selected AutoText entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_EDIT" id="bm_id3155352" localize="false"/>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="35">Edit</paragraph>
<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_MD_GLOS_EDIT">Opens the selected AutoText entry for editing in a separate document. Make the changes that you want, choose <emph>File - Save AutoText</emph>, and then choose <emph>File - Close</emph>.</ahelp></paragraph>
@@ -127,7 +123,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_GLOS_GROUP_TREE" id="bm_id3154131" localize="false"/>
<paragraph role="heading" id="hd_id3154120" xml-lang="en-US" level="3" l10n="U" oldref="81">Selection list</paragraph>
<paragraph role="paragraph" id="par_id3154137" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_GLOS_GROUP_TREE">Lists the existing AutoText categories and the corresponding paths.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_BIB_BASE_PB_DELETE" id="bm_id6168401" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
<paragraph role="heading" id="hd_id3145615" xml-lang="en-US" level="2" l10n="U" oldref="56">Path</paragraph>
<paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="." visibility="hidden">Opens the Edit Paths dialog, where you can select the directory to store AutoText.</ahelp>Opens the <link href="text/shared/optionen/01010301.xhp" name="Edit Paths">Edit Paths</link> dialog, where you can select the directory to store AutoText.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 8981a8a35c..980f3fdf1a 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,16 +64,13 @@
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_FORMAT">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Caption</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp> For example, if you want to label your objects as "Object 1: Text", type a colon (:), a space, and then the text.</paragraph>
+<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_CAPTION_EDT_SEP" id="bm_id7607959" localize="false"/>
<paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
<paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_CAPTION_BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
<paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME" id="bm_id3151258" localize="false"/>
-<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="42">Object name</paragraph>
-<paragraph role="paragraph" id="par_id3148969" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME">Type a name for the caption object, so that you can use the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> to quickly jump to the caption in your document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149043" xml-lang="en-US" level="2" l10n="U" oldref="29"><link href="text/swriter/01/04060100.xhp" name="Options">Options</link></paragraph>
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index 60c1cca858..867458bf87 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090001.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,164 +32,170 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090001xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090001xml" indexer="include">
<title id="tit" xml-lang="en-US">Document</title>
<filename>/text/swriter/01/04090001.xhp</filename>
</topic>
</meta>
<body>
<section id="dokument">
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_DOK" id="bm_id3145246" localize="false"/><paragraph role="heading" id="hd_id3150017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_DOK" id="bm_id3145246" localize="false"/>
+<paragraph role="heading" id="hd_id3150017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2">Fields are used to insert information about the current document, for example, file name, template, statistics, user data, date, and time.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddokument"/>
+<embed href="text/swriter/00/00000404.xhp#felddokument"/>
</section>
<paragraph role="note" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="3">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
<section id="feldtyp">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
+<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
<paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp> The following fields are available:</paragraph>
</section>
<table id="tbl_id3149686">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="6">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="7">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="10">Author</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148975" xml-lang="en-US" l10n="U" oldref="11">Inserts the name of the user who first saved the document. </paragraph>
<paragraph role="tablecontent" id="par_id3147093" xml-lang="en-US" l10n="CHG" oldref="66">To view the name of the author, choose <emph>File - Properties</emph>, click the <emph>General</emph> tab, and then look at the <emph>Created </emph>line. The name of the author is appended to the <emph>Created</emph> line only if the <emph>Apply user data</emph> check box is selected.<comment>we must define the difference of (first) Author and (current) User somewhere, so it is here next to the Author index entry</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145759" xml-lang="en-US" l10n="U" oldref="18">Chapter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149172" xml-lang="en-US" l10n="U" oldref="19">Inserts the chapter number and/or the chapter name.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145771" xml-lang="en-US" l10n="U" oldref="14">Date</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151370" xml-lang="en-US" l10n="CHG" oldref="15">Inserts the current date. You can insert the date as a fixed field - <item type="literal">Date (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Date</item> - that it is updated automatically. To manually update the <item type="literal">Date</item> field, press F9.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150699" xml-lang="en-US" l10n="U" oldref="12">File name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="13">Inserts the filename and/or the directory path of the current document, as well as the filename without extension.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="20">Page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145264" xml-lang="en-US" l10n="U" oldref="21">Inserts the page number of the current, previous, or next page.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150561" xml-lang="en-US" l10n="U" oldref="8">Sender</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146341" xml-lang="en-US" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148863" xml-lang="en-US" l10n="U" oldref="22">Statistics</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151091" xml-lang="en-US" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153302" xml-lang="en-US" l10n="U" oldref="16">Templates</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156123" xml-lang="en-US" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose <emph>File - Templates -</emph><link href="text/shared/01/01110100.xhp" name="Organize"><emph>Organize</emph></link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146939" xml-lang="en-US" l10n="U" oldref="24">Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154340" xml-lang="en-US" l10n="CHG" oldref="25">Inserts the current time. You can insert the time as a fixed field - <item type="literal">Time (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Time</item> - that it is updated automatically. To manually update the <item type="literal">Time</item> field, press F9.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="hinweis">
<paragraph role="note" id="par_id3154631" xml-lang="en-US" l10n="U" oldref="26">The following fields can only be inserted if the corresponding field type is selected in the <emph>Type </emph>list.</paragraph>
</section>
<section id="auswahl">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/><paragraph role="heading" id="hd_id3150660" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
+<paragraph role="heading" id="hd_id3150660" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="53">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
<table id="tbl_id3148722">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155359" xml-lang="en-US" l10n="U" oldref="30">Fields</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154220" xml-lang="en-US" l10n="U" oldref="31">Function</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145107" xml-lang="en-US" l10n="U" oldref="32">Previous page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149595" xml-lang="en-US" l10n="U" oldref="33">Inserts the page number of the previous page in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146896" xml-lang="en-US" l10n="U" oldref="34">Next page </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="35">Inserts the page number of the next page in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="36">Page Number </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159212" xml-lang="en-US" l10n="U" oldref="37">Inserts the current page number.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="38">In the <emph>Format</emph>, click the numbering format that you want to use.</paragraph>
<paragraph role="paragraph" id="par_id3145188" xml-lang="en-US" l10n="U" oldref="39">If you want, you can enter an <emph>Offset </emph>for the displayed page number. With an <emph>Offset</emph> value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty.</paragraph>
</section>
<section id="korrektur">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/><paragraph role="heading" id="hd_id3150891" xml-lang="en-US" level="2" l10n="U" oldref="45">Offset</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
+<paragraph role="heading" id="hd_id3150891" xml-lang="en-US" level="2" l10n="U" oldref="45">Offset</paragraph>
<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FLD_DOK:ED_DOKVALUE">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
</section>
<paragraph role="tip" id="par_id3154948" xml-lang="en-US" l10n="U" oldref="54">If you want to change the actual page number and not the displayed number, do not use the <emph>Offset</emph> value. To change page numbers, read the <link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers"><emph>Page Numbers</emph></link> guide.</paragraph>
<section id="format">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/><paragraph role="heading" id="hd_id3145595" xml-lang="en-US" level="2" l10n="U" oldref="41">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
+<paragraph role="heading" id="hd_id3145595" xml-lang="en-US" level="2" l10n="U" oldref="41">Format</paragraph>
<paragraph role="paragraph" id="par_id3145613" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3150138" xml-lang="en-US" l10n="U" oldref="49"><variable id="datumuhrzeitformat">When you click "Additional formats", the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog opens, where you can define a custom format.
@@ -200,38 +205,43 @@
<paragraph role="paragraph" id="par_id3148682" xml-lang="en-US" l10n="U" oldref="56">The following number range formats are for paragraphs formatted with numbered or bulleted lists:</paragraph>
<table id="tbl_id3149976">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150006" xml-lang="en-US" l10n="U" oldref="57">Category and number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155386" xml-lang="en-US" l10n="U" oldref="58">The format contains everything between the beginning of the paragraph and directly after the number-range field</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="59">Caption text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155929" xml-lang="en-US" l10n="U" oldref="60">The format contains the text following the number-range field up to the end of the paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148733" xml-lang="en-US" l10n="U" oldref="61">Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="62">The format only contains the reference number</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/><embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/><paragraph role="heading" id="hd_id3153026" xml-lang="en-US" level="2" l10n="U" oldref="43">Layer</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804313432" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
+<embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
+<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
+<paragraph role="heading" id="hd_id3153026" xml-lang="en-US" level="2" l10n="U" oldref="43">Layer</paragraph>
<paragraph role="paragraph" id="par_id3154580" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL">Select the chapter heading level that you want to include in the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/><paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="51">Offset in days/minutes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
+<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="51">Offset in days/minutes</paragraph>
<paragraph role="paragraph" id="par_id3154899" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the offset that you want to apply to a date or time field.</ahelp></paragraph>
<section id="wert">
<paragraph role="heading" id="hd_id3154922" xml-lang="en-US" level="2" l10n="U" oldref="47">Value</paragraph>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090002.xhp b/helpcontent2/source/text/swriter/01/04090002.xhp
index 350987f79d..3f7672a83d 100644
--- a/helpcontent2/source/text/swriter/01/04090002.xhp
+++ b/helpcontent2/source/text/swriter/01/04090002.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090002.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090002xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090002xml" indexer="include">
<title id="tit" xml-lang="en-US">Cross-references</title>
<filename>/text/swriter/01/04090002.xhp</filename>
</topic>
@@ -46,7 +44,8 @@
<section id="referenzen">
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_REF_FIELD" id="bm_id8981346" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertReferenceField" id="bm_id3149038" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_REF" id="bm_id3149042" localize="false"/><paragraph role="heading" id="hd_id3153641" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/04090002.xhp" name="Cross-references">Cross-references</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_REF" id="bm_id3149042" localize="false"/>
+<paragraph role="heading" id="hd_id3153641" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/04090002.xhp" name="Cross-references">Cross-references</link></paragraph>
<paragraph role="paragraph" id="par_id3155142" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="reftext"><ahelp hid=".">This is where you insert the references or referenced fields into the current document. References are referenced fields within the same document or within sub-documents of a master document.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3159197" xml-lang="en-US" l10n="U" oldref="19">The advantage of entering a cross-reference as a field is that you do not have to adjust the references manually every time you change the document. Just update the fields with F9 and the references in the document are updated too.</paragraph>
@@ -55,188 +54,205 @@
<embed href="text/swriter/00/00000404.xhp#feldreferenzen"/>
</section>
<embed href="text/swriter/guide/references.xhp#references"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/><paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
+<paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_id4516129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the available field types. To add a field to your document, click a field type, click a field in the Selection list, and then click Insert.</ahelp> The following fields are available:</paragraph>
<table id="tbl_id3145784">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="3">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155862" xml-lang="en-US" l10n="U" oldref="5">Set Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="6">Set target for a referenced field. Under <emph>Name</emph>, enter a name for the reference. When inserting the reference, the name will then appear as an identification in the list box <emph>Selection</emph>.</paragraph>
<paragraph role="tablecontent" id="par_id3149556" xml-lang="en-US" l10n="U" oldref="7">In an HTML document, reference fields entered this way will be ignored. For the target in HTML documents, you have to <link href="text/swriter/01/04040000.xhp" name="insert a bookmark">insert a bookmark</link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150548" xml-lang="en-US" l10n="U" oldref="8">Insert Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147746" xml-lang="en-US" l10n="U" oldref="9">Inserting a reference to another position in the document. The corresponding text position has to be defined with "Set Reference" first. Otherwise, inserting a reference by choosing a field name under <emph>Selection</emph> is not possible.</paragraph>
<paragraph role="tablecontent" id="par_id3146344" xml-lang="en-US" l10n="U" oldref="16">In master documents, you can also reference from one sub-document to another. Note that the reference name will not appear in the selection field and has to be entered "by hand".</paragraph>
<paragraph role="tablecontent" id="par_id3149847" xml-lang="en-US" l10n="U" oldref="10">In an HTML document, reference fields entered this way will be ignored. For referenced fields in HTML documents, you have to <link href="text/shared/01/05020400.xhp" name="insert a hyperlink">insert a hyperlink</link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2408825" xml-lang="en-US" l10n="NEW">Headings</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id9988402" xml-lang="en-US" l10n="NEW">The Selection box shows a list of all headings in the order of their appearance in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6401257" xml-lang="en-US" l10n="NEW">Numbered Paragraphs</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5841242" xml-lang="en-US" l10n="NEW">The Selection box shows a list of all numbered headings and numbered paragraphs in the order of their appearance in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id306711" xml-lang="en-US" l10n="NEW">Bookmarks</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150907" xml-lang="en-US" l10n="U" oldref="11">After inserting a bookmark in the document with <emph>Insert - Bookmark</emph>, the bookmarks entry on the <emph>References</emph> tab becomes usable. Bookmarks are used to mark certain text passages in a document. In a text document, you can use the bookmarks, for example, to jump from one passage in the document to another.</paragraph>
<paragraph role="tablecontent" id="par_id3155080" xml-lang="en-US" l10n="U" oldref="12">In an HTML document, these bookmarks become anchors &lt;A name&gt;, which determine the target of hyperlinks for example.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
+<paragraph role="tablecontent" id="par_id0818200811011072" xml-lang="en-US" l10n="NEW">Footnotes</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id0818200811011049" xml-lang="en-US" l10n="NEW">If your documents contains a footnote, you can select the Footnotes entry. A reference to a footnote returns the footnote number.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="par_id6794030" xml-lang="en-US" l10n="NEW">(Inserted objects with captions)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7096774" xml-lang="en-US" l10n="NEW">You can set references to objects that have captions applied. For example, insert a picture, right-click the picture, choose Caption. Now the object shows up as a numbered "Illustration" in the list.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="tip" id="par_id3154772" xml-lang="en-US" l10n="U" oldref="18">References are fields. To remove a reference, delete the field. If you set a longer text as a reference and you do not want to reenter it after deleting the reference, select the text and copy it to the clipboard. You can then reinsert it as "unformatted text" at the same position using the command <emph>Edit - Paste special</emph>. The text remains intact while the reference is deleted.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/><paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/>
+<paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7374187" xml-lang="en-US" l10n="CHG"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, select a format in the "Insert reference to" list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id7729728" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
<section id="format">
<paragraph role="paragraph" id="par_id2171086" xml-lang="en-US" l10n="CHG">In the <emph>Insert reference to</emph> list, click the format that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/><paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
+<paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
<paragraph role="paragraph" id="par_id3148786" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT">Select the format that you want to use for the selected reference field.</ahelp> The following formats are available:</paragraph>
<table id="tbl_id3150090">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id7576525" xml-lang="en-US" l10n="NEW">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id641193" xml-lang="en-US" l10n="NEW">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150039" xml-lang="en-US" l10n="U" oldref="23">Page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153134" xml-lang="en-US" l10n="U" oldref="24">Inserts the number of the page containing the reference target.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150681" xml-lang="en-US" l10n="U" oldref="27">Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154040" xml-lang="en-US" l10n="U" oldref="28">Inserts the complete reference target text.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154040" xml-lang="en-US" l10n="CHG" oldref="28">Inserts the complete reference target text. For footnotes the footnote number is inserted.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="29">Above/Below</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149619" xml-lang="en-US" l10n="U" oldref="30">Inserts "above" or "below", depending on the location of the reference target relative to the position of the reference field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148705" xml-lang="en-US" l10n="U" oldref="31">As Page Style</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148728" xml-lang="en-US" l10n="U" oldref="32">Inserts the number of the page containing the reference target using the format specified in the page style.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5699942" xml-lang="en-US" l10n="NEW">Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6420484" xml-lang="en-US" l10n="NEW">Inserts the number of the heading or numbered paragraph, including superior levels depending on the context. See note below this table for more information.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6986602" xml-lang="en-US" l10n="NEW">Number (no context)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id616779" xml-lang="en-US" l10n="NEW">Inserts only the number of the heading or numbered paragraph.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id791039" xml-lang="en-US" l10n="NEW">Number (full context)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1953489" xml-lang="en-US" l10n="NEW">Inserts the number of the heading or numbered paragraph, including all superior levels.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154635" xml-lang="en-US" l10n="U" oldref="25">Chapter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149646" xml-lang="en-US" l10n="U" oldref="26">Inserts the number of the chapter containing the reference target.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155553" xml-lang="en-US" l10n="U" oldref="33">Category and Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="34">Inserts the category (caption type) and the number of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="35">Caption Text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145105" xml-lang="en-US" l10n="U" oldref="36">Inserts the caption label of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="37">Numbering</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="38">Inserts the caption number of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id757469" xml-lang="en-US" l10n="NEW">The "Number" format inserts the number of the heading or numbered paragraph. The superior levels are included depending on the context, as necessary. </paragraph>
<paragraph role="note" id="par_id5189062" xml-lang="en-US" l10n="CHG">For example, when you are in a chapter 1, subchapter 2, subpart 5, this may be numbered as 1.2.5. When you insert here a reference to text in the previous subpart "1.2.4" and you apply the "Number" format, then the reference will be shown as "4". If in this example the numbering is set to show more sublevels, the same reference will be shown as "2.4" or "1.2.4", depending on the setting. If you use the "Number (full context)" format, you will always see "1.2.4", no matter how the numbered paragraph is formatted.</paragraph>
</section>
<section id="name">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/><paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
+<paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
<paragraph role="paragraph" id="par_id3156259" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_FLD_REF:ED_REFNAME">Type the name of the user-defined field that you want to create.</ahelp> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="17">In a master document, targets that are in different sub-documents are not displayed in the<emph> Selection</emph> list. If you want to insert a reference to the target, you must type the path and the name in the <emph>Name </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/><embed href="text/swriter/01/04090001.xhp#wert"/>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802250745" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#wert"/>
<paragraph role="paragraph" id="par_id3159216" xml-lang="en-US" l10n="U" oldref="15">If you select text in the document, and then insert a reference, the selected text becomes the contents of the field that you insert.</paragraph><comment>Value box (always disabled)</comment>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id5684377" localize="false"/><paragraph role="paragraph" id="par_id6501968" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Edit the value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id5684377" localize="false"/>
+<paragraph role="paragraph" id="par_id6501968" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Edit the value.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 223501d55e..5a0fbc53ff 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090003.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104090003xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090003xml" indexer="include">
<title id="tit" xml-lang="en-US">Functions</title>
<filename>/text/swriter/01/04090003.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-09T13:24:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="funktionen">
@@ -52,85 +50,89 @@
<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="2">Depending on the field type that you select, you can assign conditions to certain functions. For example, you can define a field that executes a macro when you click the field in the document, or a condition that, when met, hides a field. You can also define placeholder fields that insert graphics, tables, frames and other objects into your document when needed.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
+<embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804352037" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3147403">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="3">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155623" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152999" xml-lang="en-US" l10n="U" oldref="5">Conditional text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149881" xml-lang="en-US" l10n="U" oldref="6">Inserts text if a certain <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> is met. For example, enter "sun eq 1" in the <emph>Condition</emph> box, and then the text that you want to insert when the variable "sun" equals "1" in the <emph>Then </emph>box. If you want, you can also enter the text that you want to display when this condition is not met in the <emph>Else</emph> box. To define the variable "sun", click the <link href="text/swriter/01/04090005.xhp" name="Variables"><emph>Variables</emph></link> tab, select "Set variable", type "sun" in the<emph> Name</emph> box, and its value in the<emph> Value</emph> box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153719" xml-lang="en-US" l10n="U" oldref="47">Input list</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147564" xml-lang="en-US" l10n="U" oldref="48">Inserts a text field that displays one item from a list. You can add, edit, and remove items, and change their order in the list. Click an <emph>Input list</emph> field in your document or press Ctrl+Shift+F9 to display the <link href="text/swriter/01/04090003.xhp" name="Choose Item"><emph>Choose Item</emph></link> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153146" xml-lang="en-US" l10n="U" oldref="7">Input field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="8">Inserts a text field that you can open by <link href="text/swriter/01/04090100.xhp" name="clicking">clicking</link> it in the document. You can then change the text that is displayed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154691" xml-lang="en-US" l10n="U" oldref="9">Execute macro</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10">Inserts a text field that runs a macro when you click the field in the document. To assign a macro to the field, click the <emph>Macro</emph> button. </paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152946" xml-lang="en-US" l10n="U" oldref="11">Placeholder</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="12">Inserts a placeholder field in the document, for example, for graphics. When you click a placeholder field in the document, you are prompted to insert the item that is missing.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154192" xml-lang="en-US" l10n="U" oldref="39">Combine characters </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159199" xml-lang="en-US" l10n="U" oldref="42">Combines up to 6 characters, so that they behave as a single character. This feature is only available when Asian fonts are supported.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804352213" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3151329" xml-lang="en-US" l10n="U" oldref="17">For function fields, the format field is only used for fields of the type placeholder. Here, the format determines the object for which the placeholder stands.</paragraph>
<section id="bedingung">
<paragraph role="heading" id="hd_id3149494" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp
index 8506f7d889..ef527495f2 100644
--- a/helpcontent2/source/text/swriter/01/04090004.xhp
+++ b/helpcontent2/source/text/swriter/01/04090004.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090004.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104090004xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090004xml" indexer="include">
<title id="tit" xml-lang="en-US">DocInformation</title>
<filename>/text/swriter/01/04090004.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T12:15:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="dokumentinfo">
@@ -51,104 +47,110 @@
<paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="2">DocInformation fields contain information about the properties of a document, such as the date a document was created. To view the properties of a document, choose <emph>File - Properties</emph>.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddokumentinfo"/>
+<embed href="text/swriter/00/00000404.xhp#felddokumentinfo"/>
</section>
<paragraph role="note" id="par_id3148982" xml-lang="en-US" l10n="U" oldref="3">When you export and import an HTML document containing DocInformation fields, <link href="text/swriter/01/04090007.xhp#dokumentinfo" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIELD_DINF_TYPE" id="bm_id3153639" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FIELD_DINF_TYPE" id="bm_id3153639" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290053" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3149039">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155140" xml-lang="en-US" l10n="U" oldref="4">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149176" xml-lang="en-US" l10n="U" oldref="5">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145774" xml-lang="en-US" l10n="U" oldref="6">Modified</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="7">Inserts the name of the author, and the date, or the time of the last save.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="8">Editing time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="9">Inserts the amount of time spent on editing a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Description</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comment as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145262" xml-lang="en-US" l10n="U" oldref="12">Document number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150556" xml-lang="en-US" l10n="U" oldref="13">Inserts the version number of the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146326" xml-lang="en-US" l10n="U" oldref="14">Created</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149833" xml-lang="en-US" l10n="U" oldref="15">Inserts the name of the author, and the date, or the time when the document was created.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="16">Info 0 - 3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154784" xml-lang="en-US" l10n="U" oldref="17">Inserts the contents of the info fields found on the <emph>User Defined </emph>tab of the <link href="text/shared/01/01100300.xhp" name="File - Properties"><emph>File - Properties</emph></link> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150177" xml-lang="en-US" l10n="U" oldref="18">Last printed</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156094" xml-lang="en-US" l10n="U" oldref="19">Inserts the name of the author, and the date or time that the document was last printed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156122" xml-lang="en-US" l10n="U" oldref="20">Keywords</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150912" xml-lang="en-US" l10n="U" oldref="21">Inserts the keywords as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154328" xml-lang="en-US" l10n="U" oldref="22">Subject</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="23">Inserts the subject as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150092" xml-lang="en-US" l10n="U" oldref="24">Title</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150033" xml-lang="en-US" l10n="U" oldref="25">Inserts the title as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/><embed href="text/swriter/01/04090001.xhp#auswahl"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290272" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#auswahl"/>
<paragraph role="note" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="26">For the "Created", "Modified", and "Last printed" field types, you can include the author, date, and time of the corresponding operation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290382" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<embed href="text/swriter/01/04090001.xhp#datumuhrzeitformat"/>
<section id="inhaltfix">
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090005.xhp b/helpcontent2/source/text/swriter/01/04090005.xhp
index 4b5e159a7c..b3fe90aa31 100644
--- a/helpcontent2/source/text/swriter/01/04090005.xhp
+++ b/helpcontent2/source/text/swriter/01/04090005.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090005.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090005xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090005xml" indexer="include">
<title id="tit" xml-lang="en-US">Variables</title>
<filename>/text/swriter/01/04090005.xhp</filename>
</topic>
@@ -46,105 +44,116 @@
<section id="variablen">
<bookmark xml-lang="en-US" branch="index" id="bm_id8526261"><bookmark_value>user-defined fields, restriction</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_VAR" id="bm_id3151266" localize="false"/><paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_VAR" id="bm_id3151266" localize="false"/>
+<paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></paragraph>
<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="2">Variable fields let you add dynamic content to your document. For example, you can use a variable to reset the page numbering.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
+<embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
</section>
<paragraph role="warning" id="par_id3149759" xml-lang="en-US" l10n="U" oldref="3">User-defined fields are only available in the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243625" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3145416">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150703" xml-lang="en-US" l10n="U" oldref="4">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="5">Description</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149803" xml-lang="en-US" l10n="U" oldref="6">Set Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150996" xml-lang="en-US" l10n="U" oldref="7">Defines a variable and its value. You can change the value of a variable by clicking in front of the variable field, and then choosing <emph>Edit - Field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8">Show Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="9">Inserts the current value of the variable that you click in the <emph>Selection </emph>list.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="10">DDE field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149684" xml-lang="en-US" l10n="U" oldref="11">Inserts a <link href="text/shared/00/00000005.xhp#dde" name="DDE">DDE</link> link into the document, that you can update as often as you want through the assigned name.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159196" xml-lang="en-US" l10n="U" oldref="12">Insert Formula</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="13">Inserts a fixed number, or the result of a formula.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14">Input field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="15">Inserts a new value for a variable or a User Field.</paragraph>
<paragraph role="tablecontent" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="37">The value of a variable in an Input field is only valid from where the field is inserted and onwards. To change the value of the variable later in the document, insert another Input field of the same name, but with a different value. However, the value of a User Field is changed globally.</paragraph>
<paragraph role="tablecontent" id="par_id3151255" xml-lang="en-US" l10n="U" oldref="38">The variables are displayed in the <emph>Selection</emph> field. When you click the <emph>Insert</emph> button, the dialog<link href="text/swriter/01/04090100.xhp" name="Input Field"><emph>Input Field</emph></link> appears, where you can enter the new value or additional text as a remark.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149034" xml-lang="en-US" l10n="U" oldref="16">Number range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152772" xml-lang="en-US" l10n="U" oldref="17">Inserts automatic numbering for tables, graphics, or text frames.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147073" xml-lang="en-US" l10n="U" oldref="18">Set page variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154389" xml-lang="en-US" l10n="U" oldref="19">Inserts a reference point in the document, after which the page count restarts. Select "on" to enable the reference point, and "off" to disable it. You can also enter an offset to start the page count at a different number.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156267" xml-lang="en-US" l10n="U" oldref="20">Show Page Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150588" xml-lang="en-US" l10n="U" oldref="21">Displays the number of pages from the "Set page variable" reference point to this field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="22">User Field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151377" xml-lang="en-US" l10n="U" oldref="23">Inserts a custom global variable. You can use the User Field to define a variable for a condition statement. When you change a User Field, all instances of the variable in the document are updated.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="25">For user-defined fields, click the format that you want to apply in the <emph>Format </emph>list, or click "Additional formats" to define a custom format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/><embed href="text/swriter/01/04090002.xhp#name"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/><embed href="text/swriter/01/04090001.xhp#wert"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/><paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/><paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Type the name of the user-defined field that you want to create.</ahelp></paragraph>
+<embed href="text/swriter/01/04090002.xhp#name"/>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243951" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#wert"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/>
+<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/>
+<paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7453535" xml-lang="en-US" l10n="NEW"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id3326822" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
@@ -155,35 +164,41 @@
<embed href="text/swriter/01/04090003.xhp#hinweis"/>
<embed href="text/swriter/01/04090001.xhp#korrektur"/>
<section id="unsichtbar">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/><paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
+<paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
<paragraph role="paragraph" id="par_id3156233" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE">Hides the field contents in the document.</ahelp> The field is inserted as a thin gray mark in the document. This option is only available for the "Set Variable" and "User Field" field types.</paragraph>
</section>
<paragraph role="heading" id="hd_id3146326" xml-lang="en-US" level="2" l10n="U" oldref="39">Chapter numbering</paragraph>
<paragraph role="paragraph" id="par_id3146340" xml-lang="en-US" l10n="U" oldref="40">Sets the options for resetting chapter numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/><paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
+<paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL">Choose the heading or chapter level at which to restart numbering in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/><paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
+<paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp></paragraph>
<section id="uebernehmen">
-<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_APPLY" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3147057" xml-lang="en-US" level="2" l10n="U" oldref="31">Apply</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_APPLY" id="bm_id3147069" localize="false"/>
+<paragraph role="heading" id="hd_id3147057" xml-lang="en-US" level="2" l10n="U" oldref="31">Apply</paragraph>
<paragraph role="paragraph" id="par_id3155562" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_FLDVAR_APPLY">Adds the user-defined field to the <emph>Selection</emph> list.</ahelp></paragraph>
<embed href="text/swriter/02/14040000.xhp#syuebernehmen"/>
</section>
<section id="loeschen">
-<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_DELETE" id="bm_id3151092" localize="false"/><paragraph role="heading" id="hd_id3151080" xml-lang="en-US" level="2" l10n="U" oldref="33">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_DELETE" id="bm_id3151092" localize="false"/>
+<paragraph role="heading" id="hd_id3151080" xml-lang="en-US" level="2" l10n="U" oldref="33">Delete</paragraph>
<paragraph role="paragraph" id="par_id3154769" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_FLDVAR_DELETE">Removes the user-defined field from the selection list. You can only remove fields that are not used in the current document.</ahelp> To remove a field that is used in the current document from the list, first delete all instances of the field in the document, and then remove it from the list.</paragraph>
<table id="tbl_id3154080">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="E">
-<image id="img_id3153293" src="svx/res/nu02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153293" xml-lang="en-US">Icon</alt>
+<image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="35">Delete</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090006.xhp b/helpcontent2/source/text/swriter/01/04090006.xhp
index 6a62a570e2..012cf7d292 100644
--- a/helpcontent2/source/text/swriter/01/04090006.xhp
+++ b/helpcontent2/source/text/swriter/01/04090006.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090006.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,96 +32,107 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090006xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090006xml" indexer="include">
<title id="tit" xml-lang="en-US">Database</title>
<filename>/text/swriter/01/04090006.xhp</filename>
</topic>
</meta>
<body>
<section id="datenbank">
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_DB" id="bm_id3151315" localize="false"/><paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_DB" id="bm_id3151315" localize="false"/>
+<paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="2">You can insert fields from any database, for example, address fields, into your document.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
+<embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
+<paragraph role="paragraph" id="par_id090220080439090" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3155894">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154196" xml-lang="en-US" l10n="U" oldref="3">Field type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="5">Any Record</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151257" xml-lang="en-US" l10n="U" oldref="6">Inserts the contents of the database field that you specify in the <emph>Record Number</emph> box as a mail merge field if the <link href="text/swriter/01/04090200.xhp" name="Condition"><emph>Condition</emph></link> that you enter is met. Only records selected by a multiple selection in the data source view are considered.</paragraph>
<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="7">You can use this field to insert several records into a document. Simply insert the <emph>Any Record</emph> field in front of the form letter fields that use a certain record.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="8">Database Name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="9">Inserts the name of the database table selected in the <emph>Database selection </emph>box. The "Database Name" field is a global field, that is, if you insert a different database name in your document, the contents of all previously inserted "Database Name" fields are updated.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="15">Mail merge field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="16">Inserts the name of a database field as a placeholder, so that you can create a mail merge document. The field content is automatically inserted when you print the form letter.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151372" xml-lang="en-US" l10n="U" oldref="12">Next record</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150114" xml-lang="en-US" l10n="U" oldref="13">Inserts the contents of the next mail merge field in your document, if the condition that you define is met. The records that you want to include must be selected in the data source view.</paragraph>
<paragraph role="tablecontent" id="par_id3155861" xml-lang="en-US" l10n="U" oldref="14">You can use the "Next record" field to insert the contents of consecutive records between the mail merge fields in a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="10">Record number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="11">Inserts the number of the selected database record.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/><paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/>
+<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
<paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_DB_SELECTION_TLB">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/><embed href="text/swriter/01/04090003.xhp#bedingung"/>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804391084" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For fields linked to a condition, enter the criteria here.</ahelp></paragraph>
+<embed href="text/swriter/01/04090003.xhp#bedingung"/>
<paragraph role="paragraph" id="par_id3147739" xml-lang="en-US" l10n="U" oldref="19">If you want, you can assign a condition that must be met before the contents of the "Any Record" and "Next Record" fields are inserted. The default condition is "True", that is, the condition is always true if you do not change the condition text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/><paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
+<paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
<paragraph role="note" id="par_id3153305" xml-lang="en-US" l10n="U" oldref="22">If you refer to fields in a different database (or in a different table or query within the same database), $[officename] determines the record number relative to the current selection.</paragraph>
<paragraph role="heading" id="hd_id3156109" xml-lang="en-US" level="2" l10n="U" oldref="23">Format</paragraph>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid=".">Select the format of the field that you want to insert. This option is available for numerical, boolean, date and time fields.</ahelp><comment>see #i64135</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/><paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
+<paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT">Uses the format defined in the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/><paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/>
+<paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="878711313">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/><paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
+<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
+<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT">Lists the available user-defined formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/><paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="2" l10n="NEW">Printing a form letter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
+<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="2" l10n="NEW">Printing a form letter</paragraph>
<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you print a document that contains database fields, a dialog asks you if you want to print a form letter. If you answer Yes, the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog opens where you can select the database records to print.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10812" xml-lang="en-US" level="3" l10n="NEW">Do not show warning again</paragraph>
<paragraph role="paragraph" id="par_idN10816" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Suppresses this dialog from now on. There is no easy way to get it back!</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04120212.xhp b/helpcontent2/source/text/swriter/01/04120212.xhp
index 9dc8b424e1..5133002add 100755
--- a/helpcontent2/source/text/swriter/01/04120212.xhp
+++ b/helpcontent2/source/text/swriter/01/04120212.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04120212.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,7 @@ DEDR: reviewed</lastedited>
<paragraph role="paragraph" id="par_id3153810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF" id="bm_id3151393" localize="false"/>
<paragraph role="heading" id="hd_id3147403" xml-lang="en-US" level="3" l10n="U" oldref="7">Combine identical entries with p or pp</paragraph>
-<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries that occur on the same page, or consecutive pages, with a single entry that lists the page number with a "p" or "pp" where the entry first occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 10" as "View 10p).</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries, which occur also on the directly following page or pages, with a single entry that lists the first page number and a "p" or "pp". For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 11" as "View 10p".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH" id="bm_id3149353" localize="false"/>
<paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="9">Combine with -</paragraph>
<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 93c369b62d..25bd7255e4 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04130100.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -48,10 +48,8 @@
<bookmark_value>resizing;objects and frames, by keyboard</bookmark_value>
</bookmark><comment>MW changed "objects;"</comment><paragraph role="heading" id="hd_id3154506" xml-lang="en-US" level="1" l10n="U" oldref="1">Resizing and Moving Frames, Objects With the Keyboard</paragraph>
<paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
-<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index f2cb09919a..33bba3a007 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04200000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,33 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104200000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104200000xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert Script</title>
<filename>/text/swriter/01/04200000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:56:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertScript" id="bm_id3146320" localize="false"/>
<paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Script</paragraph>
<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="2"><variable id="scripttext"><ahelp hid=".uno:InsertScript">Inserts a script at the current cursor position in an HTML or text document.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#einfscript"/>
+<embed href="text/swriter/00/00000404.xhp#einfscript"/>
</section>
<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="U" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - HTML Document</emph> - <link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Notes </emph>check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph role="paragraph" id="par_id3150572" xml-lang="en-US" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/><embed href="text/swriter/00/00000004.xhp#nopfli"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/><embed href="text/swriter/00/00000004.xhp#nopfre"/>
+<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802541668" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
+<embed href="text/swriter/00/00000004.xhp#nopfli"/>
+<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802541770" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
+<embed href="text/swriter/00/00000004.xhp#nopfre"/>
<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="6">To specify if the script is printed at the end of the page or at the end of the document, choose <emph>File - Print - Options</emph>, and select the appropriate check box.</paragraph>
<paragraph role="heading" id="hd_id3154644" xml-lang="en-US" level="2" l10n="U" oldref="7">Contents</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05030200.xhp b/helpcontent2/source/text/swriter/01/05030200.xhp
index 19068abaad..1b8a1c8037 100755
--- a/helpcontent2/source/text/swriter/01/05030200.xhp
+++ b/helpcontent2/source/text/swriter/01/05030200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030200.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0105030200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105030200xml" indexer="include">
<title id="tit" xml-lang="en-US">Text Flow</title>
<filename>/text/swriter/01/05030200.xhp</filename>
</topic>
@@ -46,50 +44,67 @@
<section id="textfluss">
<bookmark xml-lang="en-US" branch="index" id="bm_id2502212"><bookmark_value>text flow;at breaks</bookmark_value>
<bookmark_value>paragraphs;keeping together at breaks</bookmark_value>
+<bookmark_value>protecting;text flow</bookmark_value>
<bookmark_value>widows</bookmark_value>
<bookmark_value>orphans</bookmark_value>
+<bookmark_value>block protect, see also widows or orphans</bookmark_value>
</bookmark><comment>mw added two index entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_EXT" id="bm_id3147406" localize="false"/><paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_EXT" id="bm_id3147406" localize="false"/>
+<paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
<paragraph role="paragraph" id="par_id3145824" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_EXT">Specify hyphenation and pagination options.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#textfss"/>
+<embed href="text/swriter/00/00000405.xhp#textfss"/>
</section>
<paragraph role="heading" id="hd_id3149882" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="4">Specify the <link href="text/swriter/guide/using_hyphen.xhp" name="hyphenation">hyphenation</link> options for text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/><paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
+<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/><paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
+<paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/><paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
+<paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
<paragraph role="paragraph" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
+<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="43">Breaks</paragraph>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="44">Specify the page or column <link href="text/swriter/guide/page_break.xhp" name="break">break</link> options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
+<paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK">Select this check box, and then select the break type that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/><paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
+<paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE">Select the break type that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
+<paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION">Select where you want to insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
+<paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL">Select this check box, and then select the page style that you want to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/><paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
+<paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
<paragraph role="paragraph" id="par_id3154837" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL">Select the formatting style to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
+<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM">Enter the page number that you want to appear on the first page after the break. If you want to use the current page numbering, select "0".</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148978" xml-lang="en-US" level="2" l10n="U" oldref="13">Options</paragraph>
<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="14">Specify the text flow options for paragraphs that appear before and after a page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/><paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
+<paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
<paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER">Shifts the entire paragraph to the next page or column after a break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/><paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
+<paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
<paragraph role="paragraph" id="par_id3152779" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER">Keeps the current paragraph and the following paragraph together when a break or column break is inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
<paragraph role="paragraph" id="par_id3156279" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS">Specifies the minimum number of lines in a paragraph before a page break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the end of the page is less than the amount specified in the <emph>Lines </emph>box, the paragraph is shifted to the next page.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
+<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS">Specifies the minimum number of lines in a paragraph in the first page after the break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the top of the page is less than the amount specified in the <emph>Lines </emph>box, the position of the break is adjusted.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="45"><link href="text/shared/00/00000005.xhp#schuster" name="Orphans">Orphans</link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040500.xhp b/helpcontent2/source/text/swriter/01/05040500.xhp
index 3a42e51602..6a6ee02e7b 100644
--- a/helpcontent2/source/text/swriter/01/05040500.xhp
+++ b/helpcontent2/source/text/swriter/01/05040500.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040500.xhp,v $
- *
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textswriter0105040500xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105040500xml" indexer="include">
<title id="tit" xml-lang="en-US">Columns</title>
<filename>/text/swriter/01/05040500.xhp</filename>
</topic>
@@ -76,7 +74,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="E">
-<image id="img_id3149750" src="res/sc06301.png" width="0.222in" height="0.222in"><alt id="alt_id3149750" xml-lang="en-US">Icon</alt>
+<image id="img_id3149750" src="res/sc06301.png" width="0.564cm" height="0.564cm"><alt id="alt_id3149750" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -92,7 +90,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="E">
-<image id="img_id3152948" src="res/sc06300.png" width="0.222in" height="0.222in"><alt id="alt_id3152948" xml-lang="en-US">Icon</alt>
+<image id="img_id3152948" src="res/sc06300.png" width="0.564cm" height="0.564cm"><alt id="alt_id3152948" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -130,9 +128,7 @@
<paragraph role="heading" id="hd_id3151248" xml-lang="en-US" level="2" l10n="U" oldref="50">Apply to</paragraph>
<paragraph role="paragraph" id="par_id3154827" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO">Select the item that you want to apply the column layout to.</ahelp> This option is only available if you access this dialog by choosing <emph>Format - Columns</emph>.</paragraph>
<section id="textflow">
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FORMAT_TABLE_LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3149797" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/><embed href="text/shared/01/05030700.xhp#textflow"/>
+<embed href="text/shared/01/05030700.xhp#textflow"/>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05060200.xhp b/helpcontent2/source/text/swriter/01/05060200.xhp
index afdf86768c..7657c504ff 100644
--- a/helpcontent2/source/text/swriter/01/05060200.xhp
+++ b/helpcontent2/source/text/swriter/01/05060200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05060200.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,29 +32,26 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105060200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105060200xml" indexer="include">
<title id="tit" xml-lang="en-US">Wrap</title>
<filename>/text/swriter/01/05060200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-26T14:51:26">FPE: Fixed a missing heading</lastedited>
-</history>
</meta>
<body>
<section id="umlauf">
<bookmark xml-lang="en-US" branch="hid/HID_FRM_EXT" id="bm_id3153538" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_DRAW_WRAP_DLG" id="bm_id6339381" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:WrapMenu" id="bm_id0801200803335347" localize="false"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060200.xhp" name="Wrap">Wrap</link></paragraph>
<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object.
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#grafikumlauf"/>
+<embed href="text/swriter/00/00000405.xhp#grafikumlauf"/>
</section>
<paragraph role="tip" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="56">To wrap text around a table, place the table in a frame, and then wrap the text around the frame.</paragraph>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
@@ -66,12 +63,12 @@
</variable></paragraph>
<table id="tbl_id3152738">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149038" xml-lang="en-US" l10n="E">
-<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3149044" xml-lang="en-US">Icon</alt>
+<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155139" xml-lang="en-US" l10n="U" oldref="49">None</paragraph>
</tablecell>
</tablerow>
@@ -82,12 +79,12 @@
<paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT">Wraps text on the left side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3151031">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145774" xml-lang="en-US" l10n="E">
-<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3145780" xml-lang="en-US">Icon</alt>
+<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.82cm" height="0.82cm"><alt id="alt_id3145780" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="CHG" oldref="43">Before</paragraph>
</tablecell>
</tablerow>
@@ -98,12 +95,12 @@
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT">Wraps text on the right side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3147426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="E">
-<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3149567" xml-lang="en-US">Icon</alt>
+<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149567" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155966" xml-lang="en-US" l10n="CHG" oldref="44">After</paragraph>
</tablecell>
</tablerow>
@@ -111,17 +108,18 @@
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id3149224" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP" id="bm_id0801200803382855" localize="false"/>
<paragraph role="heading" id="hd_id3149213" xml-lang="en-US" level="3" l10n="U" oldref="21">Parallel</paragraph>
<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="22"><variable id="seitenumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL">Wraps text on all four sides of the border frame of the object.</ahelp>
</variable></paragraph>
<table id="tbl_id3146337">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148845" xml-lang="en-US" l10n="E">
-<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3148851" xml-lang="en-US">Icon</alt>
+<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.82cm" height="0.82cm"><alt id="alt_id3148851" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148442" xml-lang="en-US" l10n="U" oldref="45">Parallel</paragraph>
</tablecell>
</tablerow>
@@ -135,12 +133,12 @@
</variable></paragraph>
<table id="tbl_id3145320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150162" xml-lang="en-US" l10n="E">
-<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3150169" xml-lang="en-US">Icon</alt>
+<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150169" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156104" xml-lang="en-US" l10n="U" oldref="50">Through</paragraph>
</tablecell>
</tablerow>
@@ -154,12 +152,12 @@
</variable></paragraph>
<table id="tbl_id3156129">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150904" xml-lang="en-US" l10n="E">
-<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3150910" xml-lang="en-US">Icon</alt>
+<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150910" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="46">Optimal</paragraph>
</tablecell>
</tablerow>
@@ -177,7 +175,7 @@
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU_TRANSP" id="bm_id7503356" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id3150090" localize="false"/>
<paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3" l10n="U" oldref="30">In Background</paragraph>
-<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This options is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
+<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_CONTOUR" id="bm_id2682094" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index 97959a3efe..6f29d8bf06 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05060201.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -253,7 +253,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3154058" xml-lang="en-US" l10n="E">
-<image id="img_id3154073" src="res/sc05700.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
+<image id="img_id3154073" src="res/commandimagelist/sc_redo.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index 71062792cc..dbf511c3ae 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05090201.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,31 +51,31 @@
<paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2" l10n="U" oldref="3">Resizing Columns and Rows</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="4">To resize a column, place the cursor in a table cell, hold down Alt, and then press the left or the right arrow. To resize the column without changing the width of the table, hold down Alt+Ctrl, and then press the left or the right arrows.</paragraph>
+<paragraph role="listitem" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="4">To resize a column, place the cursor in a table cell, hold down Alt, and then press the left or the right arrow. To resize the column without changing the width of the table, hold down <switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>, and then press the left or the right arrows.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147566" xml-lang="en-US" l10n="U" oldref="5">To increase the left indent of the table, hold down Alt+Shift, and then press the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3147566" xml-lang="en-US" l10n="U" oldref="5">To increase the left indent of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150759" xml-lang="en-US" l10n="U" oldref="11">To resize a row, place the cursor in the row, hold down Alt, and then press the up or the down arrows.</paragraph>
+<paragraph role="listitem" id="par_id3150759" xml-lang="en-US" l10n="U" oldref="11">To resize a row, place the cursor in the row, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press the up or the down arrows.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="12">To move the table downwards on the page, hold down Alt+Shift, and then press the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="12">To move the table downwards on the page, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the down arrow.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="8">Inserting and deleting columns or rows</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="9">To insert a column, place the cursor in a table cell, hold down Alt and press Insert, release, and then press the left or the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="9">To insert a column, place the cursor in a table cell, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Insert, release, and then press the left or the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="13">To delete a column, place the cursor in the column that you want to delete, hold down Alt and press Delete, release, and then press the left or the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="13">To delete a column, place the cursor in the column that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the left or the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="14">To insert a row, place the cursor in a table cell, hold down Alt and press Insert, release, and then press the up or the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="14">To insert a row, place the cursor in a table cell, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Insert, release, and then press the up or the down arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down Alt and press Delete, release, and then press the up or the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05100000.xhp b/helpcontent2/source/text/swriter/01/05100000.xhp
index 3d261e4d11..93afce75b5 100755
--- a/helpcontent2/source/text/swriter/01/05100000.xhp
+++ b/helpcontent2/source/text/swriter/01/05100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05100000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -50,12 +50,10 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#zelle"/>
</section>
-<embed href="text/swriter/01/05100100.xhp#verbinden"/>
-<paragraph role="heading" id="hd_id3154278" xml-lang="en-US" level="2" l10n="CHG" oldref="4"><link href="text/swriter/01/05100200.xhp" name="Split">Split</link></paragraph>
-<embed href="text/swriter/01/05100200.xhp#teilentext"/>
-<embed href="text/swriter/01/05100500.xhp#oben"/>
-<embed href="text/swriter/01/05100600.xhp#mitte"/>
-<embed href="text/swriter/01/05100700.xhp#unten"/>
+<embed href="text/shared/01/05100100.xhp#verbinden"/>
+<embed href="text/shared/01/05100500.xhp#oben"/>
+<embed href="text/shared/01/05100600.xhp#mitte"/>
+<embed href="text/shared/01/05100700.xhp#unten"/>
<embed href="text/swriter/01/05100300.xhp#schuetzen"/>
<embed href="text/swriter/01/05100400.xhp#aufheben"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05100100.xhp b/helpcontent2/source/text/swriter/01/05100100.xhp
index 3b673efa61..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100100.xhp
+++ b/helpcontent2/source/text/swriter/01/05100100.xhp
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100100.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100100xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Merge</title>
-<filename>/text/swriter/01/05100100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="verbinden">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_CELLS" id="bm_id1766491" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:MergeCells" xml-lang="en-US" id="bm_id3149051"/><paragraph id="hd_id3154765" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100100.xhp" name="Merge">Merge</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147406" xml-lang="en-US" oldref="2"><variable id="verbindentext"><ahelp hid=".uno:MergeCells" visibility="visible">Combines the contents of the selected table cells into a single cell.</ahelp></variable></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verbindenze"/>
-</section>
- <paragraph role="warning" id="par_id3153718" l10n="U" xml-lang="en-US" oldref="3">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
-
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100200.xhp b/helpcontent2/source/text/swriter/01/05100200.xhp
index d15e3f04c0..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100200.xhp
+++ b/helpcontent2/source/text/swriter/01/05100200.xhp
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100200.xhp,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Split Cells</title>
-<filename>/text/swriter/01/05100200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T10:52:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="zellenteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_CELLS" id="bm_id3525727" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/><comment>UFI: removed double help ids</comment>
-<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph>
-<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="2"><variable id="teilentext"><ahelp hid=".uno:SplitCell">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp>
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#teilenz"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
-<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="3">Split cell into</paragraph>
-<paragraph role="paragraph" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_SPLIT:ED_COUNT">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2" l10n="U" oldref="5">Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ" id="bm_id3149028" localize="false"/>
-<paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="7">Horizontally</paragraph>
-<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_HORZ">Splits the selected cell(s) into the number of rows that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SPLIT_CB_PROP" id="bm_id3151185" localize="false"/>
-<paragraph role="heading" id="hd_id3147566" xml-lang="en-US" level="3" l10n="U" oldref="11">Into equal proportions</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_DLG_SPLIT_CB_PROP">Splits cells into rows of equal height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT" id="bm_id3151168" localize="false"/>
-<paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3" l10n="U" oldref="9">Vertically</paragraph>
-<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_VERT">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100500.xhp b/helpcontent2/source/text/swriter/01/05100500.xhp
index ef563f8e10..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100500.xhp
+++ b/helpcontent2/source/text/swriter/01/05100500.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100500.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100500xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Top</title>
-<filename>/text/swriter/01/05100500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="oben">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_NONE" id="bm_id5466554" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertTop" xml-lang="en-US" id="bm_id3149048"/><paragraph id="hd_id3154765" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100500.xhp" name="Top">Top</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3151390" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertTop" visibility="visible">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zelleoben"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100600.xhp b/helpcontent2/source/text/swriter/01/05100600.xhp
index 5eaf8078ca..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100600.xhp
+++ b/helpcontent2/source/text/swriter/01/05100600.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100600.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100600xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Middle</title>
-<filename>/text/swriter/01/05100600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="mitte">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_CENTER" id="bm_id4218858" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertCenter" xml-lang="en-US" id="bm_id3154766"/><paragraph id="hd_id3149874" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100600.xhp" name="Middle">Middle</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149048" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertCenter" visibility="visible">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zellemitte"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100700.xhp b/helpcontent2/source/text/swriter/01/05100700.xhp
index 82cdd52c8e..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100700.xhp
+++ b/helpcontent2/source/text/swriter/01/05100700.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100700.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100700xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Bottom</title>
-<filename>/text/swriter/01/05100700.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="unten">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_BOTTOM" id="bm_id3581992" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertBottom" xml-lang="en-US" id="bm_id3151244"/><paragraph id="hd_id3150249" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100700.xhp" name="Bottom">Bottom</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154764" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertBottom" visibility="visible">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zelleunten"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05110000.xhp b/helpcontent2/source/text/swriter/01/05110000.xhp
index 67aa669e1e..92c8b20c9a 100755
--- a/helpcontent2/source/text/swriter/01/05110000.xhp
+++ b/helpcontent2/source/text/swriter/01/05110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05110000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,7 @@
<embed href="text/swriter/01/05110100.xhp#hoehetext"/>
<paragraph role="heading" id="hd_id3149349" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
-<embed href="text/swriter/01/05110600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05110600m.xhp#gleichverteilen"/>
<embed href="text/swriter/01/05110300.xhp#selektieren"/>
<paragraph role="heading" id="hd_id3149883" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
diff --git a/helpcontent2/source/text/swriter/01/05110600.xhp b/helpcontent2/source/text/swriter/01/05110600.xhp
index b698c3823f..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05110600.xhp
+++ b/helpcontent2/source/text/swriter/01/05110600.xhp
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05110600.xhp,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105110600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Space Equally</title>
-<filename>/text/swriter/01/05110600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-28T11:27:10">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="gleichverteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_ROWS" id="bm_id2550261" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id3151240" localize="false"/>
-<paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05110600.xhp" name="Space Equally">Space Rows Equally</link></paragraph>
-<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeRows">Adjusts the height of the selected rows to match the height of the tallest row in the selection.</ahelp>
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verteilenzeile"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05120000.xhp b/helpcontent2/source/text/swriter/01/05120000.xhp
index 76053ab981..9851b6389c 100755
--- a/helpcontent2/source/text/swriter/01/05120000.xhp
+++ b/helpcontent2/source/text/swriter/01/05120000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05120000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,7 @@
<embed href="text/swriter/01/05120100.xhp#breitetext"/>
<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05120200.xhp" name="Optimal width">Optimal width</link></paragraph>
<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
-<embed href="text/swriter/01/05120600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05120600.xhp#gleichverteilen"/>
<embed href="text/swriter/01/05120300.xhp#selektieren"/>
<paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
diff --git a/helpcontent2/source/text/swriter/01/05120600.xhp b/helpcontent2/source/text/swriter/01/05120600.xhp
index c083684767..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05120600.xhp
+++ b/helpcontent2/source/text/swriter/01/05120600.xhp
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05120600.xhp,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105120600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Space Equally</title>
-<filename>/text/swriter/01/05120600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-28T11:27:56">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="gleichverteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_CELLS" id="bm_id2213069" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id3149055" localize="false"/>
-<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph>
-<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page.
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verteilenspalte"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05130100.xhp b/helpcontent2/source/text/swriter/01/05130100.xhp
index c9d863c898..7f1c31c770 100644
--- a/helpcontent2/source/text/swriter/01/05130100.xhp
+++ b/helpcontent2/source/text/swriter/01/05130100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05130100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105130100xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105130100xml" indexer="include">
<title id="tit" xml-lang="en-US">Condition</title>
<filename>/text/swriter/01/05130100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-22T13:17:40">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="bedingung">
@@ -51,7 +49,7 @@
<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2">Define conditions for conditional styles here.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#vorlagenbedingt"/>
+<embed href="text/swriter/00/00000405.xhp#vorlagenbedingt"/>
</section>
<paragraph role="paragraph" id="par_id3151391" xml-lang="en-US" l10n="CHG" oldref="10">Conditional styles are paragraph styles that have different properties depending on the context. Once defined, you cannot change the conditional properties of a conditional style.</paragraph>
<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="U" oldref="11">$[officename] applies the paragraph properties of conditional styles as follows (the bold terms correspond to the titles of dialog fields): If a paragraph formatted with a conditional style is in a <emph>Context</emph> that has an <emph>Applied Style</emph> linked to it, then the <emph>Paragraph Style</emph> from that condition is used. If no style is linked to the <emph>Context</emph>, then the attributes defined in the conditional style apply. The following example illustrates this relationship:</paragraph>
@@ -89,7 +87,7 @@
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
<paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
<paragraph role="paragraph" id="par_id3159195" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_CONDCOLL:LB_STYLE">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_FILTER" id="bm_id3155186" localize="false"/><embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
+<embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
<paragraph role="heading" id="hd_id3149306" xml-lang="en-US" level="2" l10n="U" oldref="8">Remove</paragraph>
<paragraph role="paragraph" id="par_id3151335" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE">Click here to remove the current context assigned to the selected style.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/makefile.mk b/helpcontent2/source/text/swriter/01/makefile.mk
index f1670c9c92..7232a42131 100644
--- a/helpcontent2/source/text/swriter/01/makefile.mk
+++ b/helpcontent2/source/text/swriter/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -152,26 +152,19 @@ XHPFILES = \
05090201.xhp \
05090300.xhp \
05100000.xhp \
- 05100100.xhp \
- 05100200.xhp \
05100300.xhp \
05100400.xhp \
- 05100500.xhp \
- 05100600.xhp \
- 05100700.xhp \
05110000.xhp \
05110100.xhp \
05110200.xhp \
05110300.xhp \
05110500.xhp \
- 05110600.xhp \
05120000.xhp \
05120100.xhp \
05120200.xhp \
05120300.xhp \
05120400.xhp \
05120500.xhp \
- 05120600.xhp \
05130000.xhp \
05130002.xhp \
05130004.xhp \