summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 16:36:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 16:36:05 +0000
commit0566fe1d60f5e764fea219e11683e8b0dbf498eb (patch)
treee123f871683b241d3446498f2c63674651ce3611
parenta0218ff4759f8197fd966af4d0396280f60b0695 (diff)
CWS-TOOLING: integrate CWS menuchanges
2009-01-07 17:12:18 +0100 mod r265974 : throw out comment tracking accellerator 2009-01-07 16:23:35 +0100 mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38) 2008-12-03 16:21:15 +0100 mod r264798 : menu shortcut fixes 2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes 2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794 2008-12-01 20:09:07 +0100 fredrikh r264633 : i96768 2008-12-01 20:08:37 +0100 fredrikh r264632 : i96768 2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762 2008-12-01 16:37:37 +0100 fredrikh r264618 : i96762 2008-12-01 16:37:09 +0100 fredrikh r264617 : i96762 2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650 2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758 2008-11-28 18:22:31 +0100 fredrikh r264568 : i94758 2008-11-28 12:46:26 +0100 fredrikh r264541 : i94758 2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625 2008-11-26 16:14:10 +0100 fredrikh r264412 : i96623 2008-11-26 16:13:02 +0100 fredrikh r264410 : i96623 2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359 2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556 2008-11-25 13:49:46 +0100 fredrikh r264306 : i96556 2008-11-25 13:48:32 +0100 fredrikh r264305 : i96556 2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556 2008-11-25 13:45:29 +0100 fredrikh r264303 : i96357 2008-11-25 13:42:11 +0100 fredrikh r264302 : i96556 & i94758 2008-11-25 13:34:54 +0100 fredrikh r264301 : i96556 2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556 2008-11-25 13:32:31 +0100 fredrikh r264299 : i96556 2008-11-25 13:31:57 +0100 fredrikh r264298 : i96556 2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556 2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556 2008-11-25 13:29:29 +0100 fredrikh r264294 : i96556 2008-11-25 13:28:17 +0100 fredrikh r264292 : i96556 2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556 2008-11-25 13:26:54 +0100 fredrikh r264288 : i96556 2008-11-25 13:25:03 +0100 fredrikh r264287 : i96556 2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556 2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359 2008-11-19 14:35:43 +0100 fredrikh r263995 : i96353 2008-11-19 14:05:58 +0100 fredrikh r263991 : i96347 2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347 2008-11-19 14:05:07 +0100 fredrikh r263989 : i96347 2008-11-19 13:11:59 +0100 fredrikh r263983 : i96347 2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347 2008-10-29 14:54:51 +0100 mod r262804 : 94633 2008-10-29 14:54:10 +0100 mod r262803 : #i94633# 2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd 2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd 2008-10-29 12:00:23 +0100 ufi r262777 : i94958 2008-10-28 23:45:34 +0100 mod r262766 : #i95457# 2008-10-18 19:09:38 +0200 mod r262295 : accelerator change 2008-10-17 15:45:11 +0200 mod r262289 : fix typo 2008-10-15 23:17:04 +0200 mod r262245 : menu fix 2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting dialog 2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu 2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes 2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes 2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351# 2008-10-02 10:31:52 +0200 mod r262026 : #i94551# 2008-10-02 10:23:57 +0200 mod r262025 : #i87347#
-rw-r--r--helpcontent2/source/text/scalc/01/02110000.xhp122
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/auto_off.xhp12
-rw-r--r--helpcontent2/source/text/scalc/guide/finding.xhp20
-rwxr-xr-xhelpcontent2/source/text/scalc/main0102.xhp22
-rwxr-xr-xhelpcontent2/source/text/scalc/main0103.xhp23
-rwxr-xr-xhelpcontent2/source/text/scalc/main0106.xhp25
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0102.xhp19
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0103.xhp19
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0106.xhp26
-rw-r--r--helpcontent2/source/text/shared/00/00000402.xhp75
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp31
-rw-r--r--helpcontent2/source/text/shared/00/00040500.xhp89
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp152
-rw-r--r--helpcontent2/source/text/shared/01/02230401.xhp69
-rw-r--r--helpcontent2/source/text/shared/01/06040000.xhp33
-rw-r--r--helpcontent2/source/text/shared/01/06040100.xhp95
-rw-r--r--helpcontent2/source/text/shared/01/06040200.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/06040400.xhp28
-rwxr-xr-xhelpcontent2/source/text/shared/01/06040500.xhp20
-rw-r--r--helpcontent2/source/text/shared/02/01220000.xhp74
-rw-r--r--helpcontent2/source/text/shared/02/03200000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp24
-rw-r--r--helpcontent2/source/text/shared/guide/line_intext.xhp59
-rwxr-xr-xhelpcontent2/source/text/shared/guide/lineend_define.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/guide/linestyle_define.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/protection.xhp223
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp14
-rwxr-xr-xhelpcontent2/source/text/simpress/main0102.xhp22
-rwxr-xr-xhelpcontent2/source/text/simpress/main0103.xhp18
-rwxr-xr-xhelpcontent2/source/text/simpress/main0106.xhp25
-rw-r--r--helpcontent2/source/text/swriter/00/00000404.xhp88
-rw-r--r--helpcontent2/source/text/swriter/00/00000405.xhp147
-rwxr-xr-xhelpcontent2/source/text/swriter/00/00000406.xhp32
-rw-r--r--helpcontent2/source/text/swriter/01/02110000.xhp122
-rw-r--r--helpcontent2/source/text/swriter/01/02150000.xhp42
-rw-r--r--helpcontent2/source/text/swriter/01/04030000.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/04130000.xhp30
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05150000.xhp35
-rw-r--r--helpcontent2/source/text/swriter/01/05150100.xhp35
-rw-r--r--helpcontent2/source/text/swriter/01/05150200.xhp37
-rw-r--r--helpcontent2/source/text/swriter/01/05150300.xhp33
-rw-r--r--helpcontent2/source/text/swriter/01/06080000.xhp42
-rw-r--r--helpcontent2/source/text/swriter/01/06090000.xhp22
-rw-r--r--helpcontent2/source/text/swriter/guide/auto_numbering.xhp85
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_off.xhp44
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_spellcheck.xhp28
-rw-r--r--helpcontent2/source/text/swriter/guide/autocorr_except.xhp23
-rw-r--r--helpcontent2/source/text/swriter/guide/footnote_usage.xhp47
-rw-r--r--helpcontent2/source/text/swriter/guide/nonprintable_text.xhp26
-rw-r--r--helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp28
-rw-r--r--helpcontent2/source/text/swriter/guide/smarttags.xhp27
-rw-r--r--helpcontent2/source/text/swriter/guide/text_centervert.xhp26
-rw-r--r--helpcontent2/source/text/swriter/guide/text_frame.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/word_completion.xhp27
-rwxr-xr-xhelpcontent2/source/text/swriter/main0102.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/main0103.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/main0104.xhp21
-rwxr-xr-xhelpcontent2/source/text/swriter/main0106.xhp25
59 files changed, 1334 insertions, 1222 deletions
diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp
index 632a406a23..828a6bccbc 100644
--- a/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/helpcontent2/source/text/scalc/01/02110000.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02110000.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0102110000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0102110000xml" indexer="include">
<title id="tit" xml-lang="en-US">Navigator</title>
<filename>/text/scalc/01/02110000.xhp</filename>
</topic>
@@ -50,131 +48,155 @@
<bookmark_value>scenarios;displaying names</bookmark_value>
</bookmark><comment>mw made "navigating..." a two level entry and deleted "navigating;data range"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_NAVIGATOR" id="bm_id8227797" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Navigator" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Navigator" id="bm_id3145171" localize="false"/>
+<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Navigator">Activates and deactivates the Navigator.</ahelp> The Navigator is a <link href="text/shared/00/00000005.xhp#andocken" name="dockable window">dockable window</link>.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#navigator"/>
+<embed href="text/shared/00/00000402.xhp#navigator"/>
</section>
<embed href="text/shared/guide/navigator.xhp#navigator"/>
-<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="CHG" oldref="40">Choose <emph>Edit - Navigator</emph> to display the Navigator.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_COL" id="bm_id3163713" localize="false"/><paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="2" l10n="U" oldref="4">Column</paragraph>
+<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="CHG" oldref="40">Choose <emph>View - Navigator</emph> to display the Navigator.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_COL" id="bm_id3163713" localize="false"/>
+<paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="2" l10n="U" oldref="4">Column</paragraph>
<paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="HID_SC_NAVIPI_COL">Enter the column letter. Press Enter to reposition the cell cursor to the specified column in the same row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ROW" id="bm_id3156286" localize="false"/><paragraph role="heading" id="hd_id3147126" xml-lang="en-US" level="2" l10n="U" oldref="6">Row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ROW" id="bm_id3156286" localize="false"/>
+<paragraph role="heading" id="hd_id3147126" xml-lang="en-US" level="2" l10n="U" oldref="6">Row</paragraph>
<paragraph role="paragraph" id="par_id3149958" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="HID_SC_NAVIPI_ROW">Enter a row number. Press Enter to reposition the cell cursor to the specified row in the same column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DATA" id="bm_id3149123" localize="false"/><paragraph role="heading" id="hd_id3150717" xml-lang="en-US" level="2" l10n="U" oldref="8">Data Range</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DATA" id="bm_id3149123" localize="false"/>
+<paragraph role="heading" id="hd_id3150717" xml-lang="en-US" level="2" l10n="U" oldref="8">Data Range</paragraph>
<paragraph role="paragraph" id="par_id3150752" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_SC_NAVIPI_DATA">Specifies the current data range denoted by the position of the cell cursor.</ahelp></paragraph>
<table id="tbl_id3154754">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="E">
-<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
+<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="9">Data Range</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_UP" id="bm_id3155111" localize="false"/><paragraph role="heading" id="hd_id3148488" xml-lang="en-US" level="2" l10n="U" oldref="14">Start</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_UP" id="bm_id3155111" localize="false"/>
+<paragraph role="heading" id="hd_id3148488" xml-lang="en-US" level="2" l10n="U" oldref="14">Start</paragraph>
<paragraph role="paragraph" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_SC_NAVIPI_UP">Moves to the cell at the beginning of the current data range, which you can highlight using the <emph>Data Range</emph> button.</ahelp></paragraph>
<table id="tbl_id3150306">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152994" xml-lang="en-US" l10n="E">
-<image id="img_id3150515" src="sw/imglst/sc20186.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150515" xml-lang="en-US">Icon</alt>
+<image id="img_id3150515" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154372" xml-lang="en-US" l10n="U" oldref="15">Start</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DOWN" id="bm_id3156449" localize="false"/><paragraph role="heading" id="hd_id3146982" xml-lang="en-US" level="2" l10n="U" oldref="17">End</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DOWN" id="bm_id3156449" localize="false"/>
+<paragraph role="heading" id="hd_id3146982" xml-lang="en-US" level="2" l10n="U" oldref="17">End</paragraph>
<paragraph role="paragraph" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_SC_NAVIPI_DOWN">Moves to the cell at the end of the current data range, which you can highlight using the <emph>Data Range</emph> button.</ahelp></paragraph>
<table id="tbl_id3152901">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="E">
-<image id="img_id3148871" src="sw/imglst/sc20175.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148871" xml-lang="en-US">Icon</alt>
+<image id="img_id3148871" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147072" xml-lang="en-US" l10n="U" oldref="18">End</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ROOT" id="bm_id3155269" localize="false"/><paragraph role="heading" id="hd_id3150107" xml-lang="en-US" level="2" l10n="U" oldref="20">Toggle</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ROOT" id="bm_id3155269" localize="false"/>
+<paragraph role="heading" id="hd_id3150107" xml-lang="en-US" level="2" l10n="U" oldref="20">Toggle</paragraph>
<paragraph role="paragraph" id="par_id3159098" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_SC_NAVIPI_ROOT">Toggles the content view. Only the selected Navigator element and its subelements are displayed.</ahelp> Click the icon again to restore all elements for viewing.</paragraph>
<table id="tbl_id3153973">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="E">
-<image id="img_id3149126" src="sw/imglst/sc20244.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149126" xml-lang="en-US">Icon</alt>
+<image id="img_id3149126" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="21">Toggle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ZOOM" id="bm_id3154654" localize="false"/><paragraph role="heading" id="hd_id3149381" xml-lang="en-US" level="2" l10n="U" oldref="11">Contents</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ZOOM" id="bm_id3154654" localize="false"/>
+<paragraph role="heading" id="hd_id3149381" xml-lang="en-US" level="2" l10n="U" oldref="11">Contents</paragraph>
<paragraph role="paragraph" id="par_id3150051" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SC_NAVIPI_ZOOM">Allows you to hide/show the contents.</ahelp></paragraph>
<table id="tbl_id3153811">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155597" xml-lang="en-US" l10n="E">
-<image id="img_id3154738" src="sw/imglst/sc20233.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154738" xml-lang="en-US">Icon</alt>
+<image id="img_id3154738" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150955" xml-lang="en-US" l10n="U" oldref="12">Contents</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_SCEN" id="bm_id3145115" localize="false"/><paragraph role="heading" id="hd_id3147244" xml-lang="en-US" level="2" l10n="U" oldref="23">Scenarios</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_SCEN" id="bm_id3145115" localize="false"/>
+<paragraph role="heading" id="hd_id3147244" xml-lang="en-US" level="2" l10n="U" oldref="23">Scenarios</paragraph>
<paragraph role="paragraph" id="par_id3153955" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_SC_NAVIPI_SCEN">Displays all available scenarios. Double-click a name to apply that scenario.</ahelp> The result is shown in the sheet. For more information, choose <link href="text/scalc/01/06050000.xhp" name="Tools - Scenarios"><emph>Tools - Scenarios</emph></link>.</paragraph>
<table id="tbl_id3147405">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148745" xml-lang="en-US" l10n="E">
-<image id="img_id3159256" src="sc/res/imglst/navipi/na07.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
+<image id="img_id3159256" src="sc/res/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3166466" xml-lang="en-US" l10n="U" oldref="24">Scenarios</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_idN10A6C" xml-lang="en-US" l10n="NEW">If the Navigator displays scenarios, you can access the following commands when you right-click a scenario entry:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_SCENARIO_DELETE" id="bm_id1900997" localize="false"/><paragraph role="heading" id="par_idN10A77" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_SCENARIO_DELETE" id="bm_id1900997" localize="false"/>
+<paragraph role="heading" id="par_idN10A77" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10A7B" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_SC_SCENARIO_DELETE">Deletes the selected scenario.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_SCENARIO_EDIT" id="bm_id4495376" localize="false"/><paragraph role="heading" id="par_idN10A92" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_SCENARIO_EDIT" id="bm_id4495376" localize="false"/>
+<paragraph role="heading" id="par_idN10A92" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
<paragraph role="paragraph" id="par_idN10A96" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_SC_SCENARIO_EDIT">Opens the <link href="text/scalc/01/06050000.xhp">Edit scenario</link> dialog, where you can edit the scenario properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DROP" id="bm_id3157871" localize="false"/><paragraph role="heading" id="hd_id3150037" xml-lang="en-US" level="2" l10n="U" oldref="26">Drag Mode</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DROP" id="bm_id3157871" localize="false"/>
+<paragraph role="heading" id="hd_id3150037" xml-lang="en-US" level="2" l10n="U" oldref="26">Drag Mode</paragraph>
<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SC_NAVIPI_DROP">Opens a submenu for selecting the drag mode. You decide which action is performed when dragging and dropping an object from the Navigator into a document. Depending on the mode you select, the icon indicates whether a hyperlink, link or a copy is created.</ahelp></paragraph>
<table id="tbl_id3153118">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="E">
-<image id="img_id3159119" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159119" xml-lang="en-US">Icon</alt>
+<image id="img_id3159119" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150656" xml-lang="en-US" l10n="U" oldref="27">Drag Mode</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_URL" id="bm_id3146876" localize="false"/><paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="3" l10n="U" oldref="29">Insert as Hyperlink</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_URL" id="bm_id3146876" localize="false"/>
+<paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="3" l10n="U" oldref="29">Insert as Hyperlink</paragraph>
<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_SC_DROPMODE_URL">Inserts a hyperlink when you drag-and-drop an object from the Navigator into a document.</ahelp> You can later click the created hyperlink to set the cursor and the view to the respective object. </paragraph>
<paragraph role="note" id="par_id3880733" xml-lang="en-US" l10n="NEW">If you insert a hyperlink that links to an open document, you need to save the document before you can use the hyperlink.<comment>UFI: fixes bugtraq 5009354</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_LINK" id="bm_id3150740" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="31">Insert as Link</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_LINK" id="bm_id3150740" localize="false"/>
+<paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="31">Insert as Link</paragraph>
<paragraph role="paragraph" id="par_id3150746" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_SC_DROPMODE_LINK">Creates a link when you drag-and-drop an object from the Navigator into a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_COPY" id="bm_id3154846" localize="false"/><paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="3" l10n="U" oldref="33">Insert as Copy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_DROPMODE_COPY" id="bm_id3154846" localize="false"/>
+<paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="3" l10n="U" oldref="33">Insert as Copy</paragraph>
<paragraph role="paragraph" id="par_id3147471" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_SC_DROPMODE_COPY">Generates a copy when you drag-and-drop an object from the Navigator into a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ENTRIES" id="bm_id3150695" localize="false"/><paragraph role="heading" id="hd_id3147423" xml-lang="en-US" level="2" l10n="U" oldref="38">Objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_ENTRIES" id="bm_id3150695" localize="false"/>
+<paragraph role="heading" id="hd_id3147423" xml-lang="en-US" level="2" l10n="U" oldref="38">Objects</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_SC_NAVIPI_ENTRIES">Displays all objects in your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DOC" id="bm_id3152785" localize="false"/><paragraph role="heading" id="hd_id3150860" xml-lang="en-US" level="2" l10n="U" oldref="35">Documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_NAVIPI_DOC" id="bm_id3152785" localize="false"/>
+<paragraph role="heading" id="hd_id3150860" xml-lang="en-US" level="2" l10n="U" oldref="35">Documents</paragraph>
<paragraph role="paragraph" id="par_id3153929" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_SC_NAVIPI_DOC">Displays the names of all open documents.</ahelp> To switch to another open document in the Navigator, click the document name. The status (active, inactive) of the document is shown in brackets after the name. You can switch the active document in the <emph>Window</emph> menu.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/auto_off.xhp b/helpcontent2/source/text/scalc/guide/auto_off.xhp
index 946c53516d..cb183bab62 100755
--- a/helpcontent2/source/text/scalc/guide/auto_off.xhp
+++ b/helpcontent2/source/text/scalc/guide/auto_off.xhp
@@ -10,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_off.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
@@ -72,14 +72,16 @@
<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="22">$[officename] Calc automatically converts certain entries to dates. For example, the entry <emph>1.1</emph> may be interpreted as January 1 of the current year, according to the locale settings of your operating system, and then displayed according to the date format applied to the cell.<comment>for sure 1.1 will not be interpreted as a date in the USofA !!</comment></paragraph>
<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="23">To ensure that an entry is interpreted as text, add an apostrophe at the beginning of the entry. The apostrophe is not displayed in the cell.</paragraph>
<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="2" l10n="U" oldref="7">Quotation marks replaced by custom quotes</paragraph>
-<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Tools - AutoCorrect</emph>. Go to the <emph>Custom Quotes</emph> tab and unmark <emph>Replace</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Tools - AutoCorrect Options</emph>. Go to the <emph>Custom Quotes</emph> tab and unmark <emph>Replace</emph>.</paragraph>
<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="11">Cell content always begins with uppercase</paragraph>
-<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>. Go to the <emph>Options</emph> tab. Unmark <emph>Capitalize first letter of every sentence</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>. Go to the <emph>Options</emph> tab. Unmark <emph>Capitalize first letter of every sentence</emph>.</paragraph>
<paragraph role="heading" id="hd_id3150345" xml-lang="en-US" level="2" l10n="U" oldref="15">Replace word with another word</paragraph>
-<paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Tools - AutoCorrect</emph>. Go to the <emph>Replace</emph> tab. Select the word pair and click <emph>Delete</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>. Go to the <emph>Replace</emph> tab. Select the word pair and click <emph>Delete</emph>.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="19"><link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput">Tools - Cell Contents - AutoInput</link></paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect">Tools - AutoCorrect</link></paragraph>
+<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect">Tools - AutoCorrect Options</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/finding.xhp b/helpcontent2/source/text/scalc/guide/finding.xhp
index ca65b40dc2..a9fead5784 100644
--- a/helpcontent2/source/text/scalc/guide/finding.xhp
+++ b/helpcontent2/source/text/scalc/guide/finding.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.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidefindingxhp" indexer="include" status="PUBLISH">
+<topic id="textscalcguidefindingxhp" indexer="include">
<title id="tit" xml-lang="en-US">Finding and Replacing in Calc</title>
<filename>text/scalc/guide/finding.xhp</filename>
</topic>
-<history>
-<created date="2006-02-17T11:12:54">Find Replace main page</created>
-<lastedited date="2006-06-13T13:55:04"/>
-</history>
</meta>
<body>
<section id="finding_text">
@@ -86,7 +82,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3808404" xml-lang="en-US" l10n="NEW">When you click <emph>Find</emph>, Calc will select the next cell that contains your text. You can watch and edit the text, then click <emph>Find</emph> again to advance to the next found cell. </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id2394482" xml-lang="en-US" l10n="NEW">If you closed the dialog, you can press a key combination (<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F) to find the next cell without opening the dialog. </paragraph>
</listitem>
@@ -96,9 +92,9 @@
</list>
<paragraph role="paragraph" id="par_id7811822" xml-lang="en-US" l10n="NEW">When you click <emph>Find All</emph>, Calc selects all cells that contain your entry. Now you can for example set all found cells to bold, or apply a Cell Style to all at once.</paragraph>
<paragraph role="heading" id="hd_id8531449" xml-lang="en-US" level="2" l10n="NEW">The Navigator</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_id9183935" xml-lang="en-US" l10n="NEW">Choose <emph>Edit - Navigator</emph> to open the Navigator window.</paragraph>
+<paragraph role="paragraph" id="par_id9183935" xml-lang="en-US" l10n="NEW">Choose <emph>View - Navigator</emph> to open the Navigator window.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id946684" xml-lang="en-US" l10n="NEW">The Navigator is the main tool for finding and selecting objects.</paragraph>
diff --git a/helpcontent2/source/text/scalc/main0102.xhp b/helpcontent2/source/text/scalc/main0102.xhp
index e896ff97ee..7664419655 100755
--- a/helpcontent2/source/text/scalc/main0102.xhp
+++ b/helpcontent2/source/text/scalc/main0102.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0102.xhp,v $
- * $Revision: 1.5 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcmain0102xml" indexer="include" status="PUBLISH">
+<topic id="textscalcmain0102xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit</title>
<filename>/text/scalc/main0102.xhp</filename>
</topic>
</meta>
<body>
<section id="bearbeiten">
-<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id1586962" localize="false"/><paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0102.xhp" name="Edit">Edit</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id1586962" localize="false"/>
+<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0102.xhp" name="Edit">Edit</link></paragraph>
<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for editing the contents of the current document.</ahelp></paragraph>
</section>
<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
@@ -61,7 +60,6 @@
<embed href="text/shared/01/02240000.xhp#dokver"/>
<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link></paragraph>
<embed href="text/shared/01/02100000.xhp#suchenersetzentext"/>
-<embed href="text/scalc/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/scalc/01/02120000.xhp" name="Headers &amp; Footers">Headers &amp; Footers</link></paragraph>
<embed href="text/scalc/01/02120000.xhp#kopfundfusszeilentext"/>
<embed href="text/scalc/01/02140000.xhp#ausfuellen"/>
diff --git a/helpcontent2/source/text/scalc/main0103.xhp b/helpcontent2/source/text/scalc/main0103.xhp
index ae04d503eb..4b80db4ea9 100755
--- a/helpcontent2/source/text/scalc/main0103.xhp
+++ b/helpcontent2/source/text/scalc/main0103.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.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0103.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
@@ -33,22 +32,23 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcmain0103xml" indexer="include" status="PUBLISH">
+<topic id="textscalcmain0103xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/scalc/main0103.xhp</filename>
</topic>
</meta>
<body>
<section id="ansicht">
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id5569933" localize="false"/><paragraph role="heading" id="hd_id3151112" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0103.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id5569933" localize="false"/>
+<paragraph role="heading" id="hd_id3151112" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0103.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for controlling the on-screen display of the document.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/FID_NORMALVIEWMODE" id="bm_id1480983" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NormalViewMode" id="bm_id3422345" localize="false"/><paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Normal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:NormalViewMode" id="bm_id3422345" localize="false"/>
+<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Normal</paragraph>
<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the normal view of the sheet.</ahelp></paragraph>
<embed href="text/scalc/01/03100000.xhp#seitenumbruchvorschau"/>
<embed href="text/scalc/01/03090000.xhp#rechenleiste"/>
@@ -57,6 +57,7 @@
<embed href="text/scalc/01/03070000.xhp#spaltenzeilenkoepfe"/>
<embed href="text/scalc/01/03080000.xhp#wertehervorheben"/>
<embed href="text/shared/01/04180100.xhp#datenanzeige"/>
+<embed href="text/scalc/01/02110000.xhp#navigator"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/scalc/main0106.xhp b/helpcontent2/source/text/scalc/main0106.xhp
index 8d20cd9d15..a798bfc5a2 100755
--- a/helpcontent2/source/text/scalc/main0106.xhp
+++ b/helpcontent2/source/text/scalc/main0106.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,26 +32,24 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcmain0106xml" indexer="include" status="PUBLISH">
+<topic id="textscalcmain0106xml" indexer="include">
<title id="tit" xml-lang="en-US">Tools</title>
<filename>/text/scalc/main0106.xhp</filename>
</topic>
</meta>
<body>
<section id="extras">
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id9563890" localize="false"/><paragraph role="heading" id="hd_id3150769" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0106.xhp" name="Tools">Tools</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id9563890" localize="false"/>
+<paragraph role="heading" id="hd_id3150769" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0106.xhp" name="Tools">Tools</link></paragraph>
<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">The <emph>Tools </emph>menu contains commands to check spelling, to trace sheet references, to find mistakes and to define scenarios.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="10">You can also create and assign macros and configure the look and feel of toolbars, menus, keyboard, and set the default options for $[officename] applications.</paragraph>
<embed href="text/shared/01/06990000.xhp#rechtschreibung"/>
<embed href="text/shared/01/06010500.xhp#language"/>
<embed href="text/scalc/01/06030000.xhp#detektiv"/>
-<paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
-<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/scalc/01/06040000.xhp" name="Goal Seek">Goal Seek</link></paragraph>
<embed href="text/scalc/01/06040000.xhp#zielwertsuchetext"/>
<embed href="text/scalc/01/solver.xhp#solverhead"/>
@@ -65,6 +62,8 @@
<embed href="text/shared/01/06130001.xhp#macro"/>
<embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
<embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect Options</link></paragraph>
+<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3150086" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
<embed href="text/shared/01/06140000.xhp#anpassen"/>
<embed href="text/shared/optionen/01000000.xhp#optionen"/>
diff --git a/helpcontent2/source/text/sdraw/main0102.xhp b/helpcontent2/source/text/sdraw/main0102.xhp
index df945dfc01..d259cf9f0b 100755
--- a/helpcontent2/source/text/sdraw/main0102.xhp
+++ b/helpcontent2/source/text/sdraw/main0102.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0102.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsdrawmain0102xml" indexer="include" status="PUBLISH">
+<topic id="textsdrawmain0102xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit</title>
<filename>/text/sdraw/main0102.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-06T16:47:12">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="bearbeiten">
@@ -59,7 +55,6 @@
<embed href="text/shared/01/02090000.xhp#auswaehlen"/>
<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link></paragraph>
<embed href="text/shared/01/02100000.xhp#suchenersetzentext"/>
-<embed href="text/simpress/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3153713" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
<paragraph role="paragraph" id="par_id3147340" xml-lang="en-US" l10n="U" oldref="14">Enables you to edit points on your drawing.</paragraph>
<paragraph role="heading" id="hd_id3149258" xml-lang="en-US" level="2" l10n="U" oldref="15"><link href="text/simpress/02/10030200.xhp" name="Glue points">Glue points</link></paragraph>
diff --git a/helpcontent2/source/text/sdraw/main0103.xhp b/helpcontent2/source/text/sdraw/main0103.xhp
index d6ad466b5e..cd13e52496 100755
--- a/helpcontent2/source/text/sdraw/main0103.xhp
+++ b/helpcontent2/source/text/sdraw/main0103.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.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsdrawmain0103xml" indexer="include" status="PUBLISH">
+<topic id="textsdrawmain0103xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/sdraw/main0103.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-08T10:57:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ansicht">
@@ -58,6 +56,7 @@
<embed href="text/simpress/01/03060000.xhp#lineale"/>
<embed href="text/shared/01/grid.xhp#grid"/>
<embed href="text/shared/01/guides.xhp#guides"/>
+<embed href="text/simpress/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
</body>
diff --git a/helpcontent2/source/text/sdraw/main0106.xhp b/helpcontent2/source/text/sdraw/main0106.xhp
index 13274a4cfa..9f2957e146 100755
--- a/helpcontent2/source/text/sdraw/main0106.xhp
+++ b/helpcontent2/source/text/sdraw/main0106.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* 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="textsdrawmain0106xml" indexer="include" status="PUBLISH">
+<topic id="textsdrawmain0106xml" indexer="include">
<title id="tit" xml-lang="en-US">Tools</title>
<filename>/text/sdraw/main0106.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T10:38:50">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="extras">
@@ -49,14 +47,14 @@
</section>
<embed href="text/shared/01/06990000.xhp#rechtschreibung"/>
<embed href="text/shared/01/06010500.xhp#language"/>
-<paragraph role="heading" id="hd_id3153415" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
-<embed href="text/shared/01/06040000.xhp#autoko"/>
<embed href="text/shared/01/gallery.xhp#stargallery"/>
<embed href="text/shared/01/06030000.xhp#pipette"/>
<embed href="text/shared/01/mediaplayer.xhp#mediaplayer"/>
<embed href="text/shared/01/06130001.xhp#macro"/>
<embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
<embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<paragraph role="heading" id="hd_id3153415" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect Options</link></paragraph>
+<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3150044" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
<embed href="text/shared/01/06140000.xhp#anpassen"/>
<embed href="text/shared/optionen/01000000.xhp#optionen"/>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index 96a06dd7c1..42fdf8dd94 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.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.
*
@@ -9,8 +10,13 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
+<<<<<<< .working
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
+=======
* $RCSfile: 00000402.xhp,v $
* $Revision: 1.5.4.1 $
+>>>>>>> .merge-right.r265757
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +35,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0000000402xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000402xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Edit Menu</title>
<filename>/text/shared/00/00000402.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-25T13:57:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3147273" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Menu</paragraph>
@@ -52,12 +55,12 @@
<section id="syrueckgaengig">
<table id="tbl_id3145226">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155577" xml-lang="en-US">Icon</alt>
+<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="4">Undo</paragraph>
</tablecell>
</tablerow>
@@ -72,12 +75,12 @@
<section id="sywiederholen">
<table id="tbl_id3154935">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="E">
-<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150358" xml-lang="en-US">Icon</alt>
+<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="7">Redo</paragraph>
</tablecell>
</tablerow>
@@ -95,12 +98,12 @@
<section id="syausschneiden">
<table id="tbl_id3154218">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145744" xml-lang="en-US">Icon</alt>
+<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="11">Cut</paragraph>
</tablecell>
</tablerow>
@@ -116,12 +119,12 @@
<section id="sykopieren">
<table id="tbl_id3147299">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="E">
-<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
+<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150685" xml-lang="en-US" l10n="U" oldref="14">Copy</paragraph>
</tablecell>
</tablerow>
@@ -137,12 +140,12 @@
<section id="syeinfuegen">
<table id="tbl_id3147217">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
+<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="17">Paste</paragraph>
</tablecell>
</tablerow>
@@ -159,12 +162,12 @@
<section id="syallesau">
<table id="tbl_id3145271">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="E">
-<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153095" xml-lang="en-US">Icon</alt>
+<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="U" oldref="575">Select All</paragraph>
</tablecell>
</tablerow>
@@ -184,7 +187,7 @@
</variable></paragraph>
<section id="rotlinieliste">
<paragraph role="paragraph" id="par_id3148587" xml-lang="en-US" l10n="U" oldref="559">Choose <emph>Edit - Changes - Accept or Reject - List</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="U" oldref="574">Choose <emph>Format - AutoFormat - Apply and Edit Changes.</emph> AutoFormat dialog appears, click <emph>Edit Changes</emph> button, see <emph>List</emph> tab page</paragraph>
+<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="U" oldref="574">Choose <emph>Format - AutoCorrect - Apply and Edit Changes.</emph> AutoCorrect dialog appears, click <emph>Edit Changes</emph> button, see <emph>List</emph> tab page</paragraph>
</section>
<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="560"><variable id="rotliniefilter">Choose <emph>Edit - Changes - Accept or Reject - Filter</emph> tab
</variable></paragraph>
@@ -206,12 +209,12 @@
<section id="sysuchenersetzen">
<table id="tbl_id3156320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150020" xml-lang="en-US" l10n="E">
-<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149121" xml-lang="en-US">Icon</alt>
+<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3144748" xml-lang="en-US" l10n="U" oldref="50">Find &amp; Replace</paragraph>
</tablecell>
</tablerow>
@@ -229,17 +232,17 @@
<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="CHG" oldref="573">On <emph>Form Design</emph> Bar, click <emph>Record Search</emph> - <emph>Similarity search</emph> check box - <emph>...</emph> button (form view)</paragraph>
</section>
<section id="navigator">
-<paragraph role="paragraph" id="par_id3152960" xml-lang="en-US" l10n="U" oldref="534">Choose <emph>Edit - Navigator</emph>
+<paragraph role="paragraph" id="par_id3152960" xml-lang="en-US" l10n="U" oldref="534">Choose <emph>View - Navigator</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3163824" xml-lang="en-US" l10n="U" oldref="535">On <emph>Standard</emph> Bar, click</paragraph>
<table id="tbl_id3155515">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159183" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
+<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147359" xml-lang="en-US" l10n="U" oldref="536">Navigator On/Off</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 1416163299..bd190df209 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -49,7 +49,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -75,8 +79,13 @@
<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
+<<<<<<< .working
+<tablecell>
+<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spellcheck</paragraph>
+=======
<tablecell>
<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph>
+>>>>>>> .merge-right.r265757
</tablecell>
</tablerow>
</table>
@@ -104,8 +113,12 @@
</section>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
</variable></paragraph>
+<<<<<<< .working
+<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press Alt+F11 (if not assigned by your system)
+=======
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
+>>>>>>> .merge-right.r265757
</variable></paragraph>
<section id="recordmacro">
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
@@ -138,22 +151,33 @@
<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph>
+<<<<<<< .working
+<emph> Options</emph>
+<emph>- Options</emph> tab
+=======
<emph>- Options</emph>tab
+>>>>>>> .merge-right.r265757
</variable></paragraph>
-<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose Tools - AutoCorrect- Smart Tags tab
+<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Replace</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Exceptions</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153094" xml-lang="en-US" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Custom Quotes</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect - Word Completion</emph> tab
+<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph> - Word Completion</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
@@ -310,7 +334,8 @@
<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - </emph>
<emph>Options - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress</emph>
+<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools </emph>
+<emph>- Options - %PRODUCTNAME Impress</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148418" xml-lang="en-US" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index 4ce02e5353..36585d1c46 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.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.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00040500.xhp,v $
- *
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -34,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000040500xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000040500xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Format Menu</title>
<filename>/text/shared/00/00040500.xhp</filename>
</topic>
@@ -54,16 +51,17 @@
<section id="syzeich">
<table id="tbl_id3150008">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148998" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
+<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="11">Character</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="schrift">
@@ -74,24 +72,30 @@
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Legend - Character</emph> tab (Chart documents)</paragraph>
<paragraph role="paragraph" id="par_id3153717" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Axis - Character</emph> tab (Chart documents)</paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
+<case select="CALC">
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
<paragraph role="paragraph" id="par_id3156306" xml-lang="en-US" l10n="U" oldref="199">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
-</switch></section>
+</switch>
+</section>
<section id="schrifteffekt">
<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Format - Character - Font Effects</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font Effects</emph> tab</paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<case select="CALC">
+<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
-</switch></section>
+</switch>
+</section>
<section id="position">
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="181">Choose <emph>Format - Character - Position</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="183">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Alignment</emph> tab</paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<case select="CALC">
+<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
-</switch></section>
+</switch>
+</section>
<section id="asilayout">
<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="186">Choose <emph>Format - Character - Asian Layout</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="CHG" oldref="188">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Layout</emph> tab</paragraph>
@@ -112,16 +116,17 @@
<section id="syabsatz">
<table id="tbl_id3150652">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155995" xml-lang="en-US" l10n="E">
-<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150495" xml-lang="en-US">Icon</alt>
+<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150495" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="CHG" oldref="31">Paragraph</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="absatzausrichtung">
@@ -141,7 +146,7 @@
<paragraph role="paragraph" id="par_idN109E2" xml-lang="en-US" l10n="NEW">(all options only in Writer or Calc)</paragraph>
<paragraph role="paragraph" id="par_id3156105" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="45">Choose <emph>Format - Picture - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Format - Frame - Borders</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="53">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
@@ -159,7 +164,7 @@
<paragraph role="paragraph" id="par_id3155853" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Character - Background</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="59">Choose <emph>Format - Picture - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Frame - Background</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Page - Background</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3159110" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
@@ -191,16 +196,17 @@
<paragraph role="paragraph" id="par_id3147321" xml-lang="en-US" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
<table id="tbl_id3163807">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148533" xml-lang="en-US" l10n="E">
-<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149568" xml-lang="en-US">Icon</alt>
+<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149568" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153534" xml-lang="en-US" l10n="CHG" oldref="86">Styles and Formatting</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="3d">
<paragraph role="paragraph" id="par_id3159313" xml-lang="en-US" l10n="CHG" oldref="88"><switchinline select="appl"><caseinline select="CHART">
@@ -211,18 +217,19 @@
<section id="sy3d">
<table id="tbl_id3150297">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3109845" xml-lang="en-US" l10n="E">
-<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159236" xml-lang="en-US">Icon</alt>
+<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159236" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152498" xml-lang="en-US" l10n="CHG" oldref="3">
<emph>3D Effects</emph>
</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="90"><variable id="3dgeometrie">Choose <emph>Format - 3D Effects - Geometry</emph> tab
@@ -242,16 +249,17 @@
<section id="synumauf">
<table id="tbl_id3152774">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149445" xml-lang="en-US" l10n="E">
-<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149964" xml-lang="en-US">Icon</alt>
+<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="163">Bullets On/Off</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="numoptionen">
@@ -295,20 +303,23 @@
<switch select="appl">
<case select="WRITER">
</case>
-<default><table id="tbl_id3154374">
+<default>
+<table id="tbl_id3154374">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149953" xml-lang="en-US" l10n="E">
-<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155092" xml-lang="en-US">Icon</alt>
+<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155092" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153695" xml-lang="en-US" l10n="U" oldref="209">Crop</paragraph>
</tablecell>
</tablerow>
</table>
+
</default>
-</switch></section>
+</switch>
+</section>
<section id="grossklein">
<paragraph role="paragraph" id="par_id3151254" xml-lang="en-US" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index 2dd9f43da2..7e0eff3118 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00040502.xhp,v $
- * $Revision: 1.17 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0000040502xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000040502xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Format Menu</title>
<filename>/text/shared/00/00040502.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-08T10:50:26">UFI: tried to fix #i22595#</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
@@ -54,12 +50,12 @@
<section id="sylinie">
<table id="tbl_id3145160">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148889" xml-lang="en-US" l10n="E">
-<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150669" xml-lang="en-US">Icon</alt>
+<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150669" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="4">Line</paragraph>
</tablecell>
</tablerow>
@@ -68,7 +64,7 @@
</section>
</section>
<section id="linie2">
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Line - Line</emph> tab</paragraph>
@@ -81,18 +77,18 @@
<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Format - Chart Floor - Borders</emph> tab (charts)</paragraph>
<paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Format - Chart Area - Borders</emph> tab (charts)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3151293" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3151293" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Line - Line Styles</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149317" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3149317" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Line - Arrow Styles</emph> tab
</variable></paragraph>
<section id="flaeche1">
-<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area</emph>
@@ -101,12 +97,12 @@
<section id="syflaeche">
<table id="tbl_id3145174">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="E">
-<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150868" xml-lang="en-US">Icon</alt>
+<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150868" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="19">Area</paragraph>
</tablecell>
</tablerow>
@@ -115,7 +111,7 @@
</section>
</section>
<section id="flaeche2">
-<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Area</emph> tab</paragraph>
@@ -128,7 +124,7 @@
<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="120">Choose <emph>Format - Page - Background</emph> tab (in $[officename] Impress and $[officename] Draw)</paragraph>
</section>
<section id="farben">
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Colors</emph> tab</paragraph>
@@ -149,45 +145,45 @@
<paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="152">Choose <emph>Format - Object Properties - Data Point - Transparency</emph> - tab (chart documents)</paragraph>
<paragraph role="paragraph" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="153">Choose <emph>Format - Object Properties - Data Series - Transparency</emph> tab (chart documents)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Shadow</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Gradients</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Hatching</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Area - Bitmaps</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
</caseinline><defaultinline>
<emph>Text</emph></defaultinline></switchinline>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152810" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
+<paragraph role="paragraph" id="par_id3152810" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
</caseinline><defaultinline>
<emph>Text</emph></defaultinline></switchinline>
<emph>- Text</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151060" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
+<paragraph role="paragraph" id="par_id3151060" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
</caseinline><defaultinline>
<emph>Text</emph></defaultinline></switchinline>
<emph>- Text Animation</emph> tab
</variable></paragraph>
<section id="position1">
-<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Position and Size</emph>
@@ -199,12 +195,12 @@
<section id="syposition">
<table id="Table1">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153052" xml-lang="en-US" l10n="E">
-<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150965" xml-lang="en-US">Icon</alt>
+<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150965" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149938" xml-lang="en-US" l10n="U" oldref="39">Position and Size<comment>UFI: in Form Design toolbar</comment></paragraph>
</tablecell>
</tablerow>
@@ -219,39 +215,39 @@
<paragraph role="paragraph" id="par_id411999" xml-lang="en-US" l10n="NEW">Open the context menu for the object - choose <emph>Description</emph>
</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3153099" xml-lang="en-US" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3153099" xml-lang="en-US" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Position and Size - Position and Size</emph> tab
</variable></paragraph>
<section id="drehung">
-<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Position and Size - Rotation</emph> tab</paragraph>
<table id="tbl_id3147496">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148495" xml-lang="en-US" l10n="E">
-<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146898" xml-lang="en-US">Icon</alt>
+<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146898" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146790" xml-lang="en-US" l10n="U" oldref="44">Rotate</paragraph>
</tablecell>
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
<emph>Position and Size - Slant &amp; Corner Radius</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146081" xml-lang="en-US" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
+<paragraph role="paragraph" id="par_id3146081" xml-lang="en-US" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline>
-<emph>Position and Size - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts)
+<emph>Position and Size - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts)
</variable></paragraph>
<section id="punkte">
<paragraph role="paragraph" id="par_id3083283" xml-lang="en-US" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
@@ -265,12 +261,12 @@
<section id="sypunktebearbeiten">
<table id="tbl_id3145618">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150044" xml-lang="en-US" l10n="E">
-<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147100" xml-lang="en-US">Icon</alt>
+<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147100" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="49">Edit Points</paragraph>
</tablecell>
</tablerow>
@@ -297,12 +293,12 @@
<section id="syfett">
<table id="tbl_id3147252">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145766" xml-lang="en-US" l10n="E">
-<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.222inch" height="0.222inch" localize="true"><alt id="alt_id3156558" xml-lang="en-US">Icon</alt>
+<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3156558" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="55">Bold</paragraph>
</tablecell>
</tablerow>
@@ -316,12 +312,12 @@
<section id="sykursiv">
<table id="tbl_id3144416">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159091" xml-lang="en-US" l10n="E">
-<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.222inch" height="0.222inch" localize="true"><alt id="alt_id3155578" xml-lang="en-US">Icon</alt>
+<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3155578" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150234" xml-lang="en-US" l10n="U" oldref="58">Italic</paragraph>
</tablecell>
</tablerow>
@@ -335,12 +331,12 @@
<section id="syunterstreichen">
<table id="tbl_id3148875">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145223" xml-lang="en-US" l10n="E">
-<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.222inch" height="0.222inch" localize="true"><alt id="alt_id3151068" xml-lang="en-US">Icon</alt>
+<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3151068" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154715" xml-lang="en-US" l10n="U" oldref="88">Underline</paragraph>
</tablecell>
</tablerow>
@@ -391,12 +387,12 @@
<section id="sylinksbuendig">
<table id="tbl_id3152453">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="E">
-<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155370" xml-lang="en-US">Icon</alt>
+<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155370" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="71">Align Left</paragraph>
</tablecell>
</tablerow>
@@ -411,12 +407,12 @@
<section id="syrechtsbuendig">
<table id="tbl_id3149949">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="E">
-<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154421" xml-lang="en-US">Icon</alt>
+<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154421" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153607" xml-lang="en-US" l10n="U" oldref="74">Align Right</paragraph>
</tablecell>
</tablerow>
@@ -431,12 +427,12 @@
<section id="syzentriert">
<table id="tbl_id3151270">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="E">
-<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149757" xml-lang="en-US">Icon</alt>
+<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149757" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153076" xml-lang="en-US" l10n="U" oldref="77"><switchinline select="appl"><caseinline select="CALC">Align Center Horizontally
</caseinline><defaultinline>Centered</defaultinline></switchinline></paragraph>
</tablecell>
@@ -452,12 +448,12 @@
<section id="syblocksatz">
<table id="tbl_id3154828">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156189" xml-lang="en-US" l10n="E">
-<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145308" xml-lang="en-US">Icon</alt>
+<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145308" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153131" xml-lang="en-US" l10n="U" oldref="80">Justified</paragraph>
</tablecell>
</tablerow>
@@ -480,12 +476,12 @@
<section id="sygruppieren">
<table id="tbl_id3143218">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146858" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
+<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149593" xml-lang="en-US" l10n="U" oldref="113">Group</paragraph>
</tablecell>
</tablerow>
@@ -501,12 +497,12 @@
<section id="sygrupaufh">
<table id="tbl_id3149971">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="E">
-<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150831" xml-lang="en-US">Icon</alt>
+<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150831" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="115">Ungroup</paragraph>
</tablecell>
</tablerow>
@@ -522,12 +518,12 @@
<section id="sygrupverl">
<table id="tbl_id3152538">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158402" xml-lang="en-US" l10n="E">
-<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149422" xml-lang="en-US">Icon</alt>
+<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149422" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155347" xml-lang="en-US" l10n="U" oldref="117">Exit Group</paragraph>
</tablecell>
</tablerow>
@@ -543,12 +539,12 @@
<section id="sygrupbetr">
<table id="tbl_id3149546">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152388" xml-lang="en-US" l10n="E">
-<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149900" xml-lang="en-US">Icon</alt>
+<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149900" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152547" xml-lang="en-US" l10n="U" oldref="119">Enter Group</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index 8f82e240ec..deed07c0a1 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.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.
*
@@ -29,17 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared0102230401xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102230401xml" indexer="include">
<title id="tit" xml-lang="en-US">List</title>
<filename>/text/shared/01/02230401.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-24T13:17:39">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="liste">
@@ -48,60 +47,56 @@
<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_REDLINING_VIEW_PAGE">Accept or reject individual changes.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#rotlinieliste"/>
+<embed href="text/shared/00/00000402.xhp#rotlinieliste"/>
</section>
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="26">The <emph>List </emph>tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the <emph>Filter </emph>tab, and then select your <link href="text/shared/01/02230402.xhp" name="filter criteria">filter criteria</link>.<switchinline select="appl">
-<caseinline select="WRITER"> If the list contains nested changes, the dependencies are shown regardless of the filter.
+<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="26">The <emph>List </emph>tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the <emph>Filter </emph>tab, and then select your <link href="text/shared/01/02230402.xhp" name="filter criteria">filter criteria</link>.<switchinline select="appl"><caseinline select="WRITER"> If the list contains nested changes, the dependencies are shown regardless of the filter.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
-<caseinline select="WRITER">Nested changes occur where changes made by different authors overlap.
+<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl"><caseinline select="WRITER">Nested changes occur where changes made by different authors overlap.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="appl">
-<caseinline select="CALC">Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell.
+<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="appl"><caseinline select="CALC">Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl">
-<caseinline select="CALC">If one of the nested changes for a cell matches a filter criterion, all of the changes for the cell are displayed. When you filter the change list, the entries in the list appear in different colors according to the following table:
+<paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="CALC">If one of the nested changes for a cell matches a filter criterion, all of the changes for the cell are displayed. When you filter the change list, the entries in the list appear in different colors according to the following table:
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
-<table id="tbl_id3154288" name="tbl_id3154288">
+<table id="tbl_id3154288">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="32">Color</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="33">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="34">black</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="35">The entry matches a filter criterion.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="U" oldref="36">blue</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="37">One or more subentries matches a filter criterion.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156156" xml-lang="en-US" l10n="U" oldref="38">gray</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149192" xml-lang="en-US" l10n="U" oldref="39">The subentry does not match a filter criterion.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="40">green</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="41">The subentry matches a filter criterion.</paragraph>
</tablecell>
</tablerow>
@@ -113,16 +108,13 @@
<paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection field</paragraph>
<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_REDLINING_VIEW_DG_VIEW">Lists the changes that were recorded in the document. When you select an entry in the list, the change is highlighted in the document. To sort the list, click a column heading. </ahelp> Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>while you click to select multiple entries in the list.</paragraph>
<paragraph role="tip" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="6">To edit the comment for an entry in the list, right-click the entry, and then choose<emph> Edit - Comment</emph>.</paragraph>
-
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="7">After you accept or reject a change, the entries of the list are re-ordered according to "Accepted" or "Rejected" status.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_ACTION" id="bm_id3153779" localize="false"/>
<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="3" l10n="U" oldref="8">Action</paragraph>
<paragraph role="paragraph" id="par_id3153361" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_SC_SORT_ACTION">Lists the changes that were made in the document.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl">
-<caseinline select="CALC">Position
+<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Position
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl">
-<caseinline select="CALC">Lists the cells with contents that were changed.
+<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC">Lists the cells with contents that were changed.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_AUTHOR" id="bm_id3149765" localize="false"/>
<paragraph role="heading" id="hd_id3148452" xml-lang="en-US" level="3" l10n="U" oldref="12">Author</paragraph>
@@ -148,15 +140,12 @@
<switch select="appl">
<case select="WRITER">
<paragraph role="note" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="28">To reverse the acceptance or rejection of a change, choose <emph>Undo </emph>on the <emph>Edit </emph>menu.</paragraph>
-
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_UNDO" id="bm_id3150334" localize="false"/>
-<paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="30"><switchinline select="appl">
-<caseinline select="WRITER">Undo
+<paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="WRITER">Undo
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl">
-<caseinline select="WRITER">If you made changes by choosing <emph>Format - AutoFormat - Apply and Edit Changes</emph>, the <emph>Undo </emph>button appears in the dialog.<ahelp hid="HID_REDLINING_VIEW_PB_UNDO"> Reverse the last Accept or Reject command.</ahelp>
+<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="WRITER">If you made changes by choosing <emph>Format - AutoCorrect - Apply and Edit Changes</emph>, the <emph>Undo </emph>button appears in the dialog.<ahelp hid="HID_REDLINING_VIEW_PB_UNDO"> Reverse the last Accept or Reject command.</ahelp>
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_EDIT_COMMENT" id="bm_id3152416" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp
index 0350c7d079..24853ba211 100644
--- a/helpcontent2/source/text/shared/01/06040000.xhp
+++ b/helpcontent2/source/text/shared/01/06040000.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106040000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040000xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoCorrect</title>
<filename>/text/shared/01/06040000.xhp</filename>
</topic>
@@ -47,11 +45,12 @@
<bookmark_value>AutoFormat function; switching on and off</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AUTO_CORRECT_DLG" id="bm_id1521736" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/>
+<paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokorr"/>
+<embed href="text/shared/00/00000406.xhp#autokorr"/>
</section>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
@@ -62,7 +61,7 @@
</case>
</switch>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoFormat - While Typing</emph>. To apply the AutoFormat settings to an entire text document, choose <emph>Format - AutoFormat - Apply</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
<embed href="text/shared/01/06040200.xhp#ersetzung"/>
<embed href="text/shared/01/06040300.xhp#ausnahmen"/>
<embed href="text/shared/01/06040100.xhp#optionen"/>
@@ -74,9 +73,11 @@
</switch>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
<switch select="appl">
-<case select="WRITER"><section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoFormat</link></paragraph>
+<case select="WRITER">
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
</section>
</case>
-</switch></body>
+</switch>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp
index f43d6e7f57..00059a9cc2 100644
--- a/helpcontent2/source/text/shared/01/06040100.xhp
+++ b/helpcontent2/source/text/shared/01/06040100.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040100.xhp,v $
- * $Revision: 1.21 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106040100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040100xml" indexer="include">
<title id="tit" xml-lang="en-US">Options</title>
<filename>/text/shared/01/06040100.xhp</filename>
</topic>
@@ -71,14 +69,16 @@
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_CLB" id="bm_id3148765" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_OPTIONS" id="bm_id3147527" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFMT_OPTIONS" id="bm_id3149962" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFORMAT_CLB" id="bm_id3150999" localize="false"/><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFORMAT_CLB" id="bm_id3150999" localize="false"/>
+<paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
<switch select="appl">
-<case select="WRITER"><paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoFormat - Apply</emph>.</paragraph>
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
<paragraph role="note" id="par_id7547227" xml-lang="en-US" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
</case>
</switch>
@@ -89,7 +89,8 @@
<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="note" id="par_id5240028" xml-lang="en-US" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
+<case select="CALC">
+<paragraph role="note" id="par_id5240028" xml-lang="en-US" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="24">Automatic *bold* and _underline_</paragraph>
@@ -101,66 +102,68 @@
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
<paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="25">Replace 1st ... with 1^st ...</paragraph>
<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
-<paragraph role="heading" id="hd_id3148473" xml-lang="en-US" level="3" l10n="U" oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment><paragraph role="paragraph" id="par_id3144439" xml-lang="en-US" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
+<paragraph role="heading" id="hd_id3148473" xml-lang="en-US" level="3" l10n="U" oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
+<paragraph role="paragraph" id="par_id3144439" xml-lang="en-US" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
<paragraph role="paragraph" id="par_id87282" xml-lang="en-US" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
<table id="tbl_id2444227">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3408612" xml-lang="en-US" l10n="NEW">Text that you type:</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id4362010" xml-lang="en-US" l10n="NEW">Result that you get:</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1432844" xml-lang="en-US" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7553941" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1421246" xml-lang="en-US" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2305673" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id8703573" xml-lang="en-US" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6049684" xml-lang="en-US" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2219916" xml-lang="en-US" l10n="NEW">A-B (A, minus, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1868037" xml-lang="en-US" l10n="NEW">A-B (unchanged)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id714438" xml-lang="en-US" l10n="NEW">A -B (A, space, minus, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3924985" xml-lang="en-US" l10n="NEW">A -B (unchanged)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1486861" xml-lang="en-US" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id844141" xml-lang="en-US" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id1416974" xml-lang="en-US" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
<paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="3" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
</caseinline></switchinline></paragraph>
@@ -179,60 +182,62 @@
<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<case select="WRITER">
+<paragraph role="tip" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
</case>
</switch>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="35">Apply border</paragraph>
+<case select="WRITER">
+<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="35">Apply border</paragraph>
<paragraph role="paragraph" id="par_id3144445" xml-lang="en-US" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
<paragraph role="paragraph" id="par_idN10C2E" xml-lang="en-US" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
<paragraph role="paragraph" id="par_idN10C35" xml-lang="en-US" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
<table id="tbl_id3149985">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="37">---</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154690" xml-lang="en-US" l10n="U" oldref="38">0.5pt single underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">___</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="40">1.0pt single underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147580" xml-lang="en-US" l10n="U" oldref="41">===</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="42">1.1pt double underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="43">***</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="44">4.5pt double underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="45">~~~</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="46">6.0pt double underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="47">###</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="48">9.0pt double underline</paragraph>
</tablecell>
</tablerow>
@@ -252,7 +257,8 @@
<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="3" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
-</caseinline></switchinline></paragraph><comment>UFI: test if this also only applies to Default, body and body indented, or to all para styles</comment><paragraph role="paragraph" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoFormat - Apply</emph>.
+</caseinline></switchinline></paragraph><comment>UFI: test if this also only applies to Default, body and body indented, or to all para styles</comment>
+<paragraph role="paragraph" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3152375" xml-lang="en-US" level="3" l10n="U" oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
</caseinline></switchinline></paragraph>
@@ -271,7 +277,8 @@
<paragraph role="paragraph" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id3156334" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/><paragraph role="heading" id="hd_id3144749" xml-lang="en-US" level="2" l10n="U" oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/>
+<paragraph role="heading" id="hd_id3144749" xml-lang="en-US" level="2" l10n="U" oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153841" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
</caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp
index 6a052cc546..c69588c9e2 100644
--- a/helpcontent2/source/text/shared/01/06040200.xhp
+++ b/helpcontent2/source/text/shared/01/06040200.xhp
@@ -54,7 +54,7 @@
<paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040200.xhp" name="Replace">Replace</link></paragraph>
<paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOCORR_REPLACE">Edits the replacement table for automatically correcting or replacing words or abbreviations in your document.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">To enable the replacement table, choose <emph>Tools - AutoCorrect</emph>, click the<emph> Options</emph> tab, and then select<emph> Use replacement table</emph>. To use the replacement table while you type, choose <emph>Format - AutoFormat - While Typing</emph>.
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">To enable the replacement table, choose <emph>Tools - AutoCorrect Options</emph>, click the<emph> Options</emph> tab, and then select<emph> Use replacement table</emph>. To use the replacement table while you type, choose <emph>Format - AutoCorrect - While Typing</emph>.
</caseinline></switchinline></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokoersetzung"/>
diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp
index 08001e4c09..33db44e9c7 100755
--- a/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/helpcontent2/source/text/shared/01/06040400.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040400.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* 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="textshared0106040400xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040400xml" indexer="include">
<title id="tit" xml-lang="en-US">Custom Quotes</title>
<filename>/text/shared/01/06040400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-04T15:26:50">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="typanf">
@@ -52,7 +50,7 @@
<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks in your document.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
+<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
<paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="17">Single quotes / Double quotes</paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="18">Specify the replacement characters to use for single or double quotation marks.</paragraph>
@@ -67,13 +65,13 @@
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STARTQUOTE" id="bm_id6259651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_STARTQUOTE" id="bm_id7007354" localize="false"/>
<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="3" l10n="U" oldref="11">Start quote</paragraph>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current opening quotation mark in your document when you choose <emph>Format - AutoFormat - Apply</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current opening quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE" id="bm_id3147576" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE" id="bm_id3155942" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_ENDQUOTE" id="bm_id6449476" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_ENDQUOTE" id="bm_id6838282" localize="false"/>
<paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="3" l10n="U" oldref="13">End quote</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current closing quotation mark in your document when you choose <emph>Format - AutoFormat - Apply</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current closing quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD" id="bm_id3157863" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD" id="bm_id3153682" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STD" id="bm_id4603106" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06040500.xhp b/helpcontent2/source/text/shared/01/06040500.xhp
index fee830584e..4f94b681ce 100755
--- a/helpcontent2/source/text/shared/01/06040500.xhp
+++ b/helpcontent2/source/text/shared/01/06040500.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040500.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106040500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040500xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoCorrect context menu</title>
<filename>/text/shared/01/06040500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-05T10:54:11">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152823"><bookmark_value>AutoCorrect function; context menu</bookmark_value>
@@ -68,7 +64,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_EDITENG_SPELLER_AUTOCORRECT" id="bm_id3145345" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_LINGU_AUTOCORR" id="bm_id3145313" localize="false"/>
<paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2" l10n="U" oldref="12">AutoCorrect</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_LINGU_AUTOCORR">To always replace the highlighted word, click a word in the list. The word pair is stored in the replacement table under Tools - AutoCorrect - Replace.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_LINGU_AUTOCORR">To always replace the highlighted word, click a word in the list. The word pair is stored in the replacement table under Tools - AutoCorrect Options - Replace.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LINGU_WORD_LANGUAGE" id="bm_id3149398" localize="false"/>
<paragraph role="heading" id="hd_id3146797" xml-lang="en-US" level="2" l10n="U" oldref="15">Word is &lt;name of language&gt;</paragraph>
<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_LINGU_WORD_LANGUAGE">Changes the language settings for the highlighted word, if the word is found in another dictionary.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/01220000.xhp b/helpcontent2/source/text/shared/02/01220000.xhp
index 97fa279e40..c7378a509d 100644
--- a/helpcontent2/source/text/shared/02/01220000.xhp
+++ b/helpcontent2/source/text/shared/02/01220000.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01220000.xhp,v $
- * $Revision: 1.4 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,41 +30,40 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared0201220000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Navigator</title>
+<topic id="textshared0201220000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Navigator</title>
<filename>/text/shared/02/01220000.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="navigator">
- <paragraph id="hd_id3155934" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/01220000.xhp" name="Navigator">Navigator</link></paragraph>
- <paragraph xml-lang="en-US" oldref="2" role="paragraph" id="par_id3148983" l10n="U">Click the<emph> Navigator On/Off </emph>icon to hide or show the <emph>Navigator</emph>.</paragraph>
- </section>
- <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3152594" oldref="4">You can also call the <emph>Navigator</emph> by selecting <switchinline select="appl"> <caseinline select="WRITER"><link href="text/swriter/01/02110000.xhp" name="Edit - Navigator">Edit - Navigator</link></caseinline> <caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Edit - Navigator">Edit - Navigator</link></caseinline> <caseinline select="DRAW"><link href="text/simpress/01/02110000.xhp" name="Edit - Navigator">Edit - Navigator</link></caseinline> <caseinline select="IMPRESS"><link href="text/simpress/01/02110000.xhp" name="Edit - Navigator">Edit - Navigator</link></caseinline> <defaultinline>Edit - Navigator</defaultinline> </switchinline></paragraph>
- <section id="synavigator">
- <table id="tbl_id3156136">
-
-
-
- <tablerow>
- <tablecell>
- <paragraph l10n="E" role="paragraph" id="par_id3153345" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_navigator.png" id="img_id3149095"><alt xml-lang="en-US" id="alt_id3149095">Icon</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph role="paragraph" id="par_id3155536" l10n="U" xml-lang="en-US" oldref="3">Navigator On/Off</paragraph>
- </tablecell>
- </tablerow>
-
- </table>
- </section>
-
- </body>
+<section id="navigator">
+<paragraph role="heading" id="hd_id3155934" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01220000.xhp" name="Navigator">Navigator</link></paragraph>
+<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="U" oldref="2">Click the<emph> Navigator On/Off </emph>icon to hide or show the <emph>Navigator</emph>.</paragraph>
+</section>
+<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="U" oldref="4">You can also call the <emph>Navigator</emph> by selecting <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/02110000.xhp" name="Edit - Navigator">View - Navigator</link>
+</caseinline><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Edit - Navigator">View - Navigator</link>
+</caseinline><caseinline select="DRAW"><link href="text/simpress/01/02110000.xhp" name="Edit - Navigator">View - Navigator</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/simpress/01/02110000.xhp" name="Edit - Navigator">View - Navigator</link>
+</caseinline><defaultinline>View - Navigator</defaultinline></switchinline></paragraph>
+<section id="synavigator">
+<table id="tbl_id3156136">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="E">
+<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3155536" xml-lang="en-US" l10n="U" oldref="3">Navigator On/Off</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp
index 5c87ff4b70..14d1ac51d0 100644
--- a/helpcontent2/source/text/shared/02/03200000.xhp
+++ b/helpcontent2/source/text/shared/02/03200000.xhp
@@ -49,11 +49,8 @@
<paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03200000.xhp" name="Change Anchor">Change Anchor</link></paragraph>
</section>
<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verankerungtext"><ahelp hid=".uno:ToggleAnchorType">Allows you to switch between anchoring options.</ahelp>
-</variable> The<emph> Change Anchor </emph>icon is only visible when an object such as a graphic, control field<switchinline select="appl"><caseinline select="WRITER"> or frame
+</variable> The<emph> Change Anchor </emph>icon is only visible when an object such as a graphic or control field<switchinline select="appl"><caseinline select="WRITER"> or frame
</caseinline></switchinline> is selected. </paragraph>
-<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="appl"><caseinline select="CALC">
-</caseinline><caseinline select="WRITER">You can anchor an object to the page, to a paragraph, or as a character. If the object is surrounded by a frame, it is possible to anchor it to the frame.
-</caseinline><defaultinline>You can anchor an object to the page, to a paragraph or as a character. </defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="3">Further information about the anchoring is contained in the <link href="text/shared/01/05260000.xhp" name="Anchoring"><emph>Anchoring</emph></link> Help section.</paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/00/00040501.xhp#syverankerung"/>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 8bbd2ce403..851d823829 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.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.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideautocorr_urlxml" indexer="include">
<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
<filename>/text/shared/guide/autocorr_url.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-21T12:50:32">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
@@ -58,7 +54,7 @@
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
</listitem>
@@ -73,7 +69,7 @@
<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 5bfa517ce1..001bd5d320 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: line_intext.xhp,v $
- * $Revision: 1.13 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideline_intextxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideline_intextxml" indexer="include">
<title id="tit" xml-lang="en-US">Drawing Lines in Text</title>
<filename>/text/shared/guide/line_intext.xhp</filename>
</topic>
@@ -57,54 +55,57 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="39">To define the line attributes and direction, use the <emph>Line</emph> drawing object as follows:</paragraph>
<table id="tbl_id3153031">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.222inch" height="0.222inch"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="66">1.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="CHG" oldref="41">On the Standard bar, click the <emph>Show Draw Functions </emph>icon to open the <emph>Drawing </emph>toolbar, and click the <emph>Line</emph> icon. The mouse pointer changes to a cross-hair symbol with a line beside it.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="67">2.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152472" xml-lang="en-US" l10n="U" oldref="42">In your document, click where the line should begin. Hold down the mouse button and drag to the point where you want the line to end. If you also hold down the Shift key, you can draw only horizontal, vertical, and diagonal lines.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="68">3.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153361" xml-lang="en-US" l10n="CHG" oldref="43">Release the mouse button once the line has the desired direction and length. You can then draw more lines. End this function by pressing the Esc key or by clicking the <emph>Select</emph> icon from the <emph>Drawing </emph>bar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="69">4.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="44">After clicking the <emph>Select</emph> icon, you can select all of the lines at the same time by clicking each line while holding down the Shift key. This multiple selection enables you to assign all of them a common color, width or other attribute.</paragraph>
</tablecell>
</tablerow>
</table>
-<list type="unordered">
+
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="38">Create a horizontal line by applying the preset Paragraph Style <emph>Horizontal Line</emph>. Click into an empty paragraph, and double-click the <emph>Horizontal Line</emph> Style in the <emph>Styles and Formatting</emph> window. If the entry for horizontal lines is not visible in the list of Paragraph Styles, select "All Styles" in the lower listbox.</paragraph>
</listitem>
@@ -113,9 +114,9 @@
</listitem>
</list>
<paragraph role="heading" id="par_idN107C6" xml-lang="en-US" level="2" l10n="CHG">Automatic lines in Writer</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="CHG">If you start a new line in a Writer text document by typing three or more hyphen characters and press the <item type="keycode">Enter</item> key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
+<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="CHG">If you start a new line in a Writer text document by typing three or more hyphen characters and press the Enter key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
<paragraph role="paragraph" id="par_id8849452" xml-lang="en-US" l10n="NEW">To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
</listitem>
<listitem>
@@ -125,7 +126,7 @@
<paragraph role="listitem" id="par_idN107D8" xml-lang="en-US" l10n="NEW">To undo an automatic border replacement once, choose <emph>Edit - Undo</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_idN107E0" xml-lang="en-US" l10n="NEW">To disable the automatic borders, choose <emph>Tools - AutoCorrect - Options</emph> and clear <emph>Apply border</emph>.</paragraph>
+<paragraph role="listitem" id="par_idN107E0" xml-lang="en-US" l10n="NEW">To disable the automatic borders, choose <emph>Tools - AutoCorrect Options - Options</emph> and clear <emph>Apply border</emph>.</paragraph>
</listitem>
</list>
<paragraph role="warning" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="45">The lines and other drawing objects that you insert in text are not defined in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link>, and are therefore not exported directly into HTML format. Instead, they are exported as graphics.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index 5bb031c1f5..e0ead9a6f2 100755
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: lineend_define.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidelineend_definexml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidelineend_definexml" indexer="include">
<title id="tit" xml-lang="en-US">Defining Line Ends</title>
<filename>/text/shared/guide/lineend_define.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-08T15:36:22">FPE: Deleted screenshot. Cleaned.</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3146117"><bookmark_value>defining; arrowheads and other line ends</bookmark_value>
@@ -57,7 +53,11 @@
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="16">Use the draw functions to create an object to be used as a line end.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="CHG" oldref="17">Select the object and choose <emph>Format - Object - Line</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="CHG" oldref="17">Select the object and choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
+</caseinline></switchinline>
+<emph/>
+<emph>Line</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="18">In the dialog, click the <emph>Arrow Styles</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index ad145368f9..d952faeb16 100755
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: linestyle_define.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidelinestyle_definexml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidelinestyle_definexml" indexer="include">
<title id="tit" xml-lang="en-US">Defining Line Styles</title>
<filename>/text/shared/guide/linestyle_define.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-15T11:36:41">FPE: Deleted screenshot. Cleaned
-dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153825"><bookmark_value>line styles;defining</bookmark_value>
@@ -54,7 +51,11 @@ dedr: reviewed</lastedited>
<paragraph role="listitem" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="10">Select a line drawing object in a document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155419" xml-lang="en-US" l10n="CHG" oldref="14">Choose <item type="menuitem">Format - Object - Line</item> and click the <emph>Line Styles</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3155419" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object</emph> -
+</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
+</caseinline></switchinline>
+<item type="menuitem"/>
+<emph>Line</emph> and click the <emph>Line Styles</emph> tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="15">Specify the line options that you want.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 0ee5980242..3a01cb4a87 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -60,7 +60,11 @@
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<<<<<<< .working
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
@@ -108,8 +112,13 @@
<tablecell>
<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
</tablecell>
+<<<<<<< .working
+<tablecell>
+<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+=======
<tablecell>
<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+>>>>>>> .merge-right.r265757
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index 3e09969b3f..b42a207520 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: protection.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,19 +32,15 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideprotectionxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+<topic id="textsharedguideprotectionxml" indexer="include">
+<title id="tit" xml-lang="en-US">Protecting Content in %PRODUCTNAME</title>
<filename>/text/shared/guide/protection.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
<bookmark_value>protected contents</bookmark_value>
<bookmark_value>contents protection</bookmark_value>
@@ -57,109 +52,101 @@
<bookmark_value>OLE objects;protecting</bookmark_value>
<bookmark_value>graphics;protecting</bookmark_value>
<bookmark_value>frames;protecting</bookmark_value>
-</bookmark>
- <comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
+</bookmark><comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
+<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
- <table id="tbl_id3145071">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="6">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145121" role="paragraph" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="par_id3145068" role="warning" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
- <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
- <table id="tbl_id3148797">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment>
- <comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
- <table id="tbl_id3158447">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147131" role="paragraph" l10n="U" oldref="54">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150088" role="paragraph" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147510" role="paragraph" l10n="U" oldref="56">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153657" role="paragraph" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="hd_id3152992" role="heading" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
- <table id="tbl_id3151062">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153226" role="paragraph" l10n="U" oldref="60">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148815" role="paragraph" l10n="CHG" oldref="61">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156289" role="paragraph" l10n="U" oldref="62">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="63">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <comment>removed webdav text, see i71792</comment>
- <comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment>
- <embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
- <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
- <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW"> <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/> </paragraph>
- <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
- </body>
+<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
+<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
+<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+<table id="tbl_id3145071">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="warning" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
+<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
+<paragraph role="paragraph" id="par_id3161646" xml-lang="en-US" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
+<table id="tbl_id3148797">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="12">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="14">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<paragraph role="heading" id="hd_id3155113" xml-lang="en-US" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
+<paragraph role="paragraph" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
+<table id="tbl_id3158447">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147131" xml-lang="en-US" l10n="U" oldref="54">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150088" xml-lang="en-US" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="56">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153657" xml-lang="en-US" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="heading" id="hd_id3152992" xml-lang="en-US" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
+<paragraph role="paragraph" id="par_id3166429" xml-lang="en-US" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
+<table id="tbl_id3151062">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153226" xml-lang="en-US" l10n="U" oldref="60">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3148815" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3156289" xml-lang="en-US" l10n="U" oldref="62">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="63">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+<comment>removed webdav text, see i71792</comment><comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment><embed href="text/shared/00/00000004.xhp#related"/>
+<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+<paragraph role="paragraph" id="par_idN10B8C" xml-lang="en-US" l10n="NEW">
+<embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+</paragraph>
+<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index 796a9db11b..a67d920de0 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.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.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: space_hyphen.xhp,v $
- *
- * $Revision: 1.14.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +52,7 @@
<bookmark_value>protected dashes</bookmark_value>
<bookmark_value>exchanging, see also replacing</bookmark_value>
</bookmark>
-<paragraph role="head1" id="hd_id3155364" xml-lang="en-US" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
+<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="61">Non-breaking spaces</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key
@@ -63,9 +61,9 @@
<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking dash</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Hyphen, dash</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect</emph>
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect Options</emph>
<emph>- Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect</emph>
+<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect Options</emph>
<emph>- </emph><link href="text/shared/01/06040200.xhp" name="Replace"><emph>Replace</emph></link>. Here you can, among other things, replace a shortcut automatically by a dash, even in another font.</paragraph>
<paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2" l10n="U" oldref="63">Definite separator</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="60">To support automatic hyphenation by entering a separator inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command
diff --git a/helpcontent2/source/text/simpress/main0102.xhp b/helpcontent2/source/text/simpress/main0102.xhp
index a6e8d9dfd4..0d09d0c21c 100755
--- a/helpcontent2/source/text/simpress/main0102.xhp
+++ b/helpcontent2/source/text/simpress/main0102.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0102.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpressmain0102xml" indexer="include" status="PUBLISH">
+<topic id="textsimpressmain0102xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit</title>
<filename>/text/simpress/main0102.xhp</filename>
</topic>
</meta>
<body>
<section id="bearbeiten">
-<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id4737388" localize="false"/><paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0102.xhp" name="Edit">Edit</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id4737388" localize="false"/>
+<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0102.xhp" name="Edit">Edit</link></paragraph>
<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for editing the contents of the current document.</ahelp></paragraph>
</section>
<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
@@ -57,7 +56,6 @@
<embed href="text/shared/01/02090000.xhp#auswaehlen"/>
<paragraph role="heading" id="hd_id3154659" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link></paragraph>
<embed href="text/shared/01/02100000.xhp#suchenersetzentext"/>
-<embed href="text/simpress/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3148866" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/simpress/01/02120000.xhp" name="Duplicate">Duplicate</link></paragraph>
<embed href="text/simpress/01/02120000.xhp#duplizieren"/>
<paragraph role="heading" id="hd_id3154649" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
diff --git a/helpcontent2/source/text/simpress/main0103.xhp b/helpcontent2/source/text/simpress/main0103.xhp
index dccda2938f..be05aee654 100755
--- a/helpcontent2/source/text/simpress/main0103.xhp
+++ b/helpcontent2/source/text/simpress/main0103.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.
*
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpressmain0103xml" indexer="include" status="PUBLISH">
+<topic id="textsimpressmain0103xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/simpress/main0103.xhp</filename>
</topic>
</meta>
<body>
<section id="ansicht">
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id2276680" localize="false"/><paragraph role="heading" id="hd_id3150297" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0103.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id2276680" localize="false"/>
+<paragraph role="heading" id="hd_id3150297" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0103.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for controlling the on-screen display of the document.</ahelp></paragraph>
</section>
<embed href="text/simpress/01/03080000.xhp#zeichnung"/>
@@ -62,6 +61,7 @@
<embed href="text/simpress/01/03060000.xhp#lineale"/>
<embed href="text/shared/01/grid.xhp#grid"/>
<embed href="text/shared/01/guides.xhp#guides"/>
+<embed href="text/simpress/01/02110000.xhp#navigator"/>
<embed href="text/simpress/01/03152000.xhp#headerandfooter"/>
<paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/simpress/main0106.xhp b/helpcontent2/source/text/simpress/main0106.xhp
index 6512455bb6..893a021172 100755
--- a/helpcontent2/source/text/simpress/main0106.xhp
+++ b/helpcontent2/source/text/simpress/main0106.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,30 +32,30 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpressmain0106xml" indexer="include" status="PUBLISH">
+<topic id="textsimpressmain0106xml" indexer="include">
<title id="tit" xml-lang="en-US">Tools</title>
<filename>/text/simpress/main0106.xhp</filename>
</topic>
</meta>
<body>
<section id="extras">
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id9877010" localize="false"/><paragraph role="heading" id="hd_id3154017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0106.xhp" name="Tools">Tools</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id9877010" localize="false"/>
+<paragraph role="heading" id="hd_id3154017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0106.xhp" name="Tools">Tools</link></paragraph>
<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Contains spelling tools, a gallery of object art that you can add to your document, as well as tools for configuring menus, and setting program preferences.</ahelp></paragraph>
</section>
<embed href="text/shared/01/06990000.xhp#rechtschreibung"/>
<embed href="text/shared/01/06010500.xhp#language"/>
-<paragraph role="heading" id="hd_id3153248" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
-<embed href="text/shared/01/06040000.xhp#autoko"/>
<embed href="text/shared/01/gallery.xhp#stargallery"/>
<embed href="text/shared/01/06030000.xhp#pipette"/>
<embed href="text/shared/01/mediaplayer.xhp#mediaplayer"/>
<embed href="text/shared/01/06130001.xhp#macro"/>
<embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
<embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<paragraph role="heading" id="hd_id3153248" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect Options</link></paragraph>
+<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3149130" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
<embed href="text/shared/01/06140000.xhp#anpassen"/>
<embed href="text/shared/optionen/01000000.xhp#optionen"/>
diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp
index bae3e97c9b..b81496ce3f 100644
--- a/helpcontent2/source/text/swriter/00/00000404.xhp
+++ b/helpcontent2/source/text/swriter/00/00000404.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.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000404.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0000000404xml" indexer="exclude" status="PUBLISH">
+<topic id="textswriter0000000404xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Insert Menu</title>
<filename>/text/swriter/00/00000404.xhp</filename>
</topic>
@@ -74,16 +72,17 @@
<section id="syfeldbefehl">
<table id="tbl_id3154642">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="E">
-<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146959" xml-lang="en-US">Icon</alt>
+<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153619" xml-lang="en-US" l10n="U" oldref="6">Insert Fields</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="56"><variable id="felddokument">Choose <emph>Insert - Fields - Other - Document</emph> tab
@@ -108,16 +107,17 @@
<section id="sybereich">
<table id="tbl_id3150349">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="E">
-<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152952" xml-lang="en-US">Icon</alt>
+<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150828" xml-lang="en-US" l10n="CHG" oldref="71">Section</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="U" oldref="69"><variable id="bereicheinbereich">Choose <emph>Insert - Section - Section</emph> tab or choose <emph>Format - Sections</emph>
@@ -125,38 +125,40 @@
<paragraph role="paragraph" id="par_id3154197" xml-lang="en-US" l10n="U" oldref="103"><variable id="sectionindents">Choose <emph>Insert - Section - Indents</emph> tab or choose <emph>Format - Sections</emph>
</variable></paragraph>
<section id="fussnoteein">
-<paragraph role="paragraph" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="8">Footnote: Choose <emph>Insert - Footnote</emph>
+<paragraph role="paragraph" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Insert - Footnote/Endnote</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="91">Open context menu - choose <emph>Footnote</emph> (inserted Footnote/Endnote)</paragraph>
+<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="91">Open context menu - choose <emph>Footnote/Endnote</emph> (inserted Footnote/Endnote)</paragraph>
<paragraph role="paragraph" id="par_id3143279" xml-lang="en-US" l10n="CHG" oldref="9">Open <emph>Insert</emph> toolbar, click</paragraph>
<section id="syfussnoteein">
<table id="tbl_id3149826">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="E">
-<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149099" xml-lang="en-US">Icon</alt>
+<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148968" xml-lang="en-US" l10n="U" oldref="10">Insert Footnote Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="syendnoteein">
<table id="tbl_id3147221">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147579" xml-lang="en-US" l10n="E">
-<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147586" xml-lang="en-US">Icon</alt>
+<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147076" xml-lang="en-US" l10n="U" oldref="66">Insert Endnote Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="beschriftungein">
<paragraph role="paragraph" id="par_id3154385" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Insert - Caption</emph>
@@ -177,16 +179,17 @@
<section id="sytextmarke">
<table id="tbl_id3156379">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148884" xml-lang="en-US" l10n="E">
-<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151369" xml-lang="en-US">Icon</alt>
+<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151369" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="CHG" oldref="14">Bookmark</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="U" oldref="15"><variable id="einfscript">Choose <emph>Insert - Script</emph> (only HTML documents)
@@ -200,16 +203,17 @@
<section id="syeintrag">
<table id="tbl_id3145256">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="E">
-<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149551" xml-lang="en-US">Icon</alt>
+<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150549" xml-lang="en-US" l10n="CHG" oldref="19">Entry</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149217" xml-lang="en-US" l10n="U" oldref="20"><variable id="stichwortverzeichnisverz">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>
@@ -254,7 +258,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145625" xml-lang="en-US" l10n="U" oldref="88"><variable id="verz37">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Bibliography is the selected type)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph> and click <emph>Edit</emph>
+<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - </emph>
+<emph>Bibliography Entry</emph> and click <emph>Edit</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150918" xml-lang="en-US" l10n="U" oldref="68"><variable id="stichwortverzeichnisverz3">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Styles</emph> tab
</variable></paragraph>
@@ -269,22 +274,23 @@
<section id="rahmen">
<paragraph role="paragraph" id="par_id3148781" xml-lang="en-US" l10n="U" oldref="32">Choose <emph>Insert - Frame</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Format - Frame</emph>
+<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Format - Frame/Object</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="CHG" oldref="34">Open <emph>Insert</emph> toolbar, click</paragraph>
<section id="syrahmen">
<table id="tbl_id3155100">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149372" xml-lang="en-US" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3149379" xml-lang="en-US">Frame</alt>
+<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151229" xml-lang="en-US" l10n="CHG" oldref="35">Insert Frame Manually</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="einfgentabelle">
@@ -296,16 +302,17 @@
<section id="sytabelle">
<table id="tbl_id3154350">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154620" xml-lang="en-US" l10n="E">
-<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154627" xml-lang="en-US">Icon</alt>
+<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147382" xml-lang="en-US" l10n="CHG" oldref="39">Table</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149627" xml-lang="en-US" l10n="U" oldref="40"><variable id="einfhorizlinie">Choose <emph>Insert - Horizontal Line</emph>
@@ -317,16 +324,17 @@
<section id="syeinfdatei">
<table id="tbl_id3146296">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="E">
-<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149966" xml-lang="en-US">Icon</alt>
+<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150599" xml-lang="en-US" l10n="U" oldref="43">File</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3147267" xml-lang="en-US" l10n="U" oldref="59"><variable id="kopfzeile">Choose <emph>Insert - Header</emph>
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index ae349c9ef0..46708e8126 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -70,7 +70,7 @@
</variable></paragraph>
<section id="spaltens">
<paragraph role="paragraph" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame - Columns</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3143276" xml-lang="en-US" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
@@ -95,13 +95,13 @@
<section id="numerierungsvorlage">
<paragraph role="paragraph" id="par_id3156364" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Numbering Styles)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoFormat - While Typing</emph>
+<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoCorrect - While Typing</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoFormat</emph>
+<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoCorrect</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoFormat - Apply</emph>
+<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoCorrect - Apply</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoFormat - Apply and Edit Changes</emph>
+<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table)
</variable></paragraph>
@@ -117,7 +117,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -130,13 +134,13 @@
</section>
<section id="grafiktyp">
<paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Picture - Type</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
+<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
<paragraph role="paragraph" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3147067" xml-lang="en-US" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
</section>
<section id="grafikumlauf">
<paragraph role="paragraph" id="par_id3151082" xml-lang="en-US" l10n="U" oldref="56">Choose <emph>Format - Picture - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame - Wrap</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153299" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
</paragraph>
@@ -145,12 +149,12 @@
</variable></paragraph>
<section id="grahyper">
<paragraph role="paragraph" id="par_id3153984" xml-lang="en-US" l10n="U" oldref="63">Choose <emph>Format - Picture - Hyperlink</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame - Hyperlink</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3145337" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
</section>
<section id="grazusaetze">
<paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Picture - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame - Options</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149774" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
</section>
@@ -158,7 +162,7 @@
</variable></paragraph>
<section id="makrografik">
<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Insert/Format - Picture - Macro</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame - Macro</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="73">Choose <emph>Edit - AutoText - AutoText (button) - Macro</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148792" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
@@ -180,6 +184,49 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
</variable></paragraph>
+<<<<<<< .working
+<section id="verbindenze">
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenverbinden">
+<table id="tbl_id3154636">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
+<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154002" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+<section id="teilenz">
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenteilen">
+<table id="tbl_id3149972">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
+<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
</variable></paragraph>
<section id="schutzaufhz">
@@ -200,7 +247,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -211,6 +262,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenzeile">
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilenzeile">
+<table id="tbl_id3154064">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
</variable></paragraph>
<section id="loschenz">
@@ -222,7 +296,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -247,7 +325,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -258,6 +340,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenspalte">
+<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilentext">
+<table id="tbl_id3148462">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
</variable></paragraph>
<section id="einfgens">
@@ -270,7 +375,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -280,7 +389,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -299,7 +412,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -311,14 +428,18 @@
</section>
</section>
<section id="objektformat">
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame</emph>
+<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
</paragraph>
<section id="syeigenschaftenobjekt">
<table id="tbl_id3153367">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -334,7 +455,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp
index e8a7b59576..abceda496f 100755
--- a/helpcontent2/source/text/swriter/00/00000406.xhp
+++ b/helpcontent2/source/text/swriter/00/00000406.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0000000406xml" indexer="exclude" status="PUBLISH">
+<topic id="textswriter0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
<filename>/text/swriter/00/00000406.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T12:45:38">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3154279" xml-lang="en-US" level="1" l10n="U" oldref="1">Tools Menu</paragraph>
@@ -54,13 +50,13 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="40"><variable id="kapitelnumerierung1">Choose <emph>Tools - Outline Numbering - Numbering</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="zeilennumerierung">Choose <emph>Tools - Line Numbering</emph> (not for HTML format)
+<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="zeilennumerierung">Choose <emph>Tools - Line Numbering</emph> (not for HTML format)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="31"><variable id="fussnoteneinstellung">Choose <emph>Tools - Footnotes</emph>
+<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="31"><variable id="fussnoteneinstellung">Choose <emph>Tools - Footnotes/Endnotes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="15"><variable id="fussnoten">Choose <emph>Tools - Footnotes - Footnotes</emph> tab
+<paragraph role="paragraph" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="15"><variable id="fussnoten">Choose <emph>Tools - Footnotes/Endnotes - Footnotes</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="U" oldref="32"><variable id="endnoten">Choose <emph>Tools - Footnotes - Endnotes</emph> tab
+<paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="U" oldref="32"><variable id="endnoten">Choose <emph>Tools - Footnotes/Endnotes - Endnotes</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3152963" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="texttabelle">Choose <emph>Table - Convert - Text to Table</emph>
</variable></paragraph>
@@ -97,12 +93,12 @@
<paragraph role="paragraph" id="par_idN107E7" xml-lang="en-US" l10n="NEW">Click <emph>Mail Merge</emph> icon on the <emph>Table Data</emph> bar:</paragraph>
<table id="tbl_id3149877">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">
-<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
+<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10823" xml-lang="en-US" l10n="NEW">Mail Merge</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/02110000.xhp b/helpcontent2/source/text/swriter/01/02110000.xhp
index f691e49433..f35b46f63b 100644
--- a/helpcontent2/source/text/swriter/01/02110000.xhp
+++ b/helpcontent2/source/text/swriter/01/02110000.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.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02110000.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* 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="textswriter0102110000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0102110000xml" indexer="include">
<title id="tit" xml-lang="en-US">Navigator</title>
<filename>/text/swriter/01/02110000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-13T16:05:02">converted from old format - fpe
-dedr: fixed #i31269#
-FPE: Deleted screenshot</lastedited>
-</history>
</meta>
<body>
<section id="navigator">
@@ -52,9 +48,9 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Navigator">Shows or hides the Navigator, where you can quickly jump to different parts of your document. You can also use the Navigator to insert elements from the current document or other open documents, and to organize master documents.</ahelp> To edit an item in the Navigator, right-click the item, and then choose a command from the context menu. If you want, you can <link href="text/shared/00/00000005.xhp#andocken" name="dock">dock</link> the Navigator at the edge of your workspace.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#navigator"/>
+<embed href="text/shared/00/00000402.xhp#navigator"/>
</section>
-<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>Edit - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator.</paragraph>
+<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>View - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="CHG" oldref="79">Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="64">To jump to the next or previous item in a document, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon to open the Navigation toolbar, click the item category, and then click the up or down arrows.</paragraph>
<paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="90">A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, text frames, graphics, OLE objects, and indexes.</paragraph>
@@ -63,12 +59,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155917" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="." visibility="hidden">Switches between master view and normal view if a master document is open.</ahelp>Switches between <link href="text/shared/01/02110000.xhp" name="master view">master view</link> and normal view if a <link href="text/shared/01/01010001.xhp" name="master document">master document</link> is open.</paragraph>
<table id="tbl_id3155861">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="E">
-<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150695" xml-lang="en-US">Icon</alt>
+<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150695" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="68">Toggle</paragraph>
</tablecell>
</tablerow>
@@ -80,12 +76,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3149838" xml-lang="en-US" l10n="U" oldref="83">To continue the search, click the <link href="text/swriter/01/02110100.xhp" name="Repeat Search"><emph>Repeat Search</emph></link> icon on the <emph>Navigation</emph> toolbar.</paragraph>
<table id="tbl_id3148862">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN1087B" xml-lang="en-US" l10n="NEW">
-<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.222inch" height="0.222inch"><alt id="alt_id3628141" xml-lang="en-US">Icon</alt>
+<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.2228in" height="0.2228in"><alt id="alt_id3628141" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="71">Navigation</paragraph>
</tablecell>
</tablerow>
@@ -96,12 +92,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3148784" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="." visibility="hidden">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigation</emph> icon, and then click an item category - for example, "Graphics".</ahelp>Jumps to the previous item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, and then click an item category - for example, "Graphics".</paragraph>
<table id="tbl_id3150044">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154616" xml-lang="en-US" l10n="E">
-<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154622" xml-lang="en-US">Icon</alt>
+<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154622" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150659" xml-lang="en-US" l10n="U" oldref="30">Previous Object</paragraph>
</tablecell>
</tablerow>
@@ -112,12 +108,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3154028" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="." visibility="hidden">Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, and then click an item category - for example, "Graphics".</ahelp>Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, and then click an item category - for example, "Graphics".</paragraph>
<table id="tbl_id3149971">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="E">
-<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150773" xml-lang="en-US">Icon</alt>
+<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150773" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155359" xml-lang="en-US" l10n="U" oldref="33">Next Object</paragraph>
</tablecell>
</tablerow>
@@ -133,12 +129,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155325" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="HID_NAVI_TBX7">Shows or hides the <emph>Navigator </emph>list.</ahelp></paragraph>
<table id="tbl_id3154409">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154949" xml-lang="en-US" l10n="E">
-<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154955" xml-lang="en-US">Icon</alt>
+<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154955" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="9">List box on/off</paragraph>
</tablecell>
</tablerow>
@@ -149,12 +145,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_NAVI_TBX8">Switches between the display of all categories in the Navigator and the selected category.</ahelp></paragraph>
<table id="tbl_id3145616">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154133" xml-lang="en-US" l10n="E">
-<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154140" xml-lang="en-US">Icon</alt>
+<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154140" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156067" xml-lang="en-US" l10n="U" oldref="12">Switch Content View</paragraph>
</tablecell>
</tablerow>
@@ -166,12 +162,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3153011" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, in the <emph>Navigation</emph> window click the <emph>Reminder</emph> icon, and then click the <emph>Previous</emph> or <emph>Next</emph> button.</ahelp>Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, in the Navigation window click the Reminder icon, and then click the Previous or Next button.</paragraph>
<table id="tbl_id3154577">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154608" xml-lang="en-US" l10n="E">
-<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154904" xml-lang="en-US">Icon</alt>
+<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154904" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153054" xml-lang="en-US" l10n="U" oldref="15">Set Reminder</paragraph>
</tablecell>
</tablerow>
@@ -182,12 +178,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_NAVI_TBX10">Moves the cursor to the header, or from the header to the document text area.</ahelp></paragraph>
<table id="tbl_id3159262">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153900" xml-lang="en-US" l10n="E">
-<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153911" xml-lang="en-US">Icon</alt>
+<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153911" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147104" xml-lang="en-US" l10n="U" oldref="19">Header</paragraph>
</tablecell>
</tablerow>
@@ -198,12 +194,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3147137" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_NAVI_TBX11">Moves the cursor to the footer, or from the footer to the document text area.</ahelp></paragraph>
<table id="tbl_id3149777">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150217" xml-lang="en-US" l10n="E">
-<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150224" xml-lang="en-US">Icon</alt>
+<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150224" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="U" oldref="22">Footer</paragraph>
</tablecell>
</tablerow>
@@ -214,12 +210,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3150314" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_NAVI_TBX12">Jumps between the footnote text and the footnote anchor.</ahelp></paragraph>
<table id="tbl_id3150333">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153100" xml-lang="en-US" l10n="E">
-<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153108" xml-lang="en-US">Icon</alt>
+<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153108" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150650" xml-lang="en-US" l10n="U" oldref="25">Anchor &lt;-&gt; Text</paragraph>
</tablecell>
</tablerow>
@@ -230,12 +226,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155828" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_NAVI_TBX4">Sets the drag and drop options for inserting items from the Navigator into a document, for example, as a hyperlink. Click this icon, and then choose the option that you want to use.</ahelp></paragraph>
<table id="tbl_id3155849">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155120" xml-lang="en-US" l10n="E">
-<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155126" xml-lang="en-US">Icon</alt>
+<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147042" xml-lang="en-US" l10n="U" oldref="36">Drag mode</paragraph>
</tablecell>
</tablerow>
@@ -258,12 +254,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3148826" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_NAVI_OUTLINES">Click <emph>1 </emph>to only view the top level headings in the Navigator window, and <emph>10</emph> to view all of the headings.</ahelp></paragraph>
<table id="tbl_id3147535">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153588" xml-lang="en-US" l10n="E">
-<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153595" xml-lang="en-US">Icon</alt>
+<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153595" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145554" xml-lang="en-US" l10n="U" oldref="47">Outline level</paragraph>
</tablecell>
</tablerow>
@@ -274,12 +270,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="CHG" oldref="49"><ahelp hid="HID_NAVI_TBX5">Moves the selected heading, and the text below the heading, up one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3151301">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="E">
-<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153275" xml-lang="en-US">Icon</alt>
+<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149147" xml-lang="en-US" l10n="U" oldref="50">Chapter Up</paragraph>
</tablecell>
</tablerow>
@@ -290,12 +286,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3154440" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="HID_NAVI_TBX6">Moves the selected heading, and the text below the heading, down one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3153737">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="E">
-<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150828" xml-lang="en-US">Icon</alt>
+<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150828" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="53">Chapter down</paragraph>
</tablecell>
</tablerow>
@@ -306,12 +302,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3151354" xml-lang="en-US" l10n="CHG" oldref="56"><ahelp hid="HID_NAVI_TBX14">Increases the outline level of the selected heading, and the headings that occur below the heading, by one. To only increase the outline level of the selected heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3148898">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155414" xml-lang="en-US" l10n="E">
-<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155420" xml-lang="en-US">Icon</alt>
+<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153697" xml-lang="en-US" l10n="U" oldref="57">Promote level</paragraph>
</tablecell>
</tablerow>
@@ -322,12 +318,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3150707" xml-lang="en-US" l10n="CHG" oldref="59"><ahelp hid="HID_NAVI_TBX15">Decreases the outline level of the selected heading, and the headings that occur below the heading, by one. To only decrease the outline level of the selected heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3150746">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148414" xml-lang="en-US" l10n="E">
-<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148420" xml-lang="en-US">Icon</alt>
+<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147324" xml-lang="en-US" l10n="U" oldref="60">Demote level</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index 0cbc3b8b96..a3a0564c53 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.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.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02150000.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -29,28 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0102150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Edit Footnotes</title>
+<title id="tit" xml-lang="en-US">Footnote/Endnote</title>
<filename>/text/swriter/01/02150000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-12T16:11:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" id="bm_id8871205" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" id="bm_id8871205" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditFootnote" id="bm_id3149486" localize="false"/>
-<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit Footnotes">Edit Footnotes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149097" xml-lang="en-US" l10n="U" oldref="2"><variable id="fusstext"><ahelp hid=".uno:EditFootnote">Edits the selected footnote or endnote anchor. Click in front of or behind the footnote or endnote, and then choose this command.</ahelp>
+<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit Footnotes">Footnote/Endnote</link></paragraph>
+<paragraph role="paragraph" id="par_id3149097" xml-lang="en-US" l10n="U" oldref="2"><variable id="fusstext"><ahelp hid=".uno:EditFootnote">Edits the selected footnote or endnote anchor. Click in front of the footnote or endnote, and then choose this command.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000402.xhp#fussnote"/>
+<embed href="text/swriter/00/00000402.xhp#fussnote"/>
</section>
<paragraph role="paragraph" id="par_id3149035" xml-lang="en-US" l10n="U" oldref="13">To edit the text of a footnote or endnote, click in the footnote area at the bottom of the page, or at the end of the document.</paragraph>
<paragraph role="note" id="par_id3145776" xml-lang="en-US" l10n="U" oldref="11">To quickly jump to the footnote or endnote text, click the anchor for note in the document. You can also position the cursor in front of or behind the marker, and then press Ctrl+Shift+PgDn. To jump back to the anchor for the note, press PgUp.</paragraph>
@@ -74,12 +72,12 @@
<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_PREV">Moves to the previous footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3148791">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150023" xml-lang="en-US" l10n="E">
-<image id="img_id3150030" src="res/sc10618.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150030" xml-lang="en-US">Icon</alt>
+<image id="img_id3150030" src="res/sc10618.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150030" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154614" xml-lang="en-US" l10n="U" oldref="25">Previous footnote</paragraph>
</tablecell>
</tablerow>
@@ -90,17 +88,17 @@
<paragraph role="paragraph" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_NEXT">Moves to the next footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3150662">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154029" xml-lang="en-US" l10n="E">
-<image id="img_id3154044" src="res/sc10617.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154044" xml-lang="en-US">Icon</alt>
+<image id="img_id3154044" src="res/sc10617.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149606" xml-lang="en-US" l10n="U" oldref="28">Next footnote</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="33"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="33"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote/Endnote</link> dialog.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04030000.xhp b/helpcontent2/source/text/swriter/01/04030000.xhp
index a97e8f6bf7..15cb0265ef 100644
--- a/helpcontent2/source/text/swriter/01/04030000.xhp
+++ b/helpcontent2/source/text/swriter/01/04030000.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,24 +32,20 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0104030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Footnote</title>
+<title id="tit" xml-lang="en-US">Footnote/Endnote</title>
<filename>/text/swriter/01/04030000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-03T13:43:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FOOTNOTE_DLG" id="bm_id1360835" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnoteDialog" id="bm_id3148770" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FOOTNOTE" id="bm_id4793576" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnote" id="bm_id3148773" localize="false"/>
-<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote</link></paragraph>
+<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Footnote/Endnote</link></paragraph>
<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2"><variable id="fussnoteein"><ahelp hid=".uno:InsertFootnote">Inserts a footnote or an endnote in the document. The anchor for the note is inserted at the current cursor position.</ahelp> You can choose between automatic numbering or a custom symbol.
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154645" xml-lang="en-US" l10n="U" oldref="23"><variable id="endnoten">The following applies to both footnotes and endnotes.
@@ -57,13 +53,13 @@
<paragraph role="paragraph" id="par_id3151175" xml-lang="en-US" l10n="U" oldref="24"><variable id="endnotetext">Footnotes are inserted at the end of a page, and endnotes are inserted at the end of a document.
</variable><comment>UFI: what about sections? Will endnotes be placed there?</comment></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#fussnoteein"/>
+<embed href="text/swriter/00/00000404.xhp#fussnoteein"/>
</section>
<paragraph role="heading" id="hd_id3154106" xml-lang="en-US" level="2" l10n="U" oldref="7">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="16">Select the type of numbering that you want to use for footnotes and endnotes.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" id="bm_id3154482" localize="false"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="8">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes</emph></link>.
+<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR" id="bm_id3152963" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR" id="bm_id3152962" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04130000.xhp b/helpcontent2/source/text/swriter/01/04130000.xhp
index 9c2363cf8f..c1a426f509 100644
--- a/helpcontent2/source/text/swriter/01/04130000.xhp
+++ b/helpcontent2/source/text/swriter/01/04130000.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04130000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104130000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Frame</title>
<filename>/text/swriter/01/04130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-14T10:10:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME" id="bm_id2796990" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME" id="bm_id2796990" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrame" id="bm_id3154640" localize="false"/>
<paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="1" l10n="U" oldref="1">Frame</paragraph>
<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="rahm"><ahelp hid=".uno:InsertFrame">Inserts a frame that you can use to create a layout of one or more columns of text and objects.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#rahmen"/>
+<embed href="text/swriter/00/00000404.xhp#rahmen"/>
</section>
-<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="CHG" oldref="37">To edit a frame, click the border to select it, and then choose <emph>Format - Frame</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="CHG" oldref="37">To edit a frame, click the border to select it, and then choose <emph>Format - Frame/Object</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="38">To delete a frame, click the border of the frame, and then press Delete.</paragraph>
<paragraph role="paragraph" id="par_id3151311" xml-lang="en-US" l10n="U" oldref="23">If you see small red arrows at the beginning and the end of text in frame, use the arrow keys to scroll through the remaining text.</paragraph>
<paragraph role="paragraph" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="25">In the preview area of the <emph>Frame</emph> dialog, the frame is represented by a green rectangle, and the reference area by a red rectangle.</paragraph>
@@ -65,7 +63,7 @@
<embed href="text/swriter/01/05040500.xhp#spalten"/>
<embed href="text/swriter/01/05060700.xhp#makro"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME_INTERACT" id="bm_id8960281" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME_INTERACT" id="bm_id8960281" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrameInteract" id="bm_id3147096" localize="false"/>
<paragraph role="heading" id="hd_id3149107" xml-lang="en-US" level="3" l10n="CHG" oldref="5">Icon on the Insert toolbar:</paragraph>
<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="CHG" oldref="6"><variable id="syrahmentext"><ahelp hid=".uno:InsertFrameInteract">Draws a frame where you drag in the document. Click the arrow next to the icon to select the number of columns for the frame.</ahelp>
diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index e72f0d559a..9b956daeda 100755
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150000.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,32 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoFormat</title>
+<topic id="textswriter0105150000xml" indexer="include">
+<title id="tit" xml-lang="en-US">AutoCorrect</title>
<filename>/text/swriter/01/05150000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-02T13:30:47">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autoformat">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoFormat function; text documents</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoFormat</link></paragraph>
-<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph></link>.</paragraph>
+<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
+<emph> Options</emph></link>.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat1"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat1"/>
</section>
<embed href="text/swriter/01/05150100.xhp#eingabe"/>
<embed href="text/swriter/01/05150200.xhp#dokument"/>
<embed href="text/swriter/01/05150300.xhp#ananbe"/>
+<paragraph role="heading" id="hd_id1029200810080924" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
+<paragraph role="paragraph" id="par_id1029200810080924" xml-lang="en-US" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05150100.xhp b/helpcontent2/source/text/swriter/01/05150100.xhp
index 3047d56e7b..2f0fbdf8c8 100644
--- a/helpcontent2/source/text/swriter/01/05150100.xhp
+++ b/helpcontent2/source/text/swriter/01/05150100.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,33 +30,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150100xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150100xml" indexer="include">
<title id="tit" xml-lang="en-US">While Typing</title>
<filename>/text/swriter/01/05150100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:51:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="eingabe">
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_EXEC" id="bm_id3145252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_AUTO" id="bm_id3894242" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_AUTO" id="bm_id3894242" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineAutoFormat" id="bm_id3154491" localize="false"/>
<paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150100.xhp" name="While Typing">While Typing</link></paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:OnlineAutoFormat">Automatically formats the document while you type. To set the formatting options, choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Options </emph>tab.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:OnlineAutoFormat">Automatically formats the document while you type. To set the formatting options, choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Options </emph>tab.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#eingabe"/>
+<embed href="text/swriter/00/00000405.xhp#eingabe"/>
</section>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="3">You can use AutoFormat to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic <link href="text/shared/01/06040100.xhp" name="word completion">word completion</link> only occurs after you type a word for the second time in a document.</paragraph>
-<paragraph role="tip" id="par_id3147407" xml-lang="en-US" l10n="U" oldref="24">To reverse the last AutoFormat action, choose <emph>Edit - </emph><link href="text/shared/01/02010000.xhp" name="Undo"><emph>Undo</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="3">You can use AutoCorrect to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic <link href="text/shared/01/06040100.xhp" name="word completion">word completion</link> only occurs after you type a word for the second time in a document.</paragraph>
+<paragraph role="tip" id="par_id3147407" xml-lang="en-US" l10n="U" oldref="24">To reverse the last AutoCorrect action, choose <emph>Edit - </emph><link href="text/shared/01/02010000.xhp" name="Undo"><emph>Undo</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="25"><link href="text/swriter/01/05150200.xhp" name="Other AutoFormat rules">Other AutoFormat rules</link></paragraph>
+<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="25"><link href="text/swriter/01/05150200.xhp" name="Other AutoFormat rules">Other AutoCorrect rules</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp
index a037db1121..aef854f350 100644
--- a/helpcontent2/source/text/swriter/01/05150200.xhp
+++ b/helpcontent2/source/text/swriter/01/05150200.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.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150200.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -29,22 +30,19 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150200xml" indexer="include">
<title id="tit" xml-lang="en-US">Apply</title>
<filename>/text/swriter/01/05150200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:52:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="dokument">
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatApply" id="bm_id3154656" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id5028839"><bookmark_value>automatic heading formatting</bookmark_value>
</bookmark>
@@ -53,16 +51,17 @@
<bookmark_value>separator lines;AutoFormat function</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
-<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat2"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat2"/>
</section>
<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoFormat for Headings</paragraph>
+<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
<paragraph role="paragraph" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
</listitem>
@@ -73,13 +72,13 @@
<paragraph role="listitem" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoFormat for Bullets / Numbering</paragraph>
+<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
<paragraph role="paragraph" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
<paragraph role="note" id="par_id3147507" xml-lang="en-US" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoFormat for Separator Lines</paragraph>
+<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoCorrect for Separator Lines</paragraph>
<paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/01/05150300.xhp b/helpcontent2/source/text/swriter/01/05150300.xhp
index b91314cf24..7e960cc611 100644
--- a/helpcontent2/source/text/swriter/01/05150300.xhp
+++ b/helpcontent2/source/text/swriter/01/05150300.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150300.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150300xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150300xml" indexer="include">
<title id="tit" xml-lang="en-US">Apply and Edit Changes</title>
<filename>/text/swriter/01/05150300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:56:16">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ananbe">
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_REDLINE_APPLY" id="bm_id766634" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_REDLINE_APPLY" id="bm_id766634" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatRedlineApply" id="bm_id3145829" localize="false"/>
<paragraph role="heading" id="hd_id3149353" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150300.xhp" name="Apply and Edit Changes">Apply and Edit Changes</link></paragraph>
-<paragraph role="paragraph" id="par_id3152999" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatRedlineApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>. In a dialog, you are asked to accept or reject the changes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152999" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatRedlineApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>. In a dialog, you are asked to accept or reject the changes.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat3"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat3"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_ACCEPT" id="bm_id3149022" localize="false"/>
<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="2" l10n="U" oldref="4">Accept All</paragraph>
@@ -60,8 +59,8 @@
<paragraph role="paragraph" id="par_id3149711" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_AUTOFORMAT_REJECT">Rejects all of the formatting changes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_EDIT_CHG" id="bm_id3147564" localize="false"/>
<paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="2" l10n="U" oldref="8">Edit Changes</paragraph>
-<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_AUTOFORMAT_EDIT_CHG">Opens a dialog where you can accept or reject AutoFormat changes. You can also view the changes made by a specific author or on a specific date.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_AUTOFORMAT_EDIT_CHG">Opens a dialog where you can accept or reject AutoCorrect changes. You can also view the changes made by a specific author or on a specific date.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Accept or Reject AutoFormat Changes, Filter tab">Accept or Reject AutoFormat Changes, Filter tab</link></paragraph>
+<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Accept or Reject AutoFormat Changes, Filter tab">Accept or Reject Changes, Filter tab</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06080000.xhp b/helpcontent2/source/text/swriter/01/06080000.xhp
index 16e47b953d..8bafaa4ba9 100644
--- a/helpcontent2/source/text/swriter/01/06080000.xhp
+++ b/helpcontent2/source/text/swriter/01/06080000.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
<topic id="textswriter0106080000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Footnote options</title>
+<title id="tit" xml-lang="en-US">Footnotes/Endnotes Settings</title>
<filename>/text/swriter/01/06080000.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>
-
-
- <bookmark xml-lang="en-US" branch="hid/FN_FORMAT_FOOTNOTE_DLG" id="bm_id3799245" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:FootnoteDialog" xml-lang="en-US" id="bm_id3150014"/><paragraph id="hd_id3153004" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/06080000.xhp" name="Footnote options">Footnote options</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149882" xml-lang="en-US" oldref="2"><variable id="fnoten"><ahelp hid=".uno:FootnoteDialog" visibility="visible">Specifies the display settings for footnotes and endnotes.</ahelp></variable></paragraph>
- <section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#fussnoteneinstellung"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FORMAT_FOOTNOTE_DLG" id="bm_id3799245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FootnoteDialog" id="bm_id3150014" localize="false"/>
+<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/06080000.xhp" name="Footnote options">Footnotes/Endnotes Settings</link></paragraph>
+<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="U" oldref="2"><variable id="fnoten"><ahelp hid=".uno:FootnoteDialog">Specifies the display settings for footnotes and endnotes.</ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<embed href="text/swriter/00/00000406.xhp#fussnoteneinstellung"/>
</section>
- <embed href="text/swriter/01/06080100.xhp#fussnoten"/>
- <embed href="text/swriter/01/06080200.xhp#endnoten"/>
- </body>
+<embed href="text/swriter/01/06080100.xhp#fussnoten"/>
+<embed href="text/swriter/01/06080200.xhp#endnoten"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index 35697f8fe1..18beb3247a 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06090000.xhp,v $
- * $Revision: 1.11 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0106090000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0106090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Convert Text to Table</title>
<filename>/text/swriter/01/06090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-15T16:23:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147402"><bookmark_value>converting; text, into tables</bookmark_value>
@@ -55,7 +51,7 @@
<paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="2"><variable id="texttab"><ahelp hid=".uno:ConvertTableText">Converts the selected text into a table, or the selected table into text.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#texttabelle"/>
+<embed href="text/swriter/00/00000406.xhp#texttabelle"/>
</section>
<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="15">The options available in this dialog depending on the type of conversion.</paragraph>
<paragraph role="heading" id="hd_id3145247" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Separate text at</paragraph>
@@ -79,7 +75,7 @@
<paragraph role="heading" id="hd_id3147508" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Equal width for all columns</paragraph>
<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN">Creates columns of equal width, regardless of the position of the column marker.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
-<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoFormat</paragraph>
+<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoCorrect</paragraph>
<embed href="text/swriter/01/04150000.xhp#autoformattext"/>
<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
index b31ffd31c7..abb596dba7 100644
--- a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_numbering.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_numbering.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,19 +32,15 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideauto_numberingxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Creating Numbered or Bulleted Lists as You Type</title>
+<topic id="textswriterguideauto_numberingxml" indexer="include">
+<title id="tit" xml-lang="en-US">Creating Numbered or Bulleted Lists as You Type</title>
<filename>/text/swriter/guide/auto_numbering.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3147407"><bookmark_value>numbering; lists, while typing</bookmark_value>
<bookmark_value>bullet lists;creating while typing</bookmark_value>
<bookmark_value>lists;automatic numbering</bookmark_value>
@@ -54,36 +49,36 @@
<bookmark_value>bullets; using automatically</bookmark_value>
<bookmark_value>automatic bullets</bookmark_value>
<bookmark_value>paragraphs; automatic numbering</bookmark_value>
-</bookmark>
- <comment>MW deleted "applying;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="1" l10n="U" oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
+</bookmark><comment>MW deleted "applying;"</comment>
+<paragraph role="heading" id="hd_id3147407" xml-lang="en-US" level="1" l10n="U" oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3154243" role="heading" level="3" l10n="U" oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152830" role="listitem" l10n="U" oldref="29">Choose <emph>Tools - AutoCorrect</emph>, click the <emph>Options</emph> tab, and then select <emph>Apply Numbering - Symbol</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152867" role="listitem" l10n="U" oldref="30">Choose <emph>Format - AutoFormat</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id2357860" role="tip" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3152897" role="heading" level="3" l10n="U" oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147773" role="listitem" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147794" role="listitem" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147814" role="listitem" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3147287" role="note" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
- <embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
- <paragraph xml-lang="en-US" id="par_id3154083" role="paragraph" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
- </body>
+<paragraph role="paragraph" id="par_id3155525" xml-lang="en-US" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
+<paragraph role="heading" id="hd_id3154243" xml-lang="en-US" level="3" l10n="U" oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3152830" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, click the <emph>Options</emph> tab, and then select <emph>Apply Numbering - Symbol</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152867" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Format - AutoCorrect</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
+</listitem>
+</list>
+<paragraph role="tip" id="par_id2357860" xml-lang="en-US" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<paragraph role="heading" id="hd_id3152897" xml-lang="en-US" level="3" l10n="U" oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3147773" xml-lang="en-US" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147794" xml-lang="en-US" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147814" xml-lang="en-US" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3147287" xml-lang="en-US" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
+<embed href="text/shared/00/00000004.xhp#related"/>
+<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+<paragraph role="paragraph" id="par_id3154083" xml-lang="en-US" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index d91537eb08..2301a9431c 100755
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_off.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* 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="textswriterguideauto_offxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning Off AutoFormat and AutoCorrect</title>
+<topic id="textswriterguideauto_offxml" indexer="include">
+<title id="tit" xml-lang="en-US">Turning Off AutoCorrect </title>
<filename>/text/swriter/guide/auto_off.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T08:40:18">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154250"><bookmark_value>turning off automatic correction</bookmark_value>
@@ -59,22 +55,23 @@
<bookmark_value>AutoCorrect function;turning off</bookmark_value>
</bookmark>
<paragraph role="paragraph" id="par_id3154250" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3147812" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoFormat and AutoCorrect</link>
+<paragraph role="heading" id="hd_id3147812" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoCorrect</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147833" xml-lang="en-US" l10n="CHG" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN1081B" xml-lang="en-US" l10n="NEW">To quickly undo an automatic correction or completion, press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z. </paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">To turn off most AutoFormat features, remove the check mark from the menu <emph>Format - AutoFormat - While Typing</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">To turn off most AutoCorrect features, remove the check mark from the menu <emph>Format - AutoCorrect - While Typing</emph>.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3147251" xml-lang="en-US" level="2" l10n="U" oldref="12">To remove a word from the AutoCorrect list:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Tools - AutoCorrect</emph>.<comment>name changed for SO8</comment></paragraph>
+<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="23">Click the <emph>Replace</emph> tab.</paragraph>
@@ -89,7 +86,8 @@
<paragraph role="heading" id="hd_id3145668" xml-lang="en-US" level="2" l10n="U" oldref="4">To stop replacing quotation marks:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3151196" xml-lang="en-US" l10n="CHG" oldref="6">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3151196" xml-lang="en-US" l10n="CHG" oldref="6">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151220" xml-lang="en-US" l10n="U" oldref="7">Click the <emph>Custom Quotes</emph> tab</paragraph>
@@ -101,7 +99,8 @@
<paragraph role="heading" id="hd_id3155076" xml-lang="en-US" level="2" l10n="U" oldref="8">To stop capitalizing the first letter of a sentence:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155099" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155099" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155123" xml-lang="en-US" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
@@ -114,7 +113,8 @@
<paragraph role="paragraph" id="par_id3155415" xml-lang="en-US" l10n="U" oldref="22">$[officename] automatically draws a line when you type three of the following characters and press Enter: - _ = * ~ #</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155439" xml-lang="en-US" l10n="CHG" oldref="19">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155439" xml-lang="en-US" l10n="CHG" oldref="19">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155463" xml-lang="en-US" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
index c7f6b0f456..5f381dc7f8 100755
--- a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_spellcheck.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_spellcheck.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideauto_spellcheckxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideauto_spellcheckxml" indexer="include">
<title id="tit" xml-lang="en-US">Automatically Check Spelling</title>
<filename>/text/swriter/guide/auto_spellcheck.xhp</filename>
</topic>
@@ -47,7 +45,8 @@
<bookmark_value>automatic spellcheck</bookmark_value>
<bookmark_value>checking spelling;while typing</bookmark_value>
<bookmark_value>words;disabling spellcheck</bookmark_value>
-</bookmark><comment>MW deleted "text;"</comment><paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
+</bookmark><comment>MW deleted "text;"</comment>
+<paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154664" xml-lang="en-US" l10n="U" oldref="5">You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line.</paragraph>
<paragraph role="heading" id="hd_id3154678" xml-lang="en-US" level="2" l10n="U" oldref="41">To check spelling automatically while you type:</paragraph>
@@ -59,12 +58,13 @@
<paragraph role="listitem" id="par_id3155569" xml-lang="en-US" l10n="U" oldref="33">Right-click a word with a red wavy underline, and then choose a suggested replacement word from the list, or from the <emph>AutoCorrect </emph>submenu.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="6">If you choose a word from the <emph>AutoCorrect</emph> submenu, the underlined word and the replacement word are automatically added to the <emph>AutoCorrect</emph> list for the current language. To view the <emph>AutoCorrect</emph> list, choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Replace</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="6">If you choose a word from the <emph>AutoCorrect</emph> submenu, the underlined word and the replacement word are automatically added to the <emph>AutoCorrect</emph> list for the current language. To view the <emph>AutoCorrect</emph> list, choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Replace</emph> tab.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147819" xml-lang="en-US" l10n="U" oldref="7">You can also add the underlined word to your custom dictionary by choosing <emph>Add</emph>.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
index 22eb148190..1cc56d54da 100644
--- a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
+++ b/helpcontent2/source/text/swriter/guide/autocorr_except.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autocorr_except.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideautocorr_exceptxml" indexer="exclude" status="PUBLISH">
+<topic id="textswriterguideautocorr_exceptxml" indexer="exclude">
<title id="tit" xml-lang="en-US">Adding Exceptions to the AutoCorrect List</title>
<filename>/text/swriter/guide/autocorr_except.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-05T10:16:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152887"><bookmark_value>AutoCorrect function; adding exceptions</bookmark_value>
@@ -58,13 +54,14 @@
<paragraph role="heading" id="hd_id3155554" xml-lang="en-US" level="2" l10n="U" oldref="12">To Add an Exception to the AutoCorrect Exceptions List</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155576" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Exceptions </emph>tab.</paragraph>
+<paragraph role="listitem" id="par_id3155576" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Exceptions </emph>tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147762" xml-lang="en-US" l10n="U" oldref="18">Do one of the following:</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147786" xml-lang="en-US" l10n="U" oldref="19">Type the abbreviation followed by a period in the <emph>Abbreviations (no subsequent capital) </emph>box and click <emph>New</emph>.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
index ee4827364f..1e1b9c6e47 100644
--- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_usage.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: footnote_usage.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidefootnote_usagexml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidefootnote_usagexml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting and Editing Footnotes or Endnotes</title>
<filename>/text/swriter/guide/footnote_usage.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:26:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145819"><bookmark_value>endnotes;inserting and editing</bookmark_value>
@@ -61,7 +57,7 @@
<paragraph role="listitem" id="par_id3155903" xml-lang="en-US" l10n="U" oldref="25">Click in your document where you want to place the anchor of the note.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147120" xml-lang="en-US" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3147120" xml-lang="en-US" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote/Endnote</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150937" xml-lang="en-US" l10n="U" oldref="34">In the <emph>Numbering </emph>area, select the format that you want to use. If you select <emph>Character</emph>, click the browse button (<emph>...</emph>) and select the character that you want to use for the footnote.</paragraph>
@@ -78,55 +74,56 @@
</list>
<table id="tbl_id3150745">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148843" xml-lang="en-US" l10n="E">
-<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="5.64mm" height="5.64mm"><alt id="alt_id3148857" xml-lang="en-US">Icon</alt>
+<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt id="alt_id3148857" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153176" xml-lang="en-US" l10n="CHG" oldref="27">You can also insert footnotes by clicking the <emph>Insert Footnote Directly</emph> icon on the <emph>Insert</emph> toolbar.</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="heading" id="hd_id3155543" xml-lang="en-US" level="2" l10n="U" oldref="28">Editing Footnotes or Endnotes</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155563" xml-lang="en-US" l10n="U" oldref="29">To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text.</paragraph>
</listitem>
</list>
<table id="tbl_id3155582">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150119" xml-lang="en-US" l10n="E">
-<image id="img_id3150126" src="res/helpimg/refhand.png" width="8.47mm" height="8.47mm"><alt id="alt_id3150126" xml-lang="en-US">Mouse hand cursor</alt>
+<image id="img_id3150126" src="res/helpimg/refhand.png" width="0.3335in" height="0.3335in"><alt id="alt_id3150126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150167" xml-lang="en-US" l10n="U" oldref="6">The mouse pointer changes to a hand when you rest it over a footnote or endnote anchor in your document.</paragraph>
</tablecell>
</tablerow>
</table>
-<list type="unordered">
+
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145029" xml-lang="en-US" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press F11 to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145062" xml-lang="en-US" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press <item type="keycode">PageUp</item>.</paragraph>
+<paragraph role="listitem" id="par_id3145062" xml-lang="en-US" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press PageUp.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote/Endnote</emph></link>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147776" xml-lang="en-US" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3147776" xml-lang="en-US" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147813" xml-lang="en-US" l10n="U" oldref="15">To edit the properties of the text area for footnotes or endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147232" xml-lang="en-US" l10n="U" oldref="41">To remove a footnote, delete the footnote anchor in the text.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
index 1750b6f5c6..443248f9d2 100644
--- a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/nonprintable_text.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: nonprintable_text.xhp,v $
- * $Revision: 1.4 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidenonprintable_textxhp" indexer="include" status="PUBLISH">
+<topic id="textswriterguidenonprintable_textxhp" indexer="include">
<title id="tit" xml-lang="en-US">Creating Non-printing Text</title>
<filename>/text/swriter/guide/nonprintable_text.xhp</filename>
</topic>
@@ -45,8 +43,10 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3148856"><bookmark_value>non-printing text</bookmark_value>
<bookmark_value>text; non-printable</bookmark_value>
-</bookmark><comment>mw copied two entries from hidden_text.xhp</comment><paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
-</variable></paragraph><comment>MW created this guide from hidden_text.xhp</comment><paragraph role="paragraph" id="par_id4685201" xml-lang="en-US" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
+</bookmark><comment>mw copied two entries from hidden_text.xhp</comment>
+<paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
+</variable></paragraph><comment>MW created this guide from hidden_text.xhp</comment>
+<paragraph role="paragraph" id="par_id4685201" xml-lang="en-US" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3149789" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Insert - Frame</emph>.</paragraph>
@@ -55,7 +55,7 @@
<paragraph role="listitem" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150242" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Format - Frame</emph>, and then click the<emph> Options</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3150242" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Format - Frame/Object</emph>, and then click the<emph> Options</emph> tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145227" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
index 4a1e775885..38e1354f96 100644
--- a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
+++ b/helpcontent2/source/text/swriter/guide/removing_line_breaks.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: removing_line_breaks.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideremoving_line_breaksxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideremoving_line_breaksxml" indexer="include">
<title id="tit" xml-lang="en-US">Removing Line Breaks</title>
<filename>/text/swriter/guide/removing_line_breaks.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:41:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149687"><bookmark_value>hard returns in pasted text</bookmark_value>
@@ -53,11 +49,13 @@
</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment>
<paragraph role="heading" id="hd_id3155916" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="removing_line_breaks"><link href="text/swriter/guide/removing_line_breaks.xhp">Removing Line Breaks</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use the AutoFormat feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
-<paragraph role="note" id="par_id3153413" xml-lang="en-US" l10n="U" oldref="3">This AutoFormat feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
+<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use the AutoCorrect feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
+<paragraph role="note" id="par_id3153413" xml-lang="en-US" l10n="U" oldref="3">This AutoCorrect feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - AutoCorrect.</emph>
+<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph>.</emph>
</paragraph>
</listitem>
<listitem>
@@ -73,7 +71,7 @@
<paragraph role="listitem" id="par_id3156253" xml-lang="en-US" l10n="CHG" oldref="8">In the <emph>Apply Style </emph>box on the <emph>Formatting</emph> bar, choose <emph>Default</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - AutoFormat - Apply</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp
index 765f187065..5c1cfd4106 100644
--- a/helpcontent2/source/text/swriter/guide/smarttags.xhp
+++ b/helpcontent2/source/text/swriter/guide/smarttags.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: smarttags.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidesmarttagsxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidesmarttagsxml" indexer="include">
<title id="tit" xml-lang="en-US">Using Smart Tags</title>
<filename>/text/swriter/guide/smarttags.xhp</filename>
</topic>
@@ -48,13 +46,14 @@
<bookmark_value>options;smart tags</bookmark_value>
<bookmark_value>disabling;smart tags</bookmark_value>
<bookmark_value>installing;smart tags</bookmark_value>
-</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment><paragraph role="heading" id="hd_id3563951" xml-lang="en-US" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
+</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment>
+<paragraph role="heading" id="hd_id3563951" xml-lang="en-US" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id368358" xml-lang="en-US" l10n="NEW">Smart Tags provide additional information and functionality to specified words in a Writer document. The available features can be different for different Smart Tags extensions.</paragraph>
<paragraph role="heading" id="hd_id9298379" xml-lang="en-US" level="2" l10n="NEW">Installing Smart Tags</paragraph>
<paragraph role="paragraph" id="par_id1827448" xml-lang="en-US" l10n="NEW">Smart Tags can be supplied as <link href="text/shared/01/packagemanager.xhp">extensions</link> to %PRODUCTNAME Writer. </paragraph>
<paragraph role="paragraph" id="par_id2508621" xml-lang="en-US" l10n="NEW">To install a Smart Tag, do one of the following:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3856013" xml-lang="en-US" l10n="NEW">Save the *.oxt extension file to your harddrive, then double-click the *.oxt file in your file manager. Alternatively, in %PRODUCTNAME choose <item type="menuitem">Tools - Extension Manager</item> to open the Extension Manager, click Add and browse to the file.</paragraph>
</listitem>
@@ -65,9 +64,9 @@
<paragraph role="heading" id="hd_id8142338" xml-lang="en-US" level="2" l10n="NEW">Smart Tags menu</paragraph>
<paragraph role="paragraph" id="par_id1917477" xml-lang="en-US" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem">Tools - Options - %PRODUCTNAME - Appearance</item>.</paragraph>
<paragraph role="paragraph" id="par_id192266" xml-lang="en-US" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
-<paragraph role="paragraph" id="par_id1998962" xml-lang="en-US" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect.</paragraph>
+<paragraph role="paragraph" id="par_id1998962" xml-lang="en-US" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
<paragraph role="heading" id="hd_id2376476" xml-lang="en-US" level="2" l10n="NEW">To enable and disable Smart Tags</paragraph>
-<paragraph role="paragraph" id="par_id349131" xml-lang="en-US" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
+<paragraph role="paragraph" id="par_id349131" xml-lang="en-US" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect Options</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
<paragraph role="note" id="par_id1216467" xml-lang="en-US" l10n="NEW">Text that is recognized as a Smart Tag is not checked by the automatic spellcheck.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/text_centervert.xhp b/helpcontent2/source/text/swriter/guide/text_centervert.xhp
index f098f4c5da..45949dd945 100644
--- a/helpcontent2/source/text/swriter/guide/text_centervert.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_centervert.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.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: text_centervert.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* 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="textswriterguidetext_centervertxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_centervertxml" indexer="include">
<title id="tit" xml-lang="en-US">Using a Frame to Center Text on a Page</title>
<filename>/text/swriter/guide/text_centervert.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T08:38:32">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155177"><bookmark_value>text frames; centering on pages</bookmark_value>
@@ -71,7 +67,7 @@
<paragraph role="listitem" id="par_id3153410" xml-lang="en-US" l10n="U" oldref="97">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3149615" xml-lang="en-US" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <emph>Format - Frame</emph>. Click the <emph>Borders</emph> tab, and then click in the<emph> Set No Border</emph> box in the<emph> Line Arrangement</emph> area.</paragraph>
+<paragraph role="note" id="par_id3149615" xml-lang="en-US" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <emph>Format - Frame/Object</emph>. Click the <emph>Borders</emph> tab, and then click in the<emph> Set No Border</emph> box in the<emph> Line Arrangement</emph> area.</paragraph>
<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="83">To resize the frame, drag the edges of the frame.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp
index a21a565937..27ce10a933 100644
--- a/helpcontent2/source/text/swriter/guide/text_frame.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_frame.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.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: text_frame.xhp,v $
- *
- * $Revision: 1.16 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textswriterguidetext_framexml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_framexml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting, Editing, and Linking Text Frames</title>
<filename>/text/swriter/guide/text_frame.xhp</filename>
</topic>
@@ -84,7 +82,7 @@
<paragraph role="listitem" id="par_id3154858" xml-lang="en-US" l10n="U" oldref="100">Select the text frame (you see the eight handles).</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155875" xml-lang="en-US" l10n="U" oldref="101">Choose <emph>Format - Frame - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155875" xml-lang="en-US" l10n="U" oldref="101">Choose <emph>Format - Frame/Object - Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155899" xml-lang="en-US" l10n="U" oldref="102">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
@@ -98,7 +96,7 @@
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3150223" xml-lang="en-US" l10n="CHG" oldref="87">On the <emph>Frame</emph> Bar, click the <emph>Link Frames</emph> icon
-<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt id="alt_id3148968" xml-lang="en-US">Icon</alt>
+<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt id="alt_id3148968" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index 40c9eaa09b..d498dfd623 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.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.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideword_completionxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideword_completionxml" indexer="include">
<title id="tit" xml-lang="en-US">Word Completion for Text Documents</title>
<filename>/text/swriter/guide/word_completion.xhp</filename>
</topic>
@@ -52,12 +50,17 @@
<bookmark_value>deactivating;word completion</bookmark_value>
<bookmark_value>refusing word completions</bookmark_value>
<bookmark_value>rejecting word completions</bookmark_value>
-</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
+</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
+<<<<<<< .working
+<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press Ctrl+Tab to cycle through the available words. To cycle in the opposite direction, press Ctrl+Shift+Tab. </paragraph>
+=======
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
+>>>>>>> .merge-right.r265757
<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10794" xml-lang="en-US" l10n="NEW">By default, you accept the word completion by pressing the Enter key. </paragraph>
</listitem>
@@ -68,7 +71,9 @@
<paragraph role="heading" id="par_idN1079E" xml-lang="en-US" level="2" l10n="NEW"> Switching off the word completion </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect - Word Completion</emph> . </paragraph>
+<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph> - Word Completion</emph> . </paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN107AD" xml-lang="en-US" l10n="NEW"> Clear <emph>Enable word completion</emph> . </paragraph>
diff --git a/helpcontent2/source/text/swriter/main0102.xhp b/helpcontent2/source/text/swriter/main0102.xhp
index 09e749abd8..df834912aa 100755
--- a/helpcontent2/source/text/swriter/main0102.xhp
+++ b/helpcontent2/source/text/swriter/main0102.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.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0102.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0102xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0102xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit</title>
<filename>/text/swriter/main0102.xhp</filename>
</topic>
</meta>
<body>
<section id="bearbeiten">
-<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id8177739" localize="false"/><paragraph role="heading" id="hd_id3149610" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0102.xhp" name="Edit">Edit</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id8177739" localize="false"/>
+<paragraph role="heading" id="hd_id3149610" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0102.xhp" name="Edit">Edit</link></paragraph>
<paragraph role="paragraph" id="par_id3149626" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for editing the contents of the current document.</ahelp></paragraph>
</section>
<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
@@ -64,7 +63,6 @@
<embed href="text/shared/01/02240000.xhp#dokver"/>
<paragraph role="heading" id="hd_id3147816" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link></paragraph>
<embed href="text/shared/01/02100000.xhp#suchenersetzentext"/>
-<embed href="text/swriter/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/02120000.xhp" name="AutoText">AutoText</link></paragraph>
<embed href="text/swriter/01/02120000.xhp#autotexttext"/>
<paragraph role="heading" id="hd_id3147251" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/swriter/01/04180400.xhp" name="Exchange Database">Exchange Database</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp
index c9c248921e..00b1034574 100755
--- a/helpcontent2/source/text/swriter/main0103.xhp
+++ b/helpcontent2/source/text/swriter/main0103.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.
*
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0103xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0103xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/swriter/main0103.xhp</filename>
</topic>
</meta>
<body>
<section id="ansicht">
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id7882320" localize="false"/><paragraph role="heading" id="hd_id3147233" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0103.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id7882320" localize="false"/>
+<paragraph role="heading" id="hd_id3147233" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0103.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3147249" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for controlling the on-screen display of the document.</ahelp></paragraph>
</section>
<embed href="text/swriter/01/03130000.xhp#drucklayout"/>
@@ -59,6 +58,7 @@
<embed href="text/swriter/01/03100000.xhp#steuerzeichen"/>
<embed href="text/swriter/01/03140000.xhp#versteckteabs"/>
<embed href="text/shared/01/04180100.xhp#datenanzeige"/>
+<embed href="text/swriter/01/02110000.xhp#navigator"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp
index 086ffcdec4..5b79e2079b 100755
--- a/helpcontent2/source/text/swriter/main0104.xhp
+++ b/helpcontent2/source/text/swriter/main0104.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.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0104.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0104xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0104xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert</title>
<filename>/text/swriter/main0104.xhp</filename>
</topic>
</meta>
<body>
<section id="einfuegen">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/>
+<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, notes, special characters, graphics, and objects from other applications.</ahelp></paragraph>
</section>
<paragraph role="heading" id="hd_id3155376" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/swriter/01/04010000.xhp" name="Manual Break">Manual Break</link></paragraph>
@@ -59,7 +58,7 @@
<embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
<embed href="text/swriter/01/04220000.xhp#kopfzeile"/>
<embed href="text/swriter/01/04230000.xhp#fusszeile"/>
-<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/04030000.xhp" name="Footnote">Footnote</link></paragraph>
+<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/04030000.xhp" name="Footnote">Footnote/Endnote</link></paragraph>
<embed href="text/swriter/01/04030000.xhp#fussnoteein"/>
<paragraph role="heading" id="hd_id3147256" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/swriter/01/04060000.xhp" name="Caption">Caption</link></paragraph>
<embed href="text/swriter/01/04060000.xhp#beschrifttext"/>
diff --git a/helpcontent2/source/text/swriter/main0106.xhp b/helpcontent2/source/text/swriter/main0106.xhp
index 1d5524729f..75b6b54b22 100755
--- a/helpcontent2/source/text/swriter/main0106.xhp
+++ b/helpcontent2/source/text/swriter/main0106.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,25 +32,23 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0106xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0106xml" indexer="include">
<title id="tit" xml-lang="en-US">Tools</title>
<filename>/text/swriter/main0106.xhp</filename>
</topic>
</meta>
<body>
<section id="extras">
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id8101443" localize="false"/><paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0106.xhp" name="Tools">Tools</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id8101443" localize="false"/>
+<paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0106.xhp" name="Tools">Tools</link></paragraph>
<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Contains spelling tools, a gallery of object art that you can add to your document, as well as tools for configuring menus, and setting program preferences.</ahelp></paragraph>
</section>
<embed href="text/shared/01/06990000.xhp#rechtschreibung"/>
<embed href="text/shared/01/06010500.xhp#language"/>
<embed href="text/swriter/01/06040000.xhp#wordcount"/>
-<paragraph role="heading" id="hd_id3149939" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
-<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/swriter/01/06060000.xhp" name="Outline Numbering">Outline Numbering</link></paragraph>
<embed href="text/swriter/01/06060000.xhp#kapnum"/>
<paragraph role="heading" id="hd_id3145688" xml-lang="en-US" level="2" l10n="U" oldref="15"><link href="text/swriter/01/06180000.xhp" name="Line Numbering">Line Numbering</link></paragraph>
@@ -70,6 +67,8 @@
<embed href="text/shared/01/06130001.xhp#macro"/>
<embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
<embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<paragraph role="heading" id="hd_id3149939" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect Options</link></paragraph>
+<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3147406" xml-lang="en-US" level="2" l10n="CHG" oldref="14"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
<embed href="text/shared/01/06140000.xhp#anpassen"/>
<embed href="text/shared/optionen/01000000.xhp#optionen"/>