summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
commit5ccd1d319b38120437fe69a3b6884e00cf22ee4e (patch)
tree3fbc437a38c99a98250c39533659836eeae1c4c9 /helpcontent2/source/text/shared
parentf01f267f5bf6a19106771b39ad3253913efb0001 (diff)
CWS-TOOLING: integrate CWS hcshared19
Diffstat (limited to 'helpcontent2/source/text/shared')
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp133
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000005.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000021.xhp12
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp110
-rw-r--r--helpcontent2/source/text/shared/00/00000402.xhp20
-rw-r--r--helpcontent2/source/text/shared/00/00000403.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp60
-rw-r--r--helpcontent2/source/text/shared/00/00040501.xhp14
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/01/01010100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01050000.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100100.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100300.xhp56
-rw-r--r--helpcontent2/source/text/shared/01/01110100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01110101.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01130000.xhp100
-rw-r--r--helpcontent2/source/text/shared/01/01160200.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/02070000.xhp109
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp119
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100100.xhp24
-rw-r--r--helpcontent2/source/text/shared/01/02230401.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/03110000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/03990000.xhp72
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/05020100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp615
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030300.xhp62
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030700.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/01/05040200.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05040300.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05040400.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05070000.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/05070100.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/05070200.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05070300.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/05070400.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05070500.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05070600.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05100100.xhp77
-rw-r--r--helpcontent2/source/text/shared/01/05100200.xhp89
-rw-r--r--helpcontent2/source/text/shared/01/05100500.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/05100600.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/05100700.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/01/05110000.xhp3
-rw-r--r--helpcontent2/source/text/shared/01/05110600.xhp62
-rw-r--r--helpcontent2/source/text/shared/01/05110600m.xhp76
-rw-r--r--helpcontent2/source/text/shared/01/05120600.xhp76
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200200.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200300.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210300.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210400.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210500.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05250000.xhp24
-rw-r--r--helpcontent2/source/text/shared/01/05250200.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05250300.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05260000.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/05260100.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05260300.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05260600.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/05340400.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05350500.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/06010000.xhp39
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010500.xhp43
-rw-r--r--helpcontent2/source/text/shared/01/06040200.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/06040300.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/06050600.xhp12
-rw-r--r--helpcontent2/source/text/shared/01/06130000.xhp115
-rw-r--r--helpcontent2/source/text/shared/01/06130010.xhp56
-rw-r--r--helpcontent2/source/text/shared/01/06140200.xhp54
-rw-r--r--helpcontent2/source/text/shared/01/06150000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/08060100.xhp29
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp43
-rw-r--r--helpcontent2/source/text/shared/01/gallery.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/grid.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/guides.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/makefile.mk10
-rwxr-xr-xhelpcontent2/source/text/shared/01/packagemanager.xhp16
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp53
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp18
-rw-r--r--helpcontent2/source/text/shared/01/selectcertificate.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/xformsdata.xhp126
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp223
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170004.xhp10
-rw-r--r--helpcontent2/source/text/shared/02/01170100.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/01170101.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/01170102.xhp321
-rw-r--r--helpcontent2/source/text/shared/02/01170600.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170802.xhp32
-rw-r--r--helpcontent2/source/text/shared/02/01170900.xhp30
-rw-r--r--helpcontent2/source/text/shared/02/01230000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/03200000.xhp20
-rw-r--r--helpcontent2/source/text/shared/02/04210000.xhp81
-rw-r--r--helpcontent2/source/text/shared/02/06100000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/06110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07080000.xhp37
-rw-r--r--helpcontent2/source/text/shared/02/10100000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/12100200.xhp155
-rw-r--r--helpcontent2/source/text/shared/02/13020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20050000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/24100000.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/shared/02/paintbrush.xhp32
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp590
-rwxr-xr-xhelpcontent2/source/text/shared/04/01020000.xhp28
-rw-r--r--helpcontent2/source/text/shared/04/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000001.xhp25
-rw-r--r--helpcontent2/source/text/shared/05/00000110.xhp6
-rw-r--r--helpcontent2/source/text/shared/05/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/07/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autokorr/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autopi/01010000.xhp37
-rw-r--r--helpcontent2/source/text/shared/autopi/01020000.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090100.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090210.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120000.xhp57
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01130000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170000.xhp64
-rw-r--r--helpcontent2/source/text/shared/autopi/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autopi/startup.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard00.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05020000.xhp26
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11030000.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp51
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz00.xhp39
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz01.xhp38
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp28
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp20
-rw-r--r--helpcontent2/source/text/shared/explorer/database/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard00.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard01.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard05.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard00.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard01.xhp41
-rwxr-xr-xhelpcontent2/source/text/shared/guide/aaa_start.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/autohide.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/breaking_lines.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/copytext2application.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_addressbook.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/data_search2.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/digital_signatures.xhp72
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp51
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_gallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_graphic.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/filternavigator.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/floating_toolbar.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/gallery_insert.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_edit.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp30
-rw-r--r--helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp142
-rwxr-xr-xhelpcontent2/source/text/shared/guide/insert_specialchar.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp52
-rw-r--r--helpcontent2/source/text/shared/guide/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/shared/guide/microsoft_terms.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_doctypes.xhp30
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp327
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp65
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_accept.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp83
-rw-r--r--helpcontent2/source/text/shared/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010301.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01010400.xhp91
-rw-r--r--helpcontent2/source/text/shared/optionen/01010500.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01040600.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01041000.xhp60
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp91
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060400.xhp24
-rw-r--r--helpcontent2/source/text/shared/optionen/01070500.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp12
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp26
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk2
192 files changed, 4181 insertions, 3272 deletions
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index 66fc69776f..f0840beb2e 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000001.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000001xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000001xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Frequently-Used Buttons</title>
<filename>/text/shared/00/00000001.xhp</filename>
</topic>
@@ -45,10 +43,21 @@
<body>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">Frequently-Used Buttons</paragraph>
<section id="abbrechen">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDCANCEL" id="bm_id4245124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CANCEL" id="bm_id7074800" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CANCEL" id="bm_id833765" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_CANCEL" id="bm_id7899105" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_CANCEL" id="bm_id3149183" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/>
<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="4">Cancel</paragraph>
<paragraph role="paragraph" id="par_id3155913" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
</section>
<section id="finish">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/>
<paragraph role="heading" id="hd_id2341685" xml-lang="en-US" level="2" l10n="NEW">Finish</paragraph>
<paragraph role="paragraph" id="par_id6909390" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
</section>
@@ -58,7 +67,7 @@
</section>
<section id="drehfeld">
<paragraph role="heading" id="hd_id3152414" xml-lang="en-US" level="2" l10n="CHG" oldref="79">Spin button</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1094088" xml-lang="en-US" l10n="NEW">In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally.</paragraph>
</listitem>
@@ -76,15 +85,39 @@
<section id="kontextmenue">
<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="2" l10n="U" oldref="42">Context Menu</paragraph>
<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="44"><variable id="context">To activate the context menu of an object, first click the object with the <switchinline select="sys"><caseinline select="MAC">
-</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again
-</caseinline><defaultinline>click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].
-</variable></paragraph>
+</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again</caseinline><defaultinline> click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].</variable></paragraph>
</section>
<section id="loeschen">
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE" id="bm_id3153839" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_REMOVE" id="bm_id3150089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE" id="bm_id3143232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE" id="bm_id3214514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_DELETE" id="bm_id3145749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_DELETE" id="bm_id3150443" localize="false"/>
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="24">Delete</paragraph>
<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid=".">Deletes the selected element or elements after confirmation.</ahelp></paragraph>
</section>
<section id="loeschen1">
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_REMOVE" id="bm_id3147296" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_BIB_BASE_PB_DELETE" id="bm_id6168401" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id3154821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id3154810" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id3153257" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELABBREV" id="bm_id5413373" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="2" l10n="U" oldref="45">Delete</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
</section>
@@ -101,51 +134,95 @@
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid=".">Closes the dialog.</ahelp></paragraph>
</section>
<section id="uebernehmen">
+<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_2" id="bm_id3149053" localize="false"/>
<paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="2" l10n="U" oldref="16">Apply</paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Applies the modified or selected values without closing the dialog.</ahelp></paragraph>
</section>
<section id="eingabesymbol">
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA" id="bm_id3155067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_FORMULARANGE" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_ROWCELL" id="bm_id3149019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_COLCELL" id="bm_id3153712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_FORMULACELL" id="bm_id3153364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_VARCELL" id="bm_id3153363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_PRINTAREA" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATROW" id="bm_id3146975" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATCOL" id="bm_id3154321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_NAMES:RB_ASSIGN" id="bm_id3159155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" id="bm_id3153190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF" id="bm_id3154488" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF1" id="bm_id3146981" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF2" id="bm_id3146111" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF3" id="bm_id3146114" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF4" id="bm_id3156290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FILTER:RB_COPY_AREA" id="bm_id3150010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" id="bm_id3146985" localize="false"/>
<paragraph role="heading" id="hd_id3153760" xml-lang="en-US" level="2" l10n="U" oldref="47">Shrink / Maximize</paragraph>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid=".">Click the<emph> Shrink </emph>icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the <emph>Maximize</emph> icon. Click it to restore the dialog to its original size.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155062" xml-lang="en-US" l10n="U" oldref="49">The dialog is automatically minimized when you click into a sheet with the mouse. As soon as you release the mouse button, the dialog is restored and the reference range defined with the mouse is highlighted in the document by a blue frame.</paragraph>
<table id="tbl_id3148473">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="E">
-<image id="img_id3148685" src="sc/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3148685" xml-lang="en-US">Icon</alt>
+<image id="img_id3148685" src="sc/res/refinp1.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148685" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="50">Shrink</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="E">
-<image id="img_id3149784" src="sc/res/refinp2.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3149784" xml-lang="en-US">Icon</alt>
+<image id="img_id3149784" src="sc/res/refinp2.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149784" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="51">Maximize</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="vorschau">
+<bookmark xml-lang="en-US" branch="hid/HID_MEASURE_CTL_PREVIEW" id="bm_id3157970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PREVIEW" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="2" l10n="U" oldref="34">Preview Field</paragraph>
<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Displays a preview of the current selection.</ahelp></paragraph>
</section>
<section id="weiterautopi">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDNEXT" id="bm_id8281197" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_NEXT" id="bm_id4154179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_NEXT" id="bm_id1058076" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_NEXT" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_NEXT" id="bm_id3155135" localize="false"/>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="70">Next</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the Wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
</section>
<section id="zurueck">
<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id3144422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id4539933" localize="false"/><paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="13">Back<comment>in Tools - Options</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id4539933" localize="false"/>
+<paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="13">Back<comment>in Tools - Options</comment></paragraph>
<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK">Resets modified values back to the $[officename] default values.</ahelp></paragraph>
</section>
<section id="zurueck2">
-<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_RESET_BTN" id="bm_id3151054" localize="false"/><paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_RESET_BTN" id="bm_id3151054" localize="false"/>
+<paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
<paragraph role="paragraph" id="par_id3149651" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_TABDLG_RESET_BTN">Resets changes made to the current tab to those applicable when this dialog was opened. A confirmation query does not appear when you close the dialog.</ahelp></paragraph>
</section>
<section id="zuruecksetzen">
@@ -155,11 +232,21 @@
</section>
<section id="standard">
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_STD_FONT_PB_STANDARD" id="bm_id481887" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_STANDARD_BTN" id="bm_id3157322" localize="false"/><paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_STANDARD_BTN" id="bm_id3157322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_COPY_BTN_SET_DEFAULT" id="bm_id3083280" localize="false"/>
+<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_TABDLG_STANDARD_BTN">Resets the values visible in the dialog back to the default installation values.</ahelp></paragraph>
<paragraph role="warning" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="12">A confirmation does not appear before the defaults are reloaded.</paragraph>
</section>
<section id="zurueckautopi">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPREV" id="bm_id1064180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BACK" id="bm_id3681447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_PREVIOUS" id="bm_id5176244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_PREV" id="bm_id1207617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_PREVIOUS" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_PREVIOUS" id="bm_id3156155" localize="false"/>
<paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="2" l10n="U" oldref="72">Back</paragraph>
<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="HID_TABDLG_STANDARD_BTN">View the selections in the dialog made in the previous step. The current settings remain unchanged.</ahelp> This button can only be activated from page two on.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index c6c75fe7d7..d56be6eafa 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000005.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -118,20 +118,17 @@
<paragraph xml-lang="en-US" id="hd_id3150439" role="heading" level="2" l10n="U" oldref="156">Direct and Style Formatting</paragraph>
<paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="34">If you format a document without Styles, it is referred to as "direct" formatting. This means modifying text or other objects, such as frames or tables, by applying various attributes directly. The format applies only to the selected area and all changes must be made separately. Styles, on the other hand, are not applied to the text directly, but rather are defined in the Styles and Formatting window and then applied. One advantage is that when you change a Style, all parts of the document to which that Style is assigned are modified at the same time.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Default Formatting</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Default Formatting</emph>.</paragraph>
</section>
<section id="andocken">
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>windows; docking definition</bookmark_value>
<bookmark_value>docking; definition</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="2" l10n="U" oldref="6">Docking</paragraph>
<paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the Ctrl key.
+ <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key.
</variable></paragraph>
</section>
@@ -290,7 +287,6 @@
</section>
<section id="drehfeld">
- <paragraph xml-lang="en-US" id="par_idN1109D" role="heading" level="2" l10n="CHG">Spin Button</paragraph>
<embed href="text/shared/00/00000001.xhp#drehfeld"/>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index a3c29d93ea..77d406e68e 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 00000021.xhp,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.23.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0000000021xml" indexer="include">
+<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">XML File Formats</title>
<filename>/text/shared/00/00000021.xhp</filename>
</topic>
@@ -176,14 +176,6 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id9824823" xml-lang="en-US" l10n="NEW">ODF Database Report</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2716452" xml-lang="en-US" l10n="NEW">*.orp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 5118e54e8d..560fec4726 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000401.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000401xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000401xml" indexer="exclude">
<title id="tit" xml-lang="en-US">File Menu</title>
<filename>/text/shared/00/00000401.xhp</filename>
</topic>
@@ -54,25 +52,24 @@
<section id="neutextdoc">
<table id="tbl_id3149741">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150127" xml-lang="en-US" l10n="E">
-<image id="img_id3156053" src="res/sx03251.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156053" xml-lang="en-US">Icon</alt>
+<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154232" xml-lang="en-US" l10n="U" oldref="199">New</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="179">Key <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
+<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="179">Key <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</section>
<section id="neuvundd">
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="82">Menu <emph>File - New</emph>
<emph>- Templates and Documents</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
+<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="U" oldref="160"><variable id="etiketten">Choose <emph>File - New - Labels</emph>
</variable></paragraph>
@@ -99,22 +96,22 @@
<section id="oeffnen">
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Open</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
+<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="8">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syoeffnen">
<table id="tbl_id3150117">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="E">
-<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
+<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156003" xml-lang="en-US" l10n="U" oldref="9">Open File</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="ascii">
@@ -135,7 +132,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="CHG" oldref="115"><variable id="autopilotbrief5">Choose <emph>File - Wizards - Letter - Footer</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="CHG" oldref="116"><variable id="autopilotbrief6">Choose <emph>File - Wizards - Letter - Name and Location</emph>
+<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="CHG" oldref="116"><variable id="autopilotbrief6">Choose <emph>File - Wizards - Letter - </emph>
+<emph>Name and Location</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="120"><variable id="autopilotfax">Choose <emph>File - Wizards - Fax</emph>
</variable></paragraph>
@@ -219,37 +217,38 @@
<section id="save">
<paragraph role="paragraph" id="par_id3156717" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>File - Save</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147533" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
+<paragraph role="paragraph" id="par_id3147533" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US" l10n="CHG" oldref="11">On Standard or Table Data Bar, click</paragraph>
<section id="sysave">
<table id="tbl_id3150120">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156712" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
+<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="CHG" oldref="12">Save</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="sysaveas">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10F11" xml-lang="en-US" l10n="NEW">
-<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id8276619" xml-lang="en-US">icon</alt>
+<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10F2E" xml-lang="en-US" l10n="NEW">Save As</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="78"><variable id="gifspeichern">Choose <emph>File - Save As</emph>, if GIF selected as file type, dialog opens automatically
</variable></paragraph>
@@ -303,7 +302,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="63"><variable id="info3">Choose <emph>File - Properties - Description</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="U" oldref="64"><variable id="info4">Choose <emph>File - Properties - User Defined</emph> tab
+<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="info4">Choose <emph>File - Properties - Custom Properties</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="65"><variable id="info5">Choose <emph>File - Properties - Statistics</emph> tab
</variable></paragraph>
@@ -319,7 +318,7 @@
</paragraph>
</section>
<section id="voradzuadmi">
-<paragraph role="paragraph" id="par_id3154386" xml-lang="en-US" l10n="U" oldref="177">Menu <emph>File - Templates - Address Book Source, </emph>then <emph>Administrate</emph> button</paragraph>
+<paragraph role="paragraph" id="par_id3154386" xml-lang="en-US" l10n="U" oldref="177">Menu <emph>File - Templates - Address Book Source, </emph>then <emph>Configure</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="CHG" oldref="189"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>View</emph> - <emph>Data sources</emph>
</caseinline><caseinline select="CALC">Choose <emph>View</emph> - <emph>Data sources</emph>
</caseinline></switchinline></paragraph>
@@ -334,16 +333,17 @@
<section id="syansicht">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11366" xml-lang="en-US" l10n="NEW">
-<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id2603534" xml-lang="en-US">icon</alt>
+<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11384" xml-lang="en-US" l10n="NEW">Page Preview</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="drucker">
@@ -360,16 +360,17 @@
<section id="sysendmail">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN113AB" xml-lang="en-US" l10n="NEW">
-<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id4044007" xml-lang="en-US">icon</alt>
+<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN113C8" xml-lang="en-US" l10n="NEW">Document as E-mail</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3145269" xml-lang="en-US" l10n="U" oldref="222"><variable id="export">Choose <emph>File - Export</emph>
@@ -380,16 +381,17 @@
<section id="syexportpdf">
<table id="tbl_id3154992">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="E">
-<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
+<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155763" xml-lang="en-US" l10n="U" oldref="220">Export Directly as PDF</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="pdf">
@@ -401,45 +403,47 @@
<section id="drucken">
<paragraph role="paragraph" id="par_id3149951" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>File - Print</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155259" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
+<paragraph role="paragraph" id="par_id3155259" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
<paragraph role="paragraph" id="par_id3153830" xml-lang="en-US" l10n="U" oldref="3">On Standard Bar, click</paragraph>
<section id="sydrucken">
<table id="tbl_id3152889">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="E">
-<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
+<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="4">Print File Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<switch select="appl">
-<case select="WRITER"><paragraph role="paragraph" id="par_id3153581" xml-lang="en-US" l10n="U" oldref="5">On the <emph>Page View</emph>
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3153581" xml-lang="en-US" l10n="U" oldref="5">On the <emph>Page View</emph>
<emph>Bar</emph> of a text document, click</paragraph>
<table id="tbl_id3150699">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153068" xml-lang="en-US" l10n="E">
-<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
+<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151239" xml-lang="en-US" l10n="U" oldref="6">Print Page Preview</paragraph>
</tablecell>
</tablerow>
</table>
+
</case>
-</switch></section>
+</switch>
+</section>
<section id="beenden">
<paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>File - Exit</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="86"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
+<paragraph role="paragraph" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="86"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149328" xml-lang="en-US" l10n="U" oldref="75"><variable id="neuglobal">Choose <emph>File - New - Master Document</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index f2f1bf335c..96a06dd7c1 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000402.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,8 +47,7 @@
<section id="do">
<paragraph role="paragraph" id="par_id3085157" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>Edit - Undo</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="564"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
+<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="564"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
<paragraph role="paragraph" id="par_id3154094" xml-lang="en-US" l10n="CHG" oldref="3">On the <emph>Standard</emph> Bar or Table Data bar, click</paragraph>
<section id="syrueckgaengig">
<table id="tbl_id3145226">
@@ -91,8 +90,7 @@
<section id="cut">
<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Edit - Cut</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="565"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
+<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="565"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
<paragraph role="paragraph" id="par_id3148744" xml-lang="en-US" l10n="U" oldref="10">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syausschneiden">
<table id="tbl_id3154218">
@@ -113,8 +111,7 @@
<section id="copy">
<paragraph role="paragraph" id="par_id3150742" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Edit - Copy</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="566"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
+<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="566"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="13">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="sykopieren">
<table id="tbl_id3147299">
@@ -135,8 +132,7 @@
<section id="insert">
<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Paste</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="567"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
+<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="567"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
<paragraph role="paragraph" id="par_id3159083" xml-lang="en-US" l10n="U" oldref="16">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syeinfuegen">
<table id="tbl_id3147217">
@@ -159,8 +155,7 @@
<section id="alles">
<paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="U" oldref="533">Choose <emph>Edit - Select All</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="568"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
+<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="568"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
<section id="syallesau">
<table id="tbl_id3145271">
<tablerow>
@@ -206,8 +201,7 @@
<section id="suchen">
<paragraph role="paragraph" id="par_id3156297" xml-lang="en-US" l10n="U" oldref="49">Choose <emph>Edit - Find &amp; Replace</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="569"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
+<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="569"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
<paragraph role="paragraph" id="par_id3155083" xml-lang="en-US" l10n="U" oldref="456">On Standard bar, click</paragraph>
<section id="sysuchenersetzen">
<table id="tbl_id3156320">
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp b/helpcontent2/source/text/shared/00/00000403.xhp
index 9aba456396..497c8b5bda 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000403.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -83,8 +83,7 @@
<section id="ganzer">
<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>View - Full Screen</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="25">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="25">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
<switch select="appl">
<case select="WRITER">
<section id="syfullscreen">
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 91f1196cfa..1416163299 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000406.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.4 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000406xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
<filename>/text/shared/00/00000406.xhp</filename>
</topic>
@@ -49,38 +47,40 @@
<section id="sygallery">
<table id="tbl_id3147273">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_gallery.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_gallery.png" width="0.1665in" height="0.1665in"><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_id3153551" xml-lang="en-US" l10n="U" oldref="127">Gallery</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab
</variable></paragraph>
<section id="rechtschreibung">
-<paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spellcheck</emph>
+<paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spelling and Grammar</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="69">F7 key</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="3">On <emph>Standard</emph> bar, click</paragraph>
<section id="syrechtschreibung">
<table id="tbl_id3150117">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
+<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>
-<tablecell colspan="" rowspan="">
-<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>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
@@ -89,9 +89,9 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1071E" xml-lang="en-US" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spellcheck</emph>
+<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spelling and Grammar</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spellcheck</emph>, then click <emph>Options</emph>
+<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spelling and Grammar</emph>, then click <emph>Options</emph>
</variable></paragraph>
<section id="thesaurus">
<paragraph role="paragraph" id="par_id3151338" xml-lang="en-US" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
@@ -104,7 +104,8 @@
</section>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
</variable></paragraph>
-<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 <item type="keycode">Alt+F11</item> (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)
</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>
@@ -130,7 +131,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10919" xml-lang="en-US" l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>Menu - Move</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab
+<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
</variable></paragraph>
@@ -139,7 +140,7 @@
<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</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>
-<emph>- Options</emph> tab
+<emph>- Options</emph>tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose Tools - AutoCorrect- Smart Tags tab
</variable></paragraph>
@@ -198,16 +199,17 @@
<section id="farbdial">
<table id="tbl_id3152374">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="svx/res/colordlg.png" width="0.1661inch" height="0.1661inch"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
+<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151037" xml-lang="en-US" l10n="U" oldref="68">Select color on the <emph>Color</emph> tab page</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="72"><variable id="schriers">Choose <emph>Tools - Options - $[officename] - Fonts</emph>
@@ -230,7 +232,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph>Tools - Options - Load/Save</emph> - <emph>Microsoft Office</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145667" xml-lang="en-US" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML Compatibility</emph>
+<paragraph role="paragraph" id="par_id3145667" xml-lang="en-US" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML </emph>
+<emph>Compatibility</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph>Tools - Options - Language Settings</emph>
</variable></paragraph>
@@ -282,7 +285,7 @@
</section>
<paragraph role="paragraph" id="par_id3155607" xml-lang="en-US" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph>Tools - Options - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3988769" xml-lang="en-US" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
+<paragraph role="paragraph" id="par_id3988769" xml-lang="en-US" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
@@ -304,7 +307,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph>
+<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>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 17709de810..1ab3dfc39d 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00040501.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -275,8 +275,7 @@
<section id="vorn">
<paragraph role="paragraph" id="par_id3148459" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Arrange - Bring to Front</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148425" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Modify - Arrange - Bring to Front</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="89">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="89">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154206" xml-lang="en-US" l10n="U" oldref="126">Open context menu - choose <emph>Arrange - Bring to Front</emph> ($[officename] Impress)</paragraph>
<section id="syganznachvorn">
<table id="tbl_id3150306">
@@ -297,8 +296,7 @@
<section id="nachvorn">
<paragraph role="paragraph" id="par_id3147092" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Format - Arrange - Bring Forward</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148396" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Modify - Arrange - Bring Forward</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="127">Open context menu - choose <emph>Arrange - Bring Forward</emph> ($[officename] Impress)</paragraph>
<table id="tbl_id3149337">
<tablerow>
@@ -317,8 +315,7 @@
<section id="nachhinten">
<paragraph role="paragraph" id="par_id3154815" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Format - Arrange - Send Backward</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Modify - Arrange - Send Backward</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="91"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="91"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3159107" xml-lang="en-US" l10n="U" oldref="128">Open context menu - choose <emph>Arrange - Send Backward</emph> ($[officename] Impress)</paragraph>
<table id="tbl_id3154131">
<tablerow>
@@ -337,8 +334,7 @@
<section id="ganzhinten">
<paragraph role="paragraph" id="par_id3149493" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Arrange - Send to Back</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148595" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Modify - Arrange - Send to Back</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3150690" xml-lang="en-US" l10n="U" oldref="92">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3150690" xml-lang="en-US" l10n="U" oldref="92">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="129">Open context menu - choose <emph>Arrange - Send to Back</emph> ($[officename] Impress)</paragraph>
<section id="syganznachhinten">
<table id="tbl_id3156169">
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index fe983d0be1..a9c8e493ad 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index 9ad8c70b56..ea9b5c99c3 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="126">Press Shift+Ctrl+N.</paragraph>
+<paragraph role="listitem" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="126">Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index 02a1022902..ecaa6f6d49 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -88,8 +88,7 @@
<embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="19">Display area</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
-<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
+<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01050000.xhp b/helpcontent2/source/text/shared/01/01050000.xhp
index 639b8dbde5..c29b1ba121 100644
--- a/helpcontent2/source/text/shared/01/01050000.xhp
+++ b/helpcontent2/source/text/shared/01/01050000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01050000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101050000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101050000xml" indexer="include">
<title id="tit" xml-lang="en-US">Close</title>
<filename>/text/shared/01/01050000.xhp</filename>
</topic>
@@ -49,16 +47,18 @@
<bookmark_value>backing window</bookmark_value>
</bookmark><comment>mw made "closing..." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_CLOSEDOC" id="bm_id5360279" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:CloseDoc" id="bm_id3150702" localize="false"/><paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01050000.xhp" name="Close">Close</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:CloseDoc" id="bm_id3150702" localize="false"/>
+<paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01050000.xhp" name="Close">Close</link></paragraph>
<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseDoc">Closes the current document without exiting the program.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#schliessen"/>
</section>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="CHG" oldref="8">When you close the last open document window, a window with some icons to start new documents stays open. You can click some other icons to browse to featured web sites using your default web browser.<comment>name of this window (StartCenter?) currently subject of discussion.</comment></paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7">The <emph>Close </emph>command closes all of the open windows for the current document.</paragraph>
-<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="4">If you have made changes to the current document, you are prompted if you want to <link href="text/shared/01/01060000.xhp" name="save">save</link> your changes.</paragraph>
-<paragraph role="note" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="5">If you open a document for printing, and do not make any changes, you are still prompted to save your changes when you close the document. This is because $[officename] keeps track of when a document is printed.</paragraph>
+<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="4">If you have made changes to the current document, you are prompted if you want to <link href="text/shared/01/01060000.xhp" name="save">save</link> your changes.</paragraph><comment>no longer the default
+
+id="par_id3159399" l10n="U" oldref="5"If you open a document for printing, and do not make any changes, you are still prompted to save your changes when you close the document. This is because $[officename] keeps track of when a document is printed.</comment>
+<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="CHG" oldref="8">When you close the last open document window, you see the <link href="text/shared/guide/startcenter.xhp">Start Center</link>.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/02/10100000.xhp" name="Close the current window">Close the current window</link></paragraph>
<paragraph role="paragraph" id="par_id3154750" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/01170000.xhp" name="Exit $[officename]">Exit $[officename]</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100100.xhp b/helpcontent2/source/text/shared/01/01100100.xhp
index 08877c2485..e3bd6b1985 100755
--- a/helpcontent2/source/text/shared/01/01100100.xhp
+++ b/helpcontent2/source/text/shared/01/01100100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100100.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0101100100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101100100xml" indexer="include">
<title id="tit" xml-lang="en-US">Description</title>
<filename>/text/shared/01/01100100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-01T13:37:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="beschreibung">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODESC">Contains descriptive information about the document.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info3"/>
+<embed href="text/shared/00/00000401.xhp#info3"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_TITLE" id="bm_id3149798" localize="false"/>
<paragraph role="heading" id="hd_id3152372" xml-lang="en-US" level="2" l10n="U" oldref="3">Title</paragraph>
@@ -59,7 +57,7 @@
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_THEMA">Enter a subject for the document. You can use a subject to group documents with similar contents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS" id="bm_id3145313" localize="false"/>
<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="2" l10n="U" oldref="7">Keywords</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS">Enter the words that you want to use to index the content of your document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS">Enter the words that you want to use to index the content of your document. Keywords must be separated by commas. A keyword can contain white space characters or semicolons.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT" id="bm_id3147009" localize="false"/>
<paragraph role="heading" id="hd_id3148620" xml-lang="en-US" level="2" l10n="U" oldref="9">Comments</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT">Enter comments to help identify the document.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100300.xhp b/helpcontent2/source/text/shared/01/01100300.xhp
index 8e1f590438..8a8994df9c 100755
--- a/helpcontent2/source/text/shared/01/01100300.xhp
+++ b/helpcontent2/source/text/shared/01/01100300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100300.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,35 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
<topic id="textshared0101100300xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">User</title>
+<title id="tit" xml-lang="en-US">Custom Properties</title>
<filename>/text/shared/01/01100300.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="benutzer">
- <bookmark branch="hid/HID_DOCINFOUSER" xml-lang="en-US" id="bm_id3154926"/><paragraph id="hd_id3155069" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/01100300.xhp" name="User">User</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3155934" xml-lang="en-US" oldref="9"><ahelp hid="HID_DOCINFOUSER" visibility="visible">Allows you to assign custom information fields to your document.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info4"/>
+<section id="benutzer">
+<bookmark xml-lang="en-US" branch="hid/HID_DOCINFOUSER" id="bm_id3154926" localize="false"/>
+<paragraph role="heading" id="hd_id3155069" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01100300.xhp" name="Custom Properties">Custom Properties</link></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DOCINFOUSER">Allows you to assign custom information fields to your document.</ahelp></paragraph>
</section>
- <bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO1" xml-lang="en-US" id="bm_id3154751"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO2" xml-lang="en-US" id="bm_id3152425"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO3" xml-lang="en-US" id="bm_id3148548"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4" xml-lang="en-US" id="bm_id3147399"/><paragraph role="heading" level="2" id="hd_id3151234" l10n="U" xml-lang="en-US" oldref="2">Info 1 to Info 4</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3152551" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4">Enter your custom content. If you want, you can change the label for the content by clicking the <emph>Info Fields </emph>button.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:PUSHBUTTON:TP_DOCINFOUSER:BTN_EDITLABEL" xml-lang="en-US" id="bm_id3145072"/><paragraph role="heading" level="2" id="hd_id3153528" l10n="U" xml-lang="en-US" oldref="4">Info Fields</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3157958" xml-lang="en-US" oldref="5"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFOUSER:BTN_EDITLABEL" visibility="visible">Edit the labels for the custom content fields.</ahelp></paragraph>
- <bookmark branch="hid/HID_DOCINFO_EDT" xml-lang="en-US" id="bm_id3155355"/><paragraph role="heading" level="3" id="hd_id3155338" l10n="U" xml-lang="en-US" oldref="10">Edit Field Names</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153311" xml-lang="en-US" oldref="11"><ahelp visibility="visible" hid="HID_DOCINFO_EDT">Allows you to modify the labels for the <emph>Info Fields</emph>.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO1" xml-lang="en-US" id="bm_id3150443"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO2" xml-lang="en-US" id="bm_id3156114"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO3" xml-lang="en-US" id="bm_id3154749"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO4" xml-lang="en-US" id="bm_id3152780"/><paragraph role="heading" level="3" id="hd_id3153031" l10n="U" xml-lang="en-US" oldref="6">Names</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3159166" xml-lang="en-US" oldref="7"><ahelp visibility="visible" hid="SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO4">Enter a name for the <emph>Info Field(s)</emph>.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3153827" l10n="U" oldref="8">Click <emph>OK</emph> to apply your changes.</paragraph>
- </body>
+<section id="howtoget">
+<embed href="text/shared/00/00000401.xhp#info4"/>
+</section>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO1" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO2" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO3" id="bm_id3148548" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4" id="bm_id3147399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CTRL_CUSTOMPROPERTIES" id="bm_id0811200812001788" localize="false"/>
+<paragraph role="heading" id="hd_id3151234" xml-lang="en-US" level="2" l10n="CHG" oldref="2">Properties</paragraph>
+<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4">Enter your custom contents. You can change the name, type, and contents of each row. You can add or remove rows. The items will be exported as metadata to other file formats.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD" id="bm_id0811200812054521" localize="false"/>
+<paragraph role="heading" id="hd_id0811200812071796" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_id0811200812071785" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to add a new row to the Properties list.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4a3fbf3f30..4dd423bc76 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01110100.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -75,7 +75,7 @@
<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="36">Template categories are represented by folder icons. To view the template files for a category, double-click a folder.</paragraph>
<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="C">To view the styles that are used in a file, double-click the file name, and then double-click the <emph>Styles</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down Ctrl and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
+<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT" id="bm_id3153542" localize="false"/>
<paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="8">Commands</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01110101.xhp b/helpcontent2/source/text/shared/01/01110101.xhp
index 5e0a3d15bd..37372115b8 100644
--- a/helpcontent2/source/text/shared/01/01110101.xhp
+++ b/helpcontent2/source/text/shared/01/01110101.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01110101.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,7 +64,7 @@
<paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="3" l10n="U" oldref="7">Table</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_TABLE">Select the data table for your address book.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES" id="bm_id3154811" localize="false"/>
-<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="9">Administrate</paragraph>
+<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="9">Configure</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES">Add a new data source to the <emph>Address Book Source </emph>list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="11">Field assignment</paragraph>
<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="12">Define the field assignments for your address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index fa9da3a272..d5913556c9 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101130000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Print</title>
<filename>/text/shared/01/01130000.xhp</filename>
</topic>
@@ -60,13 +58,15 @@
<bookmark_value>spoolfiles with Xprinter</bookmark_value>
</bookmark><comment>MW deleted "selections;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_PRINTDOC" id="bm_id1076258" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/><paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1">Print</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
+<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1">Print</paragraph>
<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
</variable> The printing options can vary according to the printer and the operating system that you use.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#drucken"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/><paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="3">Printer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
+<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="3">Printer</paragraph>
<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES">Lists the default printer for the current document. The information for the printer is displayed below this box. If you select another printer, the information is updated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="6">Lists the installed printers on your operating system. To change the default printer, select a printer name from the list.</paragraph>
@@ -78,49 +78,75 @@
<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="U" oldref="12">Displays the port for the selected printer.</paragraph>
<paragraph role="heading" id="hd_id3148621" xml-lang="en-US" level="3" l10n="U" oldref="13">Comment</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14">Displays additional information for the printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="3" l10n="U" oldref="15">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/>
+<paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="3" l10n="U" oldref="15">Properties</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES">Opens the printer properties dialog.</ahelp> The printer properties vary according to the printer that you select.<comment>UFI: fix for #i29457#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="17">Print to File</paragraph>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT">Prints to a file instead of to a printer. Select this box, and then choose a location to save the file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
+<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="17">Print to File</paragraph>
+<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT">Prints to a file instead of to a printer. Select this box, and then choose a location to save the file.</ahelp></paragraph><comment>obviously, AVIS embedded help texts AEND are no longer possible inside SWITCHed passages.
+This is the reason for continuos failure of i83561</comment>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043691" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043626" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043615" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043658" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043717" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043777" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043750" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
<switch select="appl">
-<case select="CALC"><comment>changed Calc print dialog, i83561</comment><paragraph role="heading" id="hd_id439161" xml-lang="en-US" level="2" l10n="NEW">Print</paragraph>
+<case select="CALC"><comment>changed Calc print dialog, i83561</comment>
+<paragraph role="heading" id="hd_id439161" xml-lang="en-US" level="2" l10n="NEW">Print</paragraph>
<paragraph role="paragraph" id="par_id1228064" xml-lang="en-US" l10n="NEW">Choose the spreadsheet contents to be printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/><paragraph role="heading" id="hd_id3263954" xml-lang="en-US" level="3" l10n="NEW">All sheets</paragraph>
-<paragraph role="paragraph" id="par_id9550462" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/><paragraph role="heading" id="hd_id6590166" xml-lang="en-US" level="3" l10n="NEW">Selected sheets</paragraph>
-<paragraph role="paragraph" id="par_id7059846" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/><paragraph role="heading" id="hd_id7471236" xml-lang="en-US" level="3" l10n="NEW">Selected cells</paragraph>
-<paragraph role="paragraph" id="par_id2208014" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3263954" xml-lang="en-US" level="3" l10n="NEW">All sheets</paragraph>
+<paragraph role="paragraph" id="par_id9550462" xml-lang="en-US" l10n="NEW">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
+<paragraph role="heading" id="hd_id6590166" xml-lang="en-US" level="3" l10n="NEW">Selected sheets</paragraph>
+<paragraph role="paragraph" id="par_id7059846" xml-lang="en-US" l10n="NEW">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
+<paragraph role="heading" id="hd_id7471236" xml-lang="en-US" level="3" l10n="NEW">Selected cells</paragraph>
+<paragraph role="paragraph" id="par_id2208014" xml-lang="en-US" l10n="NEW">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
</case>
-<case select="IMPRESS"><comment>inserted Impress section, i85723</comment><paragraph role="heading" id="hd_id9578844" xml-lang="en-US" level="2" l10n="NEW">Print content</paragraph>
+<case select="IMPRESS"><comment>inserted Impress section, i85723</comment>
+<paragraph role="heading" id="hd_id9578844" xml-lang="en-US" level="2" l10n="NEW">Print content</paragraph>
<paragraph role="paragraph" id="par_id864284" xml-lang="en-US" l10n="NEW">For Impress, you can select the content to be printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/><paragraph role="heading" id="hd_id7683950" xml-lang="en-US" level="3" l10n="NEW">Content</paragraph>
-<paragraph role="paragraph" id="par_id7736442" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/><paragraph role="heading" id="hd_id6184575" xml-lang="en-US" level="3" l10n="NEW">Slides per page</paragraph>
-<paragraph role="paragraph" id="par_id3150425" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/><paragraph role="heading" id="hd_id226142" xml-lang="en-US" level="3" l10n="NEW">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id838648" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/><paragraph role="heading" id="hd_id1110568" xml-lang="en-US" level="3" l10n="NEW">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3713797" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id7683950" xml-lang="en-US" level="3" l10n="NEW">Content</paragraph>
+<paragraph role="paragraph" id="par_id7736442" xml-lang="en-US" l10n="NEW">Select whether you want to print Slides, Handouts, Notes, or Outline.</paragraph>
+<paragraph role="heading" id="hd_id6184575" xml-lang="en-US" level="3" l10n="NEW">Slides per page</paragraph>
+<paragraph role="paragraph" id="par_id3150425" xml-lang="en-US" l10n="NEW">For handouts, select the number of slides to print per page of paper.</paragraph>
+<paragraph role="heading" id="hd_id226142" xml-lang="en-US" level="3" l10n="NEW">Horizontal</paragraph>
+<paragraph role="paragraph" id="par_id838648" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a horizontal order first.</paragraph>
+<paragraph role="heading" id="hd_id1110568" xml-lang="en-US" level="3" l10n="NEW">Vertical</paragraph>
+<paragraph role="paragraph" id="par_id3713797" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a vertical order first.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Print range</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="CHG" oldref="23">Defines the print range for the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/><paragraph role="heading" id="hd_id3155450" xml-lang="en-US" level="3" l10n="U" oldref="24">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
+<paragraph role="heading" id="hd_id3155450" xml-lang="en-US" level="3" l10n="U" oldref="24">All</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="26">Pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/>
+<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="26">Pages</paragraph>
<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES">Prints only the pages that you specify in the <emph>Pages </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/><paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use the format 3-6. To print single pages, use the format 7;9;11. If you want, you can print a combination of page ranges and single pages, by using the format 3-6;8;10;12. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/><paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="29">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
+<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use the format 3-6. To print single pages, use the format 7;9;11. If you want, you can print a combination of page ranges and single pages, by using the format 3-6;8;10;12. </ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/>
+<paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="29">Selection</paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="31">Copies</paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="32">Specify the number of copies that you want to print and the sorting options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/><paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Number of copies</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/>
+<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Number of copies</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/><paragraph role="heading" id="hd_id3154390" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Collate</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/>
+<paragraph role="heading" id="hd_id3154390" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Collate</paragraph>
<paragraph role="paragraph" id="par_id3150865" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE">Preserves the page order of the original document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" id="bm_id3146909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
<paragraph role="paragraph" id="par_id3159086" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" visibility="hidden">Changes the printer settings for the current document.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156080" xml-lang="en-US" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
</caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index 5dba7f1d8f..a6cb2f44b9 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01160200.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0101160200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101160200xml" indexer="include">
<title id="tit" xml-lang="en-US">Document as E-mail</title>
<filename>/text/shared/01/01160200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-06T12:02:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="sendemail">
@@ -53,7 +49,8 @@
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#dokument"/>
+<embed href="text/shared/00/00000401.xhp#dokument"/>
</section>
+<paragraph role="note" id="par_id0807200809553672" xml-lang="en-US" l10n="NEW">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp
index a7de0beb35..a26bcab3bd 100644
--- a/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/helpcontent2/source/text/shared/01/02070000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02070000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102070000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Paste Special</title>
<filename>/text/shared/01/02070000.xhp</filename>
</topic>
@@ -48,41 +46,50 @@
<bookmark xml-lang="en-US" branch="hid/.uno:PasteClipboard" id="bm_id3149987" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_PASTESPECIAL" id="bm_id3567618" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PasteSpecial" id="bm_id3154100" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FID_PASTE_CONTENTS" id="bm_id3076570" localize="false"/><paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="1">Paste Special</paragraph>
+<bookmark xml-lang="en-US" branch="hid/FID_PASTE_CONTENTS" id="bm_id3076570" localize="false"/>
+<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="1">Paste Special</paragraph>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2"><variable id="inhalteeinfuegentext"><ahelp hid=".uno:PasteSpecial">Inserts the contents of the clipboard into the current file in a format that you can specify.</ahelp>
</variable></paragraph>
<switch select="appl">
-<case select="WRITER"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="WRITER">
+<section id="howtoget">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="CALC"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="CALC">
+<section id="Section1">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="IMPRESS"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="IMPRESS">
+<section id="Section2">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="DRAW"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="DRAW">
+<section id="Section3">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/HID_PASTE_DLG" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="5">Source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PASTE_DLG" id="bm_id3156410" localize="false"/>
+<paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="5">Source</paragraph>
<paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_PASTE_DLG">Displays the source of the clipboard contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id3154750" localize="false"/><paragraph role="heading" id="hd_id3153684" xml-lang="en-US" level="3" l10n="U" oldref="7">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id3154750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST" id="bm_id080420080314218" localize="false"/>
+<paragraph role="heading" id="hd_id3153684" xml-lang="en-US" level="3" l10n="U" oldref="7">Selection</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST">Select a format for the clipboard contents that you want to paste.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="appl"><caseinline select="WRITER">When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_INS_CELL_CONTENTS" id="bm_id7770068" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertContents" id="bm_id3156152" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="CALC">Paste Special
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertContents" id="bm_id3156152" localize="false"/>
+<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="CALC">Paste Special
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="CALC">This dialog appears in Calc if the clipboard contains spreadsheet cells.
</caseinline></switchinline></paragraph>
@@ -90,35 +97,43 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="appl"><caseinline select="CALC">Select a format for the clipboard contents that you want to paste.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/><paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/>
+<paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, notes, formats, and objects into the current document.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/>
+<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text
</caseinline></switchinline><comment>i50436</comment></paragraph>
<paragraph role="paragraph" id="par_id3149244" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing text.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="45"><switchinline select="appl"><caseinline select="CALC">Numbers
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/>
+<paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="45"><switchinline select="appl"><caseinline select="CALC">Numbers
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing numbers.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Date &amp; Time
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/>
+<paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Date &amp; Time
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154226" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing date and time values.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Formulas
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/>
+<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Formulas
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS">Inserts cells containing formulae.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/>
+<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts notes that are attached to cells. If you want to add the notes to the existing cell content, select the "Add" operation.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/>
+<paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS"><switchinline select="appl"><caseinline select="CALC">Inserts cell format attributes.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS" id="bm_id3145202" localize="false"/><paragraph role="heading" id="hd_id3156282" xml-lang="en-US" level="3" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="CALC">Objects
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS" id="bm_id3145202" localize="false"/>
+<paragraph role="heading" id="hd_id3156282" xml-lang="en-US" level="3" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="CALC">Objects
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS"><switchinline select="appl"><caseinline select="CALC">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects.
</caseinline></switchinline></ahelp></paragraph>
@@ -126,23 +141,28 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3151351" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="CALC">Select the operation to apply when you paste cells into your sheet.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/><paragraph role="heading" id="hd_id3153952" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">None
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/>
+<paragraph role="heading" id="hd_id3153952" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">None
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP"><switchinline select="appl"><caseinline select="CALC">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/><paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/>
+<paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains notes, adds the notes to the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/>
+<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB"><switchinline select="appl"><caseinline select="CALC">Subtracts the values in the clipboard cells from the values in the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/><paragraph role="heading" id="hd_id3155312" xml-lang="en-US" level="3" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Multiply
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/>
+<paragraph role="heading" id="hd_id3155312" xml-lang="en-US" level="3" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Multiply
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL"><switchinline select="appl"><caseinline select="CALC">Multiplies the values in the clipboard cells with the values in the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/><paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="3" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="CALC">Divide
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/>
+<paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="3" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="CALC">Divide
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV"><switchinline select="appl"><caseinline select="CALC">Divides the values in the target cells by the values in the clipboard cells.
</caseinline></switchinline></ahelp><comment>UFI: fixes #i14796#</comment></paragraph>
@@ -150,19 +170,23 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Sets the paste options for the clipboard contents.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/><paragraph role="heading" id="hd_id3151052" xml-lang="en-US" level="3" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="CALC">Skip empty cells
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/>
+<paragraph role="heading" id="hd_id3151052" xml-lang="en-US" level="3" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="CALC">Skip empty cells
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3148775" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the <emph>Multiply</emph> or the <emph>Divide</emph> operation, the operation is not applied to the target cell of an empty cell in the clipboard.</ahelp>
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U" oldref="32">If you select a mathematical operation and clear the<emph> Skip empty cells </emph>box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
+<case select="CALC">
+<paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U" oldref="32">If you select a mathematical operation and clear the<emph> Skip empty cells </emph>box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/><paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="CALC">Transpose
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/>
+<paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="CALC">Transpose
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147223" xml-lang="en-US" l10n="CHG" oldref="34"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</ahelp>
</caseinline></switchinline><comment>i59261</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/><paragraph role="heading" id="hd_id3152971" xml-lang="en-US" level="3" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="CALC">Link
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/>
+<paragraph role="heading" id="hd_id3152971" xml-lang="en-US" level="3" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="CALC">Link
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the <emph>Insert All</emph> option is also selected. </ahelp>
</caseinline></switchinline></paragraph>
@@ -172,15 +196,18 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145169" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="CALC">Set the shift options for the target cells when the clipboard content is inserted.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/><paragraph role="heading" id="hd_id3155518" xml-lang="en-US" level="3" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="CALC">Don't shift
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/>
+<paragraph role="heading" id="hd_id3155518" xml-lang="en-US" level="3" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="CALC">Don't shift
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154158" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE"><switchinline select="appl"><caseinline select="CALC">Inserted cells replace the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/><paragraph role="heading" id="hd_id3148483" xml-lang="en-US" level="3" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="CALC">Down
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/>
+<paragraph role="heading" id="hd_id3148483" xml-lang="en-US" level="3" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="CALC">Down
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted downward when you insert cells from the clipboard.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/><paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="3" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="CALC">Right
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/>
+<paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="3" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="CALC">Right
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted to the right when you insert cells from the clipboard.
</caseinline></switchinline></ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 5e6f3fc4b5..5f612cf3dd 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02100000.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,53 +32,61 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102100000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Find &amp; Replace</title>
<filename>/text/shared/01/02100000.xhp</filename>
</topic>
</meta>
<body>
-<section id="suchenersetzen"><comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
+<section id="suchenersetzen">le<comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_ITEM" id="bm_id9184950" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SearchProperties" id="bm_id3160463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_DLG" id="bm_id7754440" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/><paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/>
+<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#suchen"/>
+<embed href="text/shared/00/00000402.xhp#suchen"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/><paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/><paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_SEARCH:ED_REPLACE" id="bm_id3148621" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/>
+<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/><paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/>
+<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="8">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS" id="bm_id3155179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
+<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
</caseinline><defaultinline>Whole words only</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS" id="bm_id3152910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/><paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/>
+<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP" id="bm_id3153542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/><paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/>
+<paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Regular expressions</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Allows you to use wildcards in your search.</defaultinline></switchinline></paragraph><comment>i72448
-Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment><paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
+Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment>
+<paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -88,17 +95,21 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<default><embed href="text/shared/01/02100001.xhp#02100001"/>
</default>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/>
+<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154760"><bookmark_value>case sensitivity;searching</bookmark_value>
-</bookmark><comment>mw made "case sensitive.." a two level entry</comment><paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
+</bookmark><comment>mw made "case sensitive.." a two level entry</comment>
+<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147264"><bookmark_value>finding; selections</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS" id="bm_id3152771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/>
+<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/><paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -106,7 +117,8 @@ Ext help text not found within switches. Solution: Keep switched text for normal
</case>
<default>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/><paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
<paragraph role="paragraph" id="par_id3155103" xml-lang="en-US" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
<paragraph role="note" id="par_idN109CC" xml-lang="en-US" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
<paragraph role="note" id="par_idN109DF" xml-lang="en-US" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
@@ -114,25 +126,35 @@ Ext help text not found within switches. Solution: Keep switched text for normal
</default>
</switch>
<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/><paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
+<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
+<paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/><paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
+<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/><paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/><paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
+<paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/><paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/>
+<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/><paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/>
+<paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="2" l10n="U" oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
</caseinline></switchinline></paragraph>
@@ -143,32 +165,38 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/>
+<paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id1334269" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
+<case select="WRITER">
+<paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><paragraph role="heading" id="hd_id3153157" xml-lang="en-US" level="2" l10n="CHG" oldref="138">More Options / Less Options</paragraph>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="SVX:MOREBUTTON:RID_SVXDLG_SEARCH:BTN_MORE">Shows more or less search options. Click this button again to hide the extended search options.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><comment>More Options / Less Options / Fewer Options - name subject to change</comment>
+<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/><paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
+<paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id6719870" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/>
+<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/><paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/>
+<paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells.
</caseinline></switchinline></paragraph>
@@ -178,11 +206,13 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph role="paragraph" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS" id="bm_id3156362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/><paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
+<paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id743430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS" id="bm_id3155445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/><paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
+<paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145207" xml-lang="en-US" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
</caseinline></switchinline></paragraph>
@@ -194,13 +224,14 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<bookmark_value>sheets; searching all</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES" id="bm_id3151358" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/><paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
+<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145619" xml-lang="en-US" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/finding.xhp#finding"/>
diff --git a/helpcontent2/source/text/shared/01/02100100.xhp b/helpcontent2/source/text/shared/01/02100100.xhp
index 60157ccf1b..1ebcb43de9 100755
--- a/helpcontent2/source/text/shared/01/02100100.xhp
+++ b/helpcontent2/source/text/shared/01/02100100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02100100.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0102100100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102100100xml" indexer="include">
<title id="tit" xml-lang="en-US">Similarity Search</title>
<filename>/text/shared/01/02100100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-03T14:49:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="aehnlichkeit">
@@ -48,12 +46,14 @@
<bookmark_value>finding; similarity search</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_SIMILARITY" id="bm_id3148410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROX" id="bm_id3154814" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROXSETTINGS" id="bm_id3154817" localize="false"/>
<paragraph role="heading" id="hd_id3156045" xml-lang="en-US" level="1" l10n="U" oldref="52"><link href="text/shared/01/02100100.xhp" name="Similarity Search">Similarity Search</link></paragraph>
<paragraph role="paragraph" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_SIMILARITY">Find terms that are similar to the <emph>Search for </emph>text. Select this checkbox, and then click the <emph>...</emph> button to define the similarity options.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3149551" xml-lang="en-US" l10n="CHG" oldref="66">For example, a similarity search can find words that differ from the <emph>Search for </emph>text by two characters.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#suchenaehnlichkeit"/>
+<embed href="text/shared/00/00000402.xhp#suchenaehnlichkeit"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_SIMILARITY" id="bm_id3155351" localize="false"/>
<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="2" l10n="U" oldref="54">...</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index a43804f393..8f82e240ec 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02230401.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -111,7 +111,7 @@
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_DG_VIEW" id="bm_id3151384" localize="false"/>
<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 Ctrl while you click to select multiple entries in the list.</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>
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index bd0577ae45..8630186bc6 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 03010000.xhp,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0103010000xml" indexer="include">
+<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Zoom &amp; View Layout</title>
<filename>/text/shared/01/03010000.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/01/03110000.xhp b/helpcontent2/source/text/shared/01/03110000.xhp
index aa110fab3e..2bfff092f2 100644
--- a/helpcontent2/source/text/shared/01/03110000.xhp
+++ b/helpcontent2/source/text/shared/01/03110000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03110000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,9 +60,8 @@
<embed href="text/shared/00/00000403.xhp#ganzer"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_FULLSCREENTOOLBOX" id="bm_id3154673" localize="false"/>
-<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+J to switch between the normal and full screen mode.</ahelp></paragraph>
-<paragraph role="note" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="28">You can still use shortcut keys in <emph>Full Screen</emph> mode, even though the menus are unavailable. <switchinline select="sys"><caseinline select="WIN">To open the<emph> View</emph> menu, press Alt+V.
+<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+J to switch between the normal and full screen mode.</ahelp></paragraph>
+<paragraph role="note" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="28">You can still use shortcut keys in <emph>Full Screen</emph> mode, even though the menus are unavailable. <switchinline select="sys"><caseinline select="WIN">To open the <emph>View</emph> menu, press Alt+V.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/03990000.xhp b/helpcontent2/source/text/shared/01/03990000.xhp
index e7d8efa39a..43790c567d 100755
--- a/helpcontent2/source/text/shared/01/03990000.xhp
+++ b/helpcontent2/source/text/shared/01/03990000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03990000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,67 +32,26 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0103990000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0103990000xml" indexer="include">
<title id="tit" xml-lang="en-US">Toolbars</title>
<filename>/text/shared/01/03990000.xhp</filename>
</topic>
</meta>
<body>
-<section id="symbolleisten">
<bookmark xml-lang="en-US" branch="hid/SID_AVAILABLE_TOOLBARS" id="bm_id3563981" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AvailableToolbars" id="bm_id1033356" localize="false"/><paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/03990000.xhp" name="Toolbars">Toolbars</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AvailableToolbars" id="bm_id1033356" localize="false"/>
+<paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/03990000.xhp" name="Toolbars">Toolbars</link></paragraph>
<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Opens a submenu to show and hide toolbars.</ahelp> A toolbar contains icons and options that let you quickly access $[officename] commands.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000403.xhp#symbolleisten"/>
-</section>
-<sort order="asc"><section id="Section1">
-<embed href="text/shared/01/03020000.xhp#funktionsleiste"/>
-</section>
-<section id="Section2">
-<embed href="text/shared/01/03050000.xhp#werkzeugleiste"/>
-</section>
-<section id="Section3">
-<embed href="text/shared/01/04110000.xhp#hyperlink"/>
-</section>
-<section id="Section4">
-<switch select="appl">
-<case select="DRAW"><embed href="text/sdraw/main0213.xhp#optionsleiste"/>
-</case>
-</switch></section>
-<section id="Section5">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/simpress/main0213.xhp#optionsleiste"/>
-</case>
-</switch></section>
-<section id="Section6">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/simpress/01/03070000.xhp#praesentation"/>
-</case>
-</switch></section>
-<section id="Section8">
-<switch select="appl">
-<case select="DRAW"><embed href="text/shared/01/03170000.xhp#farbleiste"/>
-</case>
-</switch></section>
-<section id="Section9">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/shared/01/03170000.xhp#farbleiste"/>
-</case>
-</switch></section>
-<section id="Section7">
-<switch select="appl">
-<case select="CALC"><embed href="text/scalc/01/03090000.xhp#rechenleiste"/>
-</case>
-</switch></section>
-</sort>
-<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="3"><link href="text/shared/guide/edit_symbolbar.xhp" name="Customize Toolbar">Customize Toolbar</link></paragraph>
+<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="3"><link href="text/shared/guide/edit_symbolbar.xhp" name="Customize">Customize</link></paragraph>
<paragraph role="paragraph" id="par_id2789086" xml-lang="en-US" l10n="NEW">Opens a dialog where you can add, edit, and remove icons.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.cmd:RestoreVisibility" id="bm_id9156773" localize="false"/><paragraph role="heading" id="hd_id371715" xml-lang="en-US" level="2" l10n="NEW">Reset</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.cmd:RestoreVisibility" id="bm_id9156773" localize="false"/>
+<paragraph role="heading" id="hd_id371715" xml-lang="en-US" level="2" l10n="NEW">Reset</paragraph>
<paragraph role="paragraph" id="par_id1886654" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose <emph>View - Toolbars - Reset</emph> to reset the toolbars to their default context sensitive behavior. Now some toolbars will be shown automatically, dependent on the context.</ahelp><comment>UFI: #i63811</comment></paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/floating_toolbar.xhp#floating_toolbar"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 52bb35a8ad..d4129c08fd 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04050000.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -63,7 +61,8 @@
<switch select="appl">
<case select="WRITER"><comment>Writer</comment>
<paragraph role="heading" id="hd_id9851680" xml-lang="en-US" level="2" l10n="NEW">Inserting notes</paragraph>
-<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the Ctrl+Alt+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
+<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
<paragraph role="paragraph" id="par_id1831" xml-lang="en-US" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
<paragraph role="paragraph" id="par_id6718649" xml-lang="en-US" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
<paragraph role="heading" id="hd_id2929166" xml-lang="en-US" level="2" l10n="NEW">Editing notes</paragraph>
@@ -75,9 +74,13 @@
<paragraph role="paragraph" id="par_id0522200809383485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_ALL_NOTES" id="bm_id0429200810593994" localize="false"/>
<paragraph role="paragraph" id="par_id0522200809383428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>View - Notes command</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
+<paragraph role="paragraph" id="par_id0804200803435883" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3445539" xml-lang="en-US" level="2" l10n="NEW">Navigating from note to note</paragraph>
-<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press Ctrl+Alt+Page Down to jump to the next note, or press Ctrl+Alt+Page Up to jump to the previous note.</paragraph>
+<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous note.</paragraph>
<paragraph role="paragraph" id="par_id2116153" xml-lang="en-US" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
<paragraph role="tip" id="par_id5381328" xml-lang="en-US" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
<paragraph role="heading" id="hd_id5664235" xml-lang="en-US" level="2" l10n="NEW">Printing notes</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index 3014fb7b15..fd05be04a3 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020100.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -112,7 +112,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG" id="bm_id3154068" localize="false"/>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="38">Language</paragraph>
-<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text of the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
<switch select="appl">
<case select="CALC">
<paragraph role="note" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="59">You can only change the language setting for cells (choose <emph>Format - Cells – Numbers</emph>).</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 08fcdfb36c..567c64a43b 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020301.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105020301xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105020301xml" indexer="include">
<title id="tit" xml-lang="en-US">Number Format Codes</title>
<filename>/text/shared/01/05020301.xhp</filename>
</topic>
@@ -52,10 +50,11 @@
<bookmark_value>Euro; currency formats</bookmark_value>
<bookmark_value>date formats</bookmark_value>
<bookmark_value>times, formats</bookmark_value>
-</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment><paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
+</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment>
+<paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150467" xml-lang="en-US" l10n="U" oldref="88">Number format codes can consist of up to three sections separated by a semicolon (;).</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="108">In a number format code with two sections, the first section applies to positive values and zero, and the second section applies to negative values.</paragraph>
</listitem>
@@ -63,7 +62,7 @@
<paragraph role="listitem" id="par_id3158442" xml-lang="en-US" l10n="CHG" oldref="109">In a number format code with three sections, the first section applies to positive values, the second section to negative values, and the third section to the value zero.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="110">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
</listitem>
@@ -74,109 +73,112 @@
<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
<table id="tbl_id3149760">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150902" xml-lang="en-US" l10n="U" oldref="86">Placeholders</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="87">Explanation</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="5">#</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="6">Does not display extra zeros.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">0 (Zero)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Displays extra zeros if the number has less places than zeros in the format.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1087E" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
<table id="tbl_id3153577">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="9">Number Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="11">3456.78 as 3456.8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="12">####.#</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="13">9.9 as 9.900</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3159256" xml-lang="en-US" l10n="U" oldref="14">#.000</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147077" xml-lang="en-US" l10n="U" oldref="15">13 as 13.0 and 1234.567 as 1234.57</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="16">#.0#</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="17">5.75 as 5 3/4 and 6.3 as 6 3/10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"># ???/???</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="19">.5 as 0.5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="20">0.##</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="230">Thousands Separator</paragraph>
<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="21">Depending on your language setting, you can use a comma or a period as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
<table id="tbl_id3150244">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154905" xml-lang="en-US" l10n="U" oldref="22">Number Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="23">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="24">15000 as 15,000</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="25">#,###</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="26">16000 as 16</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153961" xml-lang="en-US" l10n="U" oldref="27">#,</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3154836" xml-lang="en-US" level="2" l10n="U" oldref="79">Including Text in Number Format Codes</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="231">Text and Numbers</paragraph>
<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="80">To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (") in front of and behind the text, or a backslash (\) before a single character. For example, enter <emph>#.# "meters"</emph> to display "3.5 meters" or <emph>#.# \m</emph> to display "3.5 m".</paragraph>
@@ -188,38 +190,39 @@
<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="28">To set the color of a section of a number format code, insert one of the following color names in square brackets [ ]:</paragraph>
<table id="tbl_id3157321">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154630" xml-lang="en-US" l10n="U" oldref="29">CYAN</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="30">GREEN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="31">BLACK</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="32">BLUE</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="33">MAGENTA</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="34">RED</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147502" xml-lang="en-US" l10n="U" oldref="35">WHITE</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153368" xml-lang="en-US" l10n="U" oldref="36">YELLOW</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3147435" xml-lang="en-US" level="2" l10n="U" oldref="111">Conditions</paragraph>
<paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="U" oldref="235">Conditional Brackets</paragraph>
<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="112">You can define a number format so that it only applies when the condition that you specify is met. Conditions are enclosed by square brackets [ ].</paragraph>
@@ -245,353 +248,593 @@
<paragraph role="warning" id="par_id610980" xml-lang="en-US" l10n="NEW">Not all format codes give meaningful results for all languages.</paragraph>
<table id="tbl_id3147426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152376" xml-lang="en-US" l10n="U" oldref="39">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3159130" xml-lang="en-US" l10n="U" oldref="40">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147380" xml-lang="en-US" l10n="U" oldref="41">Month as 3.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146928" xml-lang="en-US" l10n="U" oldref="42">M</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="43">Month as 03.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153052" xml-lang="en-US" l10n="U" oldref="44">MM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="45">Month as Jan-Dec</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="46">MMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149909" xml-lang="en-US" l10n="U" oldref="47">Month as January-December</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155318" xml-lang="en-US" l10n="U" oldref="48">MMMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151218" xml-lang="en-US" l10n="U" oldref="116">First letter of Name of Month</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="117">MMMMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="49">Day as 2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156181" xml-lang="en-US" l10n="U" oldref="50">D</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="51">Day as 02</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156358" xml-lang="en-US" l10n="U" oldref="52">DD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148495" xml-lang="en-US" l10n="U" oldref="53">Day as Sun-Sat</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3161665" xml-lang="en-US" l10n="U" oldref="54">NN or DDD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154272" xml-lang="en-US" l10n="U" oldref="118">Day as Sunday to Saturday</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3145164" xml-lang="en-US" l10n="U" oldref="119">NNN or DDDD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="55">Day followed by comma, as in "Sunday,"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="56">NNNN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="57">Year as 00-99</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3143236" xml-lang="en-US" l10n="U" oldref="58">YY</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="59">Year as 1900-2078</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151358" xml-lang="en-US" l10n="U" oldref="60">YYYY</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153355" xml-lang="en-US" l10n="U" oldref="96">Calendar week</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="97">WW</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154302" xml-lang="en-US" l10n="U" oldref="103">Quarterly as Q1 to Q4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3159266" xml-lang="en-US" l10n="U" oldref="104">Q (K in swedish locales, T in french and spanish locales)</paragraph>
+<tablecell>
+<paragraph role="code" id="par_id3159266" xml-lang="en-US" l10n="CHG" oldref="104">Q</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147583" xml-lang="en-US" l10n="U" oldref="105">Quarterly as 1st quarter to 4th quarter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146918" xml-lang="en-US" l10n="U" oldref="106">QQ</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147534" xml-lang="en-US" l10n="U" oldref="120">Era on the Japanese Gengou calendar, single character (possible values are: M, T, S, H)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="121">G</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3163806" xml-lang="en-US" l10n="U" oldref="122">Era, abbreviation</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="123">GG</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="124">Era, full name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="125">GGG</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="126">Number of the year within an era, without a leading zero for single-digit years</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147255" xml-lang="en-US" l10n="U" oldref="127">E</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148487" xml-lang="en-US" l10n="U" oldref="128">Number of the year within an era, with a leading zero for single-digit years</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="129">EE or R</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152861" xml-lang="en-US" l10n="U" oldref="138">Era, full name and year</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149926" xml-lang="en-US" l10n="U" oldref="139">RR or GGGEE</paragraph>
</tablecell>
</tablerow>
+</table>
+
+<paragraph role="paragraph" id="par_id1002200811423518" xml-lang="en-US" l10n="NEW">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you will need to know the formatting codes used in that other locale. </paragraph>
+<paragraph role="paragraph" id="par_id1002200811423556" xml-lang="en-US" l10n="NEW">For example, if your software is set to an English locale, and you want to format a year with four digits, you enter YYYY as a formatting code. When you switch to a German locale, you must use JJJJ instead. The following table lists only the localized differences.</paragraph>
+<table id="tbl_id1002200811465915">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563044" xml-lang="en-US" l10n="NEW">Locale</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563137" xml-lang="en-US" l10n="NEW">Year</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563164" xml-lang="en-US" l10n="NEW">Month</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563128" xml-lang="en-US" l10n="NEW">Day</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563135" xml-lang="en-US" l10n="NEW">Hour</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563289" xml-lang="en-US" l10n="NEW">Day Of Week</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id100220081156322" xml-lang="en-US" l10n="NEW">Era</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563233" xml-lang="en-US" l10n="NEW">English - en</paragraph>
+<paragraph role="tablecontent" id="par_id1002200811563243" xml-lang="en-US" l10n="NEW">and all not listed locales</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563352" xml-lang="en-US" l10n="NEW">Y</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563396" xml-lang="en-US" l10n="NEW">M</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563385" xml-lang="en-US" l10n="NEW">D</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563472" xml-lang="en-US" l10n="NEW">H</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563430" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563488" xml-lang="en-US" l10n="NEW">G</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563484" xml-lang="en-US" l10n="NEW">German - de</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563518" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563735" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563823" xml-lang="en-US" l10n="NEW">Netherlands - nl</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563852" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563827" xml-lang="en-US" l10n="NEW">U</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563916" xml-lang="en-US" l10n="NEW">French - fr</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563970" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563980" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564065" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156407" xml-lang="en-US" l10n="NEW">Italian - it</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156403" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564042" xml-lang="en-US" l10n="NEW">G</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156412" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564119" xml-lang="en-US" l10n="NEW">X</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564197" xml-lang="en-US" l10n="NEW">Portuguese - pt</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564272" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156423" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564218" xml-lang="en-US" l10n="NEW">Spanish - es</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564390" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564319" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156433" xml-lang="en-US" l10n="NEW">Danish - da</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156444" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564448" xml-lang="en-US" l10n="NEW">Norwegian - no, nb, nn</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564549" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564565" xml-lang="en-US" l10n="NEW">Swedish - sv</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564556" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="214">Arabic Islamic format</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564637" xml-lang="en-US" l10n="NEW">Finnish - fi</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564627" xml-lang="en-US" l10n="NEW">V</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564643" xml-lang="en-US" l10n="NEW">K</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564763" xml-lang="en-US" l10n="NEW">P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3159103" xml-lang="en-US" l10n="U" oldref="215">AAA or AAAA</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564715" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
<table id="tbl_id3145133">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145764" xml-lang="en-US" l10n="U" oldref="217">Modifier</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152967" xml-lang="en-US" l10n="U" oldref="218">Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3148390" xml-lang="en-US" l10n="U" oldref="219">[~buddhist]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153781" xml-lang="en-US" l10n="U" oldref="220">Thai Buddhist Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3157969" xml-lang="en-US" l10n="U" oldref="133">[~gengou]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="134">Japanese Gengou Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="131">[~gregorian]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="132">Gregorian Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146808" xml-lang="en-US" l10n="U" oldref="221">[~hanja] or [~hanja_yoil]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="136">Korean Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="222">[~hijri]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149238" xml-lang="en-US" l10n="U" oldref="223">Arabic Islamic Calendar, currently supported for the following locales: ar_EG, ar_LB, ar_SA, and ar_TN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="224">[~jewish]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151288" xml-lang="en-US" l10n="U" oldref="225">Jewish Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="135">[~ROC]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="226">Republic Of China Calendar</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3152419" xml-lang="en-US" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="CALC"><table id="tbl_id3150490">
+<case select="CALC">
+<table id="tbl_id3150490">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154194" xml-lang="en-US" l10n="U" oldref="141">Initial Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149787" xml-lang="en-US" l10n="U" oldref="142">Result Format</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="143">Date + Date</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150292" xml-lang="en-US" l10n="U" oldref="144">Number (Days)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150460" xml-lang="en-US" l10n="U" oldref="145">Date + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154371" xml-lang="en-US" l10n="U" oldref="146">Date</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145082" xml-lang="en-US" l10n="U" oldref="147">Date + Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156290" xml-lang="en-US" l10n="U" oldref="148">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152456" xml-lang="en-US" l10n="U" oldref="149">Date + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156169" xml-lang="en-US" l10n="U" oldref="150">Number</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154527" xml-lang="en-US" l10n="U" oldref="151">Time + Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159625" xml-lang="en-US" l10n="U" oldref="152">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146802" xml-lang="en-US" l10n="U" oldref="153">Time + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146770" xml-lang="en-US" l10n="U" oldref="154">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155500" xml-lang="en-US" l10n="U" oldref="155">Time + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155128" xml-lang="en-US" l10n="U" oldref="156">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152904" xml-lang="en-US" l10n="U" oldref="157">Date&amp;Time + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159143" xml-lang="en-US" l10n="U" oldref="158">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148909" xml-lang="en-US" l10n="U" oldref="159">Date&amp;Time + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154806" xml-lang="en-US" l10n="U" oldref="160">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151269" xml-lang="en-US" l10n="U" oldref="161">Number + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154951" xml-lang="en-US" l10n="U" oldref="162">Number</paragraph>
</tablecell>
</tablerow>
</table>
+
</case>
</switch>
<paragraph role="paragraph" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="163"><switchinline select="appl"><caseinline select="CALC">The Date&amp;Time format displays the date and time that an entry was made to a cell with this format.
@@ -605,62 +848,63 @@
<paragraph role="paragraph" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="62">To display hours, minutes and seconds use the following number format codes.</paragraph>
<table id="tbl_id3154830">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149158" xml-lang="en-US" l10n="U" oldref="63">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="64">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154557" xml-lang="en-US" l10n="U" oldref="65">Hours as 0-23</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156348" xml-lang="en-US" l10n="U" oldref="66">h</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3143218" xml-lang="en-US" l10n="U" oldref="67">Hours as 00-23</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155266" xml-lang="en-US" l10n="U" oldref="68">hh</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U" oldref="69">Minutes as 0-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149588" xml-lang="en-US" l10n="U" oldref="70">m</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150531" xml-lang="en-US" l10n="U" oldref="71">Minutes as 00-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="72">mm</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="73">Seconds as 0-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156173" xml-lang="en-US" l10n="U" oldref="74">s</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149506" xml-lang="en-US" l10n="U" oldref="75">Seconds as 00-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="76">ss</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id3156039" xml-lang="en-US" l10n="U" oldref="77">To display seconds as fractions, add the decimal delimiter to your number format code. For example, enter <emph>hh:mm:ss.00</emph> to display the time as "01:02:03.45".<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
<paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="102">If a time is entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or [HH]:MM:SS<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
<paragraph role="heading" id="hd_id3158404" xml-lang="en-US" level="2" l10n="U" oldref="169">Displaying Numbers Using Native Characters</paragraph>
@@ -672,200 +916,201 @@
<paragraph role="heading" id="par_id3153111" xml-lang="en-US" level="3" l10n="CHG" oldref="174">[NatNum1] Transliterations</paragraph>
<table id="tbl_id1136841">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146895" xml-lang="en-US" l10n="U" oldref="175">Chinese: Chinese lower case characters; CAL: 1/7/7 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152536" xml-lang="en-US" l10n="U" oldref="176">Japanese: short Kanji characters [DBNum1]; CAL: 1/4/4 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146125" xml-lang="en-US" l10n="U" oldref="177">Korean: Korean lower case characters [DBNum1]; CAL: 1/7/7 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="178">Thai: Thai characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153264" xml-lang="en-US" l10n="U" oldref="179">Arabic: Indic characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148973" xml-lang="en-US" l10n="U" oldref="180">Indic: Indic characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN112A3" xml-lang="en-US" l10n="NEW">Hebrew: Hebrew letters<comment>UFI: api-features "Hebrew numbering"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147520" xml-lang="en-US" l10n="U" oldref="181">[NatNum2] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155383" xml-lang="en-US" l10n="U" oldref="182">Chinese: Chinese upper case characters; CAL: 2/8/8 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153931" xml-lang="en-US" l10n="U" oldref="183">Japanese: traditional Kanji characters; CAL: 2/5/5 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155097" xml-lang="en-US" l10n="U" oldref="184">Korean: Korean upper case characters [DBNum2]; CAL: 2/8/8 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152976" xml-lang="en-US" l10n="U" oldref="185">[NatNum3] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154353" xml-lang="en-US" l10n="U" oldref="186">Chinese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154669" xml-lang="en-US" l10n="U" oldref="187">Japanese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150472" xml-lang="en-US" l10n="U" oldref="188">Korean: fullwidth Arabic digits [DBNum3]; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157811" xml-lang="en-US" l10n="U" oldref="189">[NatNum4] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154592" xml-lang="en-US" l10n="U" oldref="190">Chinese: lower case text [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="191">Japanese: modern long Kanji text [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="192">Korean: formal lower case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153546" xml-lang="en-US" l10n="U" oldref="193">[NatNum5] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155612" xml-lang="en-US" l10n="U" oldref="194">Chinese: Chinese upper case text [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155909" xml-lang="en-US" l10n="U" oldref="195">Japanese: traditional long Kanji text [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151304" xml-lang="en-US" l10n="U" oldref="196">Korean: formal upper case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="197">[NatNum6] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="U" oldref="198">Chinese: fullwidth text [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154114" xml-lang="en-US" l10n="U" oldref="199">Japanese: fullwidth text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155344" xml-lang="en-US" l10n="U" oldref="200">Korean: fullwidth text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155538" xml-lang="en-US" l10n="U" oldref="201">[NatNum7] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145123" xml-lang="en-US" l10n="U" oldref="202">Japanese: modern short Kanji text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149424" xml-lang="en-US" l10n="U" oldref="203">Korean: informal lower case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153688" xml-lang="en-US" l10n="U" oldref="204">[NatNum8] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="U" oldref="205">Japanese: traditional short Kanji text [DBNum4]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145602" xml-lang="en-US" l10n="U" oldref="206">Korean: informal upper case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159228" xml-lang="en-US" l10n="U" oldref="207">[NatNum9] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154644" xml-lang="en-US" l10n="U" oldref="208">Korean: Hangul characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155396" xml-lang="en-US" l10n="U" oldref="209">[NatNum10] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150878" xml-lang="en-US" l10n="U" oldref="210">Korean: formal Hangul text [DBNum4]; CAL: 9/11/11 [DBNum4]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149384" xml-lang="en-US" l10n="U" oldref="211">[NatNum11] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154213" xml-lang="en-US" l10n="U" oldref="212">Korean: informal Hangul text</paragraph>
</tablecell>
</tablerow>
</table>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030300.xhp b/helpcontent2/source/text/shared/01/05030300.xhp
index 38830cb2bd..f7a10320e8 100755
--- a/helpcontent2/source/text/shared/01/05030300.xhp
+++ b/helpcontent2/source/text/shared/01/05030300.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105030300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105030300xml" indexer="include">
<title id="tit" xml-lang="en-US">Tabs</title>
<filename>/text/shared/01/05030300.xhp</filename>
</topic>
@@ -48,48 +46,62 @@
<bookmark_value>fill characters with tabulators</bookmark_value>
<bookmark_value>tab stops;settings</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_TABULATOR" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030300.xhp" name="Tabs">Tabs</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABULATOR" id="bm_id3153311" localize="false"/>
+<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030300.xhp" name="Tabs">Tabs</link></paragraph>
<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_TABULATOR">Set the position of a tab stop in a paragraph.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="40">If you want, you can also use the ruler to set the tab positions.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#tabulator"/>
+<embed href="text/shared/00/00040500.xhp#tabulator"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/>
+<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
<paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS">Select a tab stop type, enter a new measurement, and then click <emph>New</emph>. If you want, you can also specify the measurement units to use for the tab (cm for centimeter, or " for inches). Existing tabs to the left of the first tab that you set are removed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="2" l10n="U" oldref="9">Type</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Select the type of tab stop that you want to modify.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/><paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="3" l10n="U" oldref="11">Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/>
+<paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="3" l10n="U" oldref="11">Left</paragraph>
<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="41">The name of this tab stop is <emph>Left/Top</emph> if Asian language support is enabled.</paragraph>
<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT">Aligns the left edge of the text to the tab stop and extends the text to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="13">Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/>
+<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="13">Right</paragraph>
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="42">This name of this tab stop is <emph>Right/Bottom</emph> if Asian language support is enabled.</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT">Aligns the right edge of the text to the tab stop and extends the text to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/><paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="15">Center</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/>
+<paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="15">Center</paragraph>
<paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER">Aligns the center of the text to the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/><paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/>
+<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL">Aligns the decimal point of a number to the center of the tab stop and text to the left of the tab.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="WIN">The character that is used as a decimal separator depends on the regional setting of your operating system.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/><paragraph role="heading" id="hd_id3153380" xml-lang="en-US" level="3" l10n="U" oldref="20">Character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/>
+<paragraph role="heading" id="hd_id3153380" xml-lang="en-US" level="3" l10n="U" oldref="20">Character</paragraph>
<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR">Enter a character that you want the decimal tab to use as a decimal separator.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159151" xml-lang="en-US" level="2" l10n="U" oldref="22">Fill Character</paragraph>
<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="23">Specify the characters to use as leader to the left of the tab stop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/><paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="U" oldref="24">None</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/>
+<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="U" oldref="24">None</paragraph>
<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO">Inserts no fill characters, or removes existing fill characters to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/><paragraph role="heading" id="hd_id3152933" xml-lang="en-US" level="3" l10n="U" oldref="26">.......</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/>
+<paragraph role="heading" id="hd_id3152933" xml-lang="en-US" level="3" l10n="U" oldref="26">.......</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS">Fills the empty space to the left of the tab stop with dots.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="28">------</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/>
+<paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="28">------</paragraph>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE">Fills the empty space to the left of the tab stop with dashes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3157960" xml-lang="en-US" level="3" l10n="U" oldref="30">______</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/>
+<paragraph role="heading" id="hd_id3157960" xml-lang="en-US" level="3" l10n="U" oldref="30">______</paragraph>
<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE">Draws a line to fill the empty space to the left of the tab stop.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER" id="bm_id3153057" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/><paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="32">Character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/>
+<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="32">Character</paragraph>
<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER">Allows you to specify a character to fill the empty space to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/><paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="36">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/>
+<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="36">New</paragraph>
<paragraph role="paragraph" id="par_id3163717" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW">Adds the tab stop that you defined to the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/><paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="2" l10n="U" oldref="38">Clear All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/>
+<paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="2" l10n="U" oldref="38">Clear All</paragraph>
<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL">Removes all of the tab stops that you defined under <emph>Position</emph>. Sets <emph>Left</emph> tab stops at regular intervals as the default tab stops.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030700.xhp b/helpcontent2/source/text/shared/01/05030700.xhp
index 4f0b8030b8..dc6de00788 100755
--- a/helpcontent2/source/text/shared/01/05030700.xhp
+++ b/helpcontent2/source/text/shared/01/05030700.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030700.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105030700xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105030700xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
<filename>/text/shared/01/05030700.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T14:54:11">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ausrichtung">
@@ -59,7 +55,7 @@
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_ALIGN">Sets the alignment of the paragraph relative to the margins of page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#absatzausrichtung"/>
+<embed href="text/shared/00/00040500.xhp#absatzausrichtung"/>
</section>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Alignment</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="CHG" oldref="4">Set the alignment options for the current paragraph.</paragraph>
@@ -110,8 +106,11 @@
<section id="textflow">
<paragraph role="heading" id="hd_id3144434" xml-lang="en-US" level="2" l10n="U" oldref="23">Properties</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FORMAT_TABLE_LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3149797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/>
<paragraph role="heading" id="hd_id3154631" xml-lang="en-US" level="3" l10n="U" oldref="25">Text direction</paragraph>
-<paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION">Specify the text direction for a paragraph that uses complex text layout (CTL).</ahelp> This feature is only available if complex text layout support is enabled.</paragraph>
+<paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
</section>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 71686f81bd..7f1ef53547 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 05040200.xhp,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.19.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0105040200xml" indexer="include">
+<topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Page</title>
<filename>/text/shared/01/05040200.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/01/05040300.xhp b/helpcontent2/source/text/shared/01/05040300.xhp
index 4fe1efadcf..293ffc9379 100644
--- a/helpcontent2/source/text/shared/01/05040300.xhp
+++ b/helpcontent2/source/text/shared/01/05040300.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="31">If you want to extend a header into the page margins, insert a frame into the header.</paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press Ctrl+Page Up or Ctrl+Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER"><paragraph role="tip" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3152360" xml-lang="en-US" level="2" l10n="U" oldref="4">Header</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05040400.xhp b/helpcontent2/source/text/shared/01/05040400.xhp
index 02e3273b46..ffc76d66af 100644
--- a/helpcontent2/source/text/shared/01/05040400.xhp
+++ b/helpcontent2/source/text/shared/01/05040400.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040400.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="30">If you want to extend a footer into the page margins, insert a frame into the footer.</paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3150976" xml-lang="en-US" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press Ctrl+Page Up or Ctrl+Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER"><paragraph role="tip" id="par_id3150976" xml-lang="en-US" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="2" l10n="U" oldref="3">Footer</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070000.xhp b/helpcontent2/source/text/shared/01/05070000.xhp
index 725f6e7cd0..06a1493731 100644
--- a/helpcontent2/source/text/shared/01/05070000.xhp
+++ b/helpcontent2/source/text/shared/01/05070000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105070000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Aligning (Objects)</title>
<filename>/text/shared/01/05070000.xhp</filename>
</topic>
@@ -48,12 +46,13 @@
<bookmark_value>positioning; objects</bookmark_value>
<bookmark_value>ordering; objects</bookmark_value>
</bookmark>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignFrameMenu" id="bm_id0801200803290113" localize="false"/>
<paragraph role="heading" id="hd_id3149987" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05070000.xhp" name="Aligning (Objects)">Alignment (Objects)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2">Aligns selected objects with respect to one another.</paragraph>
+<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Aligns selected objects with respect to one another.</ahelp></paragraph>
</section>
<paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="4">If one of the selected objects is anchored as a character, some of the alignment options do not work.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#ausrichtung"/>
+<embed href="text/shared/00/00040501.xhp#ausrichtung"/>
</section>
<paragraph role="note" id="par_id8872646" xml-lang="en-US" l10n="NEW">Not all types of objects can be selected together. Not all modules (Writer, Calc, Impress, Draw) support all types of alignment.</paragraph>
<embed href="text/shared/01/05070100.xhp#links"/>
diff --git a/helpcontent2/source/text/shared/01/05070100.xhp b/helpcontent2/source/text/shared/01/05070100.xhp
index 86bb235c62..ff703c3add 100644
--- a/helpcontent2/source/text/shared/01/05070100.xhp
+++ b/helpcontent2/source/text/shared/01/05070100.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070100xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Left</title>
<filename>/text/shared/01/05070100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-31T16:25:16">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="links">
@@ -50,11 +46,12 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectAlignLeft" id="bm_id3147294" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ALIGNLEFT" id="bm_id4286842" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AlignLeft" id="bm_id3155619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_LEFT" id="bm_id0801200803221452" localize="false"/>
<paragraph role="heading" id="hd_id3147069" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070100.xhp" name="Align Left">Align Left</link></paragraph>
<paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignLeft">Aligns the left edges of the selected objects. If only one object is selected in Draw or Impress, the left edge of the object is aligned to the left page margin.</ahelp></paragraph><comment>UFI: this help id .uno:alignleft is also called from Calc, where it has a different function</comment>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#links"/>
+<embed href="text/shared/00/00040501.xhp#links"/>
</section>
<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the left edge of the leftmost object in the selection.</paragraph>
<paragraph role="note" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><variable id="mehrfachselektion">To align the individual objects in a group, <switchinline select="appl"><caseinline select="CALC">choose <emph>Format - Group - Edit Group</emph>
diff --git a/helpcontent2/source/text/shared/01/05070200.xhp b/helpcontent2/source/text/shared/01/05070200.xhp
index e559a7501f..705964ad62 100644
--- a/helpcontent2/source/text/shared/01/05070200.xhp
+++ b/helpcontent2/source/text/shared/01/05070200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070200.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,27 +32,25 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070200xml" indexer="include">
<title id="tit" xml-lang="en-US">Center Horizontal</title>
<filename>/text/shared/01/05070200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:16:20">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="zentriert">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_CENTER" id="bm_id5496441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id3160463" localize="false"/><comment>removed two lines HorizontalCenter</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id3160463" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_CENTER" id="bm_id0801200803230778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignHorizontalCenter" id="bm_id0801200803230775" localize="false"/>
<paragraph role="heading" id="hd_id3150278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070200.xhp" name="Center Horizontal">Center Horizontal</link></paragraph>
<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignHorizontalCenter">Horizontally centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the horizontal center of the page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#azentriert"/>
+<embed href="text/shared/00/00040501.xhp#azentriert"/>
</section>
<paragraph role="paragraph" id="par_id3144336" xml-lang="en-US" l10n="U" oldref="3">The vertical position of the selected objects is not affected by this command.<embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070300.xhp b/helpcontent2/source/text/shared/01/05070300.xhp
index 5a72698df2..1b2b4e3f9d 100644
--- a/helpcontent2/source/text/shared/01/05070300.xhp
+++ b/helpcontent2/source/text/shared/01/05070300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,31 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070300xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Right</title>
<filename>/text/shared/01/05070300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-14T10:15:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="rechts">
-<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_RIGHT" id="bm_id8583142" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_RIGHT" id="bm_id8583142" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectAlignRight" id="bm_id3150756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_RIGHT" id="bm_id0801200803235699" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignRight" id="bm_id0801200803235673" localize="false"/>
<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070300.xhp" name="Align Right">Align Right</link></paragraph>
-<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignRight">Aligns the right edges of the selected objects. <switchinline select="appl"><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</caseinline><caseinline select="MATH">
-</caseinline><defaultinline>If only one object is selected, the right edge of the object is aligned to the right page margin.</defaultinline></switchinline></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignRight">Aligns the right edges of the selected objects. If only one object is selected in Impress or Draw, the right edge of the object is aligned to the right page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#rechts"/>
+<embed href="text/shared/00/00040501.xhp#rechts"/>
</section>
<paragraph role="paragraph" id="par_id3144336" xml-lang="en-US" l10n="U" oldref="3">Objects are aligned to the right edge of the rightmost object in the selection.</paragraph>
<embed href="text/shared/01/05070100.xhp#mehrfachselektion"/>
diff --git a/helpcontent2/source/text/shared/01/05070400.xhp b/helpcontent2/source/text/shared/01/05070400.xhp
index 4b1b0771eb..d95e717a2b 100644
--- a/helpcontent2/source/text/shared/01/05070400.xhp
+++ b/helpcontent2/source/text/shared/01/05070400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070400.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070400xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070400xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Top</title>
<filename>/text/shared/01/05070400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:38:48">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="oben">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_UP" id="bm_id7303719" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AlignUp" id="bm_id3155271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_VERT_TOP" id="bm_id0801200803203572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignTop" id="bm_id0801200803203641" localize="false"/>
<paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070400.xhp" name="Align Top">Align Top</link></paragraph>
-<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignTop">Horizontally aligns the top edges of the selected objects. If only one object is selected in Draw or Impress, the top edge of the object is aligned to the upper page margin.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignTop">Vertically aligns the top edges of the selected objects. If only one object is selected in Draw or Impress, the top edge of the object is aligned to the upper page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#oben"/>
+<embed href="text/shared/00/00040501.xhp#oben"/>
</section>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">Objects are aligned to the top edge of the topmost object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070500.xhp b/helpcontent2/source/text/shared/01/05070500.xhp
index 79c45baeaa..1df4ae8113 100644
--- a/helpcontent2/source/text/shared/01/05070500.xhp
+++ b/helpcontent2/source/text/shared/01/05070500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070500.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* 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="textshared0105070500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070500xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Vertical Center</title>
<filename>/text/shared/01/05070500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:21:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="mitte">
@@ -52,7 +50,7 @@
<paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignVerticalCenter">Vertically centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the vertical center of the page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#mitte"/>
+<embed href="text/shared/00/00040501.xhp#mitte"/>
</section>
<embed href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05070600.xhp b/helpcontent2/source/text/shared/01/05070600.xhp
index 2b34d85a9f..3db52f6ce6 100644
--- a/helpcontent2/source/text/shared/01/05070600.xhp
+++ b/helpcontent2/source/text/shared/01/05070600.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070600.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,29 +32,27 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070600xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070600xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Bottom</title>
<filename>/text/shared/01/05070600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:11:08">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="unten">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_DOWN" id="bm_id6953148" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignDown" id="bm_id3159079" localize="false"/><comment>UFI: removed two lines with AlignBottom</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignDown" id="bm_id3159079" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_VERT_BOTTOM" id="bm_id0801200803174823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignBottom" id="bm_id0801200803174999" localize="false"/>
<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070600.xhp" name="Align Bottom">Align Bottom</link></paragraph>
-<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Horizontally aligns the bottom edges of the selected objects. If only one object is selected in Draw or Impress, the bottom edge of the object is aligned to the lower page margin.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Vertically aligns the bottom edges of the selected objects. If only one object is selected in Draw or Impress, the bottom edge of the object is aligned to the lower page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#unten"/>
+<embed href="text/shared/00/00040501.xhp#unten"/>
</section>
-<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the top edge of the topmost object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
+<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the bottom edge of the bottom most object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100100.xhp b/helpcontent2/source/text/shared/01/05100100.xhp
new file mode 100644
index 0000000000..24f10ba262
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100100.xhp
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100100.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100100xhp" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Merge</title>
+<filename>/text/shared/01/05100100.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="verbinden">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_CELLS" id="bm_id1766491" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id3149051" localize="false"/>
+<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100100.xhp" name="Merge">Merge</link></paragraph>
+<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US" l10n="U" oldref="2"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected table cells into a single cell.</ahelp>
+</variable><comment>moved from swriter/01/05100100.xhp, see i86644</comment></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+</paragraph>
+</case>
+</switch>
+<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.423cm" height="0.423cm"><alt id="alt_id3154002" xml-lang="en-US">icon</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>
+<paragraph role="warning" id="par_id3153718" xml-lang="en-US" l10n="U" oldref="3">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
new file mode 100644
index 0000000000..0461b8cef1
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100200.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100200xhp" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Split Cells</title>
+<filename>/text/shared/01/05100200.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="zellenteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_CELLS" id="bm_id3525727" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/>
+<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph>
+<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="2"><variable id="teilentext"><ahelp hid=".uno:SplitCell">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp>
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+</paragraph>
+</case>
+</switch>
+<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.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</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>
+<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
+<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="3">Split cell into</paragraph>
+<paragraph role="paragraph" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_SPLIT:ED_COUNT">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2" l10n="U" oldref="5">Direction</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ" id="bm_id3149028" localize="false"/>
+<paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="7">Horizontally</paragraph>
+<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_HORZ">Splits the selected cell(s) into the number of rows that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SPLIT_CB_PROP" id="bm_id3151185" localize="false"/>
+<paragraph role="heading" id="hd_id3147566" xml-lang="en-US" level="3" l10n="U" oldref="11">Into equal proportions</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_DLG_SPLIT_CB_PROP">Splits cells into rows of equal height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT" id="bm_id3151168" localize="false"/>
+<paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3" l10n="U" oldref="9">Vertically</paragraph>
+<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_VERT">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp
new file mode 100644
index 0000000000..346c369bf8
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100500.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100500.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100500xml" indexer="include">
+<title id="tit" xml-lang="en-US">Top</title>
+<filename>/text/shared/01/05100500.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="oben">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_NONE" id="bm_id5466554" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id3149048" localize="false"/>
+<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100500.xhp" name="Top">Top</link></paragraph>
+<paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertTop">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3145671" xml-lang="en-US" l10n="U" oldref="120"><variable id="zelleoben">In the context menu of a cell, choose <emph>Cell - Top</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp
new file mode 100644
index 0000000000..b9a090e6e3
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100600.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100600.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100600xml" indexer="include">
+<title id="tit" xml-lang="en-US">Middle</title>
+<filename>/text/shared/01/05100600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="mitte">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_CENTER" id="bm_id4218858" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id3154766" localize="false"/>
+<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100600.xhp" name="Middle">Middle</link></paragraph>
+<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertCenter">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="121"><variable id="zellemitte">In the context menu of a cell, choose <emph>Cell - Center</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp
new file mode 100644
index 0000000000..7fa2e119f5
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100700.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100700.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100700xml" indexer="include">
+<title id="tit" xml-lang="en-US">Bottom</title>
+<filename>/text/shared/01/05100700.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="unten">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_BOTTOM" id="bm_id3581992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3151244" localize="false"/>
+<paragraph role="heading" id="hd_id3150249" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100700.xhp" name="Bottom">Bottom</link></paragraph>
+<paragraph role="paragraph" id="par_id3154764" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertBottom">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3149201" xml-lang="en-US" l10n="U" oldref="122"><variable id="zelleunten">In the context menu of a cell, choose <emph>Cell - Bottom</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05110000.xhp b/helpcontent2/source/text/shared/01/05110000.xhp
index fbf6b9214a..e58be3c355 100755
--- a/helpcontent2/source/text/shared/01/05110000.xhp
+++ b/helpcontent2/source/text/shared/01/05110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,6 @@
<embed href="text/shared/01/05110300.xhp#unter"/>
<embed href="text/shared/01/05110400.xhp#durch"/>
<embed href="text/shared/01/05110500.xhp#schatten"/>
-<embed href="text/shared/01/05110600.xhp#kontur"/>
<embed href="text/shared/01/05110700.xhp#hoch"/>
<embed href="text/shared/01/05110800.xhp#tief"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05110600.xhp b/helpcontent2/source/text/shared/01/05110600.xhp
index 8b41d3d792..e69de29bb2 100644
--- a/helpcontent2/source/text/shared/01/05110600.xhp
+++ b/helpcontent2/source/text/shared/01/05110600.xhp
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05110600.xhp,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0105110600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Contour</title>
-<filename>/text/shared/01/05110600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T12:36:04">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="kontur">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153383"><bookmark_value>text; contours</bookmark_value>
-<bookmark_value>contours of text</bookmark_value>
-<bookmark_value>characters; contours</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_CONTOUR" id="bm_id7049784" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OutlineFont" id="bm_id3153272" localize="false"/>
-<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05110600.xhp" name="Contour">Contour</link></paragraph>
-<paragraph role="paragraph" id="par_id3154788" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OutlineFont">Outlines the selected text, or if the cursor is in word, the entire word.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#stilkontur"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
new file mode 100644
index 0000000000..5846a241ac
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05110600m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105110600mxhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Space Rows Equally</title>
+<filename>/text/shared/01/05110600m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="gleichverteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_ROWS" id="bm_id2550261" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id3151240" localize="false"/>
+<paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05110600m.xhp" name="Space Equally">Space Rows Equally</link></paragraph>
+<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeRows">Adjusts the height of the selected rows to match the height of the tallest row in the selection.</ahelp>
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+</paragraph>
+</case>
+</switch>
+<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.423cm" height="0.423cm"><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>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
new file mode 100644
index 0000000000..a7d0233c12
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05120600.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105120600xhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Space Columns Equally</title>
+<filename>/text/shared/01/05120600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="gleichverteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_CELLS" id="bm_id2213069" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id3149055" localize="false"/>
+<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph>
+<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page.
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+</paragraph>
+</case>
+</switch>
+<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.423cm" height="0.423cm"><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>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 3f799c9f86..48ff35bc75 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05200200.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105200200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105200200xml" indexer="include">
<title id="tit" xml-lang="en-US">Line Styles</title>
<filename>/text/shared/01/05200200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T08:33:29">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="linienstile">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_LINE_DEF">Edit or create dashed or dotted line styles.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#linienstile"/>
+<embed href="text/shared/00/00040502.xhp#linienstile"/>
</section>
<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES" id="bm_id3147212" localize="false"/>
@@ -82,7 +80,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY" id="bm_id3147011" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
<paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_DELETE" id="bm_id3150443" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD" id="bm_id3149812" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="23">Load line style table</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD">Imports a list of line styles.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05200300.xhp b/helpcontent2/source/text/shared/01/05200300.xhp
index b2607e8f64..8255f66301 100755
--- a/helpcontent2/source/text/shared/01/05200300.xhp
+++ b/helpcontent2/source/text/shared/01/05200300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05200300.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105200300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105200300xml" indexer="include">
<title id="tit" xml-lang="en-US">Arrow Styles</title>
<filename>/text/shared/01/05200300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-29T14:19:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="linienenden">
@@ -51,7 +47,7 @@
<paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_LINE_ENDDEF">Edit or create arrow styles.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#linienenden"/>
+<embed href="text/shared/00/00040502.xhp#linienenden"/>
</section>
<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="5">Organize arrow styles</paragraph>
<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="6">Lets you organize the current list of arrow styles.</paragraph>
@@ -67,7 +63,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Modify</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY">Changes the name of the selected arrow style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD" id="bm_id3148992" localize="false"/>
<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="2" l10n="U" oldref="15">Load Arrow Styles</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD">Imports a list of arrow styles.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210300.xhp b/helpcontent2/source/text/shared/01/05210300.xhp
index d9d816178c..4db7de5d5f 100755
--- a/helpcontent2/source/text/shared/01/05210300.xhp
+++ b/helpcontent2/source/text/shared/01/05210300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210300.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210300xml" indexer="include">
<title id="tit" xml-lang="en-US">Gradients</title>
<filename>/text/shared/01/05210300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:02:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="farbverlaeufe">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3154812" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_GRADIENT">Set the properties of a gradient, or save and load gradient lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#verlauf"/>
+<embed href="text/shared/00/00040502.xhp#verlauf"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES" id="bm_id3153089" localize="false"/>
<paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="3">Type</paragraph>
@@ -85,7 +83,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY" id="bm_id3153543" localize="false"/>
<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="3" l10n="U" oldref="19">Modify</paragraph>
<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY">Applies the current gradient properties to the selected gradient. If you want, you can save the gradient under a different name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD" id="bm_id3146848" localize="false"/>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="31">Load Gradients List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210400.xhp b/helpcontent2/source/text/shared/01/05210400.xhp
index 72281218ad..e8401f946e 100755
--- a/helpcontent2/source/text/shared/01/05210400.xhp
+++ b/helpcontent2/source/text/shared/01/05210400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210400.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210400xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210400xml" indexer="include">
<title id="tit" xml-lang="en-US">Hatching</title>
<filename>/text/shared/01/05210400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-28T12:32:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schraffuren">
@@ -55,7 +51,7 @@
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_HATCH">Set the properties of a hatching pattern, or save and load hatching lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#schraffur"/>
+<embed href="text/shared/00/00040502.xhp#schraffur"/>
</section>
<paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">Define or modify a hatching pattern.</paragraph>
@@ -85,7 +81,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY" id="bm_id3146848" localize="false"/>
<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="17">Modify</paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY">Applies the current hatching properties to the selected hatching pattern. If you want, you can save the pattern under a different name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_LOAD" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="2" l10n="U" oldref="25">Load Hatches List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210500.xhp b/helpcontent2/source/text/shared/01/05210500.xhp
index 968b18906a..ff9361dbaa 100755
--- a/helpcontent2/source/text/shared/01/05210500.xhp
+++ b/helpcontent2/source/text/shared/01/05210500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210500.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210500xml" indexer="include">
<title id="tit" xml-lang="en-US">Bitmap</title>
<filename>/text/shared/01/05210500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T12:55:10">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="bitmapmuster">
@@ -57,7 +53,7 @@
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_BITMAP">Select a bitmap that you want to use as a fill pattern, or create your own pixel pattern. You can also import bitmaps, and save or load bitmap lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#bitmap"/>
+<embed href="text/shared/00/00040502.xhp#bitmap"/>
</section>
<paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="2" l10n="U" oldref="3">Pattern Editor</paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="4">Use this editor to create a simple, two-color, 8x8 pixel bitmap pattern.</paragraph>
@@ -81,7 +77,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT" id="bm_id3152945" localize="false"/>
<paragraph role="heading" id="hd_id3149516" xml-lang="en-US" level="2" l10n="U" oldref="13">Import</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT">Locate the bitmap that you want to import, and then click <emph>Open</emph>. The bitmap is added to the end of the list of available bitmaps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_LOAD" id="bm_id3148925" localize="false"/>
<paragraph role="heading" id="hd_id3159166" xml-lang="en-US" level="2" l10n="U" oldref="21">Load Bitmap List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250000.xhp b/helpcontent2/source/text/shared/01/05250000.xhp
index 9f11db9229..7ddaebbf37 100644
--- a/helpcontent2/source/text/shared/01/05250000.xhp
+++ b/helpcontent2/source/text/shared/01/05250000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* 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="textshared0105250000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250000xml" indexer="include">
<title id="tit" xml-lang="en-US">Arrange</title>
<filename>/text/shared/01/05250000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T11:17:12">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="anordnung">
@@ -60,11 +57,12 @@
<bookmark xml-lang="en-US" branch="hid/SID_POSITION" id="bm_id8728812" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectPosition" id="bm_id3149551" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ArrangeMenu" id="bm_id3945738" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ArrangeFrameMenu" id="bm_id0801200803311649" localize="false"/>
<paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05250000.xhp" name="Arranging Objects">Arrange</link></paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ObjectPosition">Changes the stacking order of the selected object(s).</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#anordnung"/>
+<embed href="text/shared/00/00040501.xhp#anordnung"/>
</section>
<paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="9">Layer for text and graphics</paragraph>
<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4">Each object that you place in your document is successively stacked on the preceding object. Use the arrange commands to change the stacking order of objects in your document. You cannot change the stacking order of text.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250200.xhp b/helpcontent2/source/text/shared/01/05250200.xhp
index ca4cdcafda..0afbc37a22 100644
--- a/helpcontent2/source/text/shared/01/05250200.xhp
+++ b/helpcontent2/source/text/shared/01/05250200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250200.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,27 +32,25 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105250200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250200xml" indexer="include">
<title id="tit" xml-lang="en-US">Bring Forward </title>
<filename>/text/shared/01/05250200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:54:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="positionnachvorn">
<bookmark xml-lang="en-US" branch="hid/SID_MOREFRONT" id="bm_id9123117" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Forward" id="bm_id3155620" localize="false"/><comment>removed several help ids</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:Forward" id="bm_id3155620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_UP" id="bm_id0801200803082196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectForwardOne" id="bm_id080120080307113" localize="false"/>
<paragraph role="heading" id="hd_id3152790" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05250200.xhp" name="Bring Forward ">Bring Forward </link></paragraph>
<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Moves the selected object up one level, so that it is closer to top of the stacking order.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#nachvorn"/>
+<embed href="text/shared/00/00040501.xhp#nachvorn"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/05250000.xhp" name="Layer">Layer</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250300.xhp b/helpcontent2/source/text/shared/01/05250300.xhp
index 40710bf60b..5b047c24b5 100644
--- a/helpcontent2/source/text/shared/01/05250300.xhp
+++ b/helpcontent2/source/text/shared/01/05250300.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250300.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -30,28 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105250300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250300xml" indexer="include">
<title id="tit" xml-lang="en-US">Send Backward</title>
<filename>/text/shared/01/05250300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:56:24">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="positionnachhinten">
<bookmark xml-lang="en-US" branch="hid/SID_MOREBACK" id="bm_id2505918" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Backward" id="bm_id3149988" localize="false"/><comment>UFI: removed some help ids</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:Backward" id="bm_id3149988" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_DOWN" id="bm_id0801200803071063" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectBackOne" id="bm_id0801200803082118" localize="false"/>
<paragraph role="heading" id="hd_id3150146" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05250300.xhp" name="Send Backward">Send Backward</link></paragraph>
<paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Moves the selected object down one level, so that it is closer to the bottom of the stacking order.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#nachhinten"/>
+<embed href="text/shared/00/00040501.xhp#nachhinten"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/05250000.xhp" name="Layer">Layer</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05260000.xhp b/helpcontent2/source/text/shared/01/05260000.xhp
index 0b0d37dab6..b8ac5f557c 100644
--- a/helpcontent2/source/text/shared/01/05260000.xhp
+++ b/helpcontent2/source/text/shared/01/05260000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260000xml" indexer="include">
<title id="tit" xml-lang="en-US">Anchor</title>
<filename>/text/shared/01/05260000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-26T13:56:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="verankerung">
@@ -56,10 +52,9 @@
</case>
</switch>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#wechsel"/>
+<embed href="text/shared/00/00040501.xhp#wechsel"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_TOGGLE" id="bm_id571270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToggleAnchorType" id="bm_id3147399" localize="false"/><embed href="text/shared/02/03200000.xhp#verankerungtext"/>
+<embed href="text/shared/02/03200000.xhp#verankerungtext"/>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/00/00040501.xhp#syverankerung"/>
</case>
diff --git a/helpcontent2/source/text/shared/01/05260100.xhp b/helpcontent2/source/text/shared/01/05260100.xhp
index b9a0307e46..153fe8a358 100644
--- a/helpcontent2/source/text/shared/01/05260100.xhp
+++ b/helpcontent2/source/text/shared/01/05260100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260100xml" indexer="include">
<title id="tit" xml-lang="en-US">To Page</title>
<filename>/text/shared/01/05260100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:42:50">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="anderseite">
-<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_PAGE" id="bm_id4556654" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_PAGE" id="bm_id4556654" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorToPage" id="bm_id3156045" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_PAGE" id="bm_id0801200803434125" localize="false"/>
<paragraph role="heading" id="hd_id3150278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260100.xhp" name="To Page">To Page</link></paragraph>
<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:SetAnchorToPage">Anchors the selected item to the current page.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3149987" xml-lang="en-US" l10n="U" oldref="4">The anchored item remains on the current page even if you insert or delete text.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#anseite"/>
+<embed href="text/shared/00/00040501.xhp#anseite"/>
</section>
<paragraph role="paragraph" id="par_id3152821" xml-lang="en-US" l10n="U" oldref="3">The anchor icon is displayed at the top left corner of the page.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05260300.xhp b/helpcontent2/source/text/shared/01/05260300.xhp
index 5a499fd26d..dc6e8953ac 100644
--- a/helpcontent2/source/text/shared/01/05260300.xhp
+++ b/helpcontent2/source/text/shared/01/05260300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,30 +30,28 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260300xml" indexer="include">
<title id="tit" xml-lang="en-US">To Character</title>
<filename>/text/shared/01/05260300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:42:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<switch select="appl">
<case select="WRITER">
<section id="amzeichen">
-<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id9823184" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorToChar" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id9823184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_AT_CHAR" id="bm_id0801200803430844" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorAtChar" id="bm_id0801200803430880" localize="false"/>
<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260300.xhp" name="To Character">To Character</link></paragraph>
<paragraph role="paragraph" id="par_id3147069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Anchors the selected item to a character.</ahelp> This command is only available for graphic objects.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#amzeichen"/>
+<embed href="text/shared/00/00040501.xhp#amzeichen"/>
</section>
<paragraph role="paragraph" id="par_id3146067" xml-lang="en-US" l10n="U" oldref="3">The anchor is displayed in front of the character.</paragraph>
<paragraph role="tip" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4">To align a graphic relative to the character that it is anchored to, right-click the graphic, and then choose <emph>Graphics</emph>. Click the <emph>Type </emph>tab, and in the <emph>Position </emph>area, select <emph>Character</emph> in the <emph>to</emph> boxes.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05260600.xhp b/helpcontent2/source/text/shared/01/05260600.xhp
index b1841bea5d..09df8c907c 100644
--- a/helpcontent2/source/text/shared/01/05260600.xhp
+++ b/helpcontent2/source/text/shared/01/05260600.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260600.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260600xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260600xml" indexer="include">
<title id="tit" xml-lang="en-US">As Character</title>
<filename>/text/shared/01/05260600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:39:34">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="alszeichen">
<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorAsChar" id="bm_id9494613" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id080120080342379" localize="false"/>
<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260600.xhp" name="As Character">As Character</link></paragraph>
<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Anchors the selected item as a character in the current text. If the height of the selected item is greater than the current font size, the height of the line containing the item is increased.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#alszeichen"/>
+<embed href="text/shared/00/00040501.xhp#alszeichen"/>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index 519cbc095f..d5988cb0a3 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05340300.xhp,v $
- *
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textshared0105340300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105340300xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
<filename>/text/shared/01/05340300.xhp</filename>
</topic>
@@ -138,8 +136,9 @@
<emph>Text Extension Inside Cells:</emph> Writes the rotated text only within the cell.</paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_TXTSTACKED" id="bm_id080420080320333" localize="false"/>
<paragraph role="heading" id="par_idN109F4" xml-lang="en-US" level="3" l10n="NEW">Vertically stacked</paragraph>
-<paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW">Aligns text vertically.<comment>UFI: see spec "Shrink to fit"</comment></paragraph>
+<paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns text vertically.</ahelp><comment>UFI: see spec "Shrink to fit"</comment></paragraph>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
<paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
@@ -154,7 +153,8 @@
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH" id="bm_id3155415" localize="false"/>
<paragraph role="heading" id="hd_id3147380" xml-lang="en-US" level="3" l10n="U" oldref="81">Hyphenation active</paragraph>
<paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH">Enables word hyphenation for text wrapping to the next line.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK" id="bm_id080420080321345" localize="false"/>
<paragraph role="heading" id="par_idN10AD3" xml-lang="en-US" level="3" l10n="NEW">Shrink to fit cell size</paragraph>
-<paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</paragraph>
+<paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340400.xhp b/helpcontent2/source/text/shared/01/05340400.xhp
index 7ce0cf9a7c..a581e64c5c 100644
--- a/helpcontent2/source/text/shared/01/05340400.xhp
+++ b/helpcontent2/source/text/shared/01/05340400.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05340400.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -82,7 +82,7 @@
<paragraph role="tablecontent" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="16">Several records or removing a selection</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="17">Hold down Ctrl and click the row header</paragraph>
+<paragraph role="tablecontent" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="17">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and click the row header</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/01/05350500.xhp b/helpcontent2/source/text/shared/01/05350500.xhp
index 81e9b3a18b..d539b1b29b 100644
--- a/helpcontent2/source/text/shared/01/05350500.xhp
+++ b/helpcontent2/source/text/shared/01/05350500.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05350500.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -46,7 +46,7 @@
<section id="texturen">
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE" id="bm_id3148410" localize="false"/>
<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350500.xhp" name="Textures">Textures</link></paragraph>
-<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE">Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the <emph>Gallery</emph>, hold down Shift+Ctrl, and then drag an image onto the selected 3D object.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE">Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the <emph>Gallery</emph>, hold down Shift+Ctrl (Mac: Shift+Command), and then drag an image onto the selected 3D object.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#3dtexturen"/>
diff --git a/helpcontent2/source/text/shared/01/06010000.xhp b/helpcontent2/source/text/shared/01/06010000.xhp
index 1a9d20206f..e0f179ee50 100644
--- a/helpcontent2/source/text/shared/01/06010000.xhp
+++ b/helpcontent2/source/text/shared/01/06010000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06010000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
<topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spellcheck</title>
+<title id="tit" xml-lang="en-US">Spelling and Grammar</title>
<filename>/text/shared/01/06010000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T14:16:29">UFI: fixed #113742#
-UFI: changes due to spec "Spellcheck Dialog" by FL
-DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<section id="rechtschreibung">
@@ -52,16 +47,20 @@ DEDR: Reviewed</lastedited>
<bookmark_value>languages; spellcheck</bookmark_value>
</bookmark><comment>mw changes "spellcheck;languages"</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:Spelling" id="bm_id3150702" localize="false"/>
-<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spellcheck</link></paragraph>
-<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="U" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors.</ahelp> $[officename] includes headers, footers, index entries, and footnotes in the spellcheck.
+<bookmark xml-lang="en-US" branch="hid/.uno:SpellingAndGrammarDialog" id="bm_id1022200801253693" localize="false"/>
+<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
+<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
+<embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
</section>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
+<paragraph role="paragraph" id="par_id1022200801300654" xml-lang="en-US" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
+<paragraph role="paragraph" id="par_id1022200801354366" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD" id="bm_id756859" localize="false"/>
<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Not in dictionary</paragraph>
<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
@@ -70,7 +69,7 @@ DEDR: Reviewed</lastedited>
<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="10">Suggestions</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE" id="bm_id3150822" localize="false"/>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Dictionary Language</paragraph>
+<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
<embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR" id="bm_id3148798" localize="false"/>
@@ -91,7 +90,9 @@ DEDR: Reviewed</lastedited>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNORE" id="bm_id7157811" localize="false"/>
<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Ignore Once</paragraph>
<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
-<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph>
+<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
+<bookmark xml-lang="en-US" branch="hid/40076" id="bm_id1024200804072166" localize="false"/>
+<paragraph role="paragraph" id="par_id1024200804091149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL" id="bm_id3145171" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNOREALL" id="bm_id4155705" localize="false"/>
<paragraph role="heading" id="hd_id3150740" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Ignore All</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06010500.xhp b/helpcontent2/source/text/shared/01/06010500.xhp
index f0cca951dc..1d423b3c6b 100755
--- a/helpcontent2/source/text/shared/01/06010500.xhp
+++ b/helpcontent2/source/text/shared/01/06010500.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06010500.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,27 +32,30 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106010500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106010500xml" indexer="include">
<title id="tit" xml-lang="en-US">Language</title>
<filename>/text/shared/01/06010500.xhp</filename>
</topic>
</meta>
<body>
<section id="language">
-<bookmark xml-lang="en-US" branch="hid/.uno:LanguageMenu" id="bm_id7076326" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010500.xhp">Language</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:LanguageMenu" id="bm_id7076326" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010500.xhp">Language</link></paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu where you can choose language specific commands.</ahelp></paragraph>
</section>
<switch select="appl">
<case select="WRITER"><comment>Writer menu commands, i80434</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageSelectionMenu" id="bm_id3691824" localize="false"/><paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">For Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageSelectionMenu" id="bm_id3691824" localize="false"/>
+<paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">For Selection</paragraph>
<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the selected text. <br/>Choose None to exclude the selected text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageParagraphMenu" id="bm_id5369426" localize="false"/><paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="2" l10n="NEW">For Paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageParagraphMenu" id="bm_id5369426" localize="false"/>
+<paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="2" l10n="NEW">For Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3928952" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the current paragraph. <br/>Choose None to exclude the current paragraph from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageAllTextMenu" id="bm_id1342204" localize="false"/><paragraph role="heading" id="hd_id5206762" xml-lang="en-US" level="2" l10n="NEW">For all Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageAllTextMenu" id="bm_id1342204" localize="false"/>
+<paragraph role="heading" id="hd_id5206762" xml-lang="en-US" level="2" l10n="NEW">For all Text</paragraph>
<paragraph role="paragraph" id="par_id5735953" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for all text. <br/>Choose None to exclude all text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
</case>
</switch>
@@ -63,14 +65,21 @@
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/01/06030000.xhp#hyphenation"/>
</case>
-<case select="CALC"><paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="CALC">
+<paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW">Opens the <link href="text/shared/01/05340300.xhp">Format - Cells - Alignment</link> tab page.</paragraph>
</case>
-<case select="DRAW"><paragraph role="heading" id="par_idN105D0" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="DRAW">
+<paragraph role="heading" id="par_idN105D0" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="NEW">Turns hyphenation on and off.</paragraph>
</case>
-<case select="IMPRESS"><paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="IMPRESS">
+<paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" l10n="NEW">Turns hyphenation on and off.</paragraph>
</case>
-</switch></body>
+</switch>
+<bookmark xml-lang="en-US" branch="hid/.uno:MoreDictionaries" id="bm_id0805200811520622" localize="false"/>
+<paragraph role="heading" id="hd_id0805200811534540" xml-lang="en-US" level="2" l10n="NEW">More Dictionaries Online</paragraph>
+<paragraph role="paragraph" id="par_id0805200811534630" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the default browser on the dictionaries extension page.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp
index 37497156c3..6a052cc546 100644
--- a/helpcontent2/source/text/shared/01/06040200.xhp
+++ b/helpcontent2/source/text/shared/01/06040200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06040200.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106040200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040200xml" indexer="include">
<title id="tit" xml-lang="en-US">Replace</title>
<filename>/text/shared/01/06040200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T09:49:14">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ersetzung">
@@ -61,7 +57,7 @@
<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>.
</caseinline></switchinline></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokoersetzung"/>
+<embed href="text/shared/00/00000406.xhp#autokoersetzung"/>
</section>
<embed href="text/shared/01/06040300.xhp#sprache"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFACTL_AUTOCORR_REPLACE" id="bm_id3154810" localize="false"/>
@@ -86,7 +82,6 @@
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_NEW_REPLACE" id="bm_id8823511" localize="false"/>
<paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="2" l10n="U" oldref="11">New</paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE">Adds or replaces an entry in the replacement table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id3154821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040300.xhp b/helpcontent2/source/text/shared/01/06040300.xhp
index d44890b604..694f729484 100644
--- a/helpcontent2/source/text/shared/01/06040300.xhp
+++ b/helpcontent2/source/text/shared/01/06040300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06040300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106040300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040300xml" indexer="include">
<title id="tit" xml-lang="en-US">Exceptions</title>
<filename>/text/shared/01/06040300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-04T15:21:14">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ausnahmen">
@@ -50,7 +48,7 @@
</section>
<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="U" oldref="17">The exceptions that you define depend on the current language setting. If you want, you can change the language setting by selecting a different language in the <emph>Replacements and exceptions for language</emph> box.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokoausnahmen"/>
+<embed href="text/shared/00/00000406.xhp#autokoausnahmen"/>
</section>
<section id="sprache">
<bookmark xml-lang="en-US" branch="hid/HID_AUTOCORR_LANGUAGE" id="bm_id3150902" localize="false"/>
@@ -77,10 +75,7 @@
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWDOUBLECAPS" id="bm_id2211066" localize="false"/>
<paragraph role="heading" id="hd_id3155503" xml-lang="en-US" level="3" l10n="U" oldref="8">New</paragraph>
<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS">Adds the current entry to the list of exceptions.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id3154810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id3153257" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELABBREV" id="bm_id5413373" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV" id="bm_id3152909" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS" id="bm_id3155179" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOABBREV" id="bm_id8066347" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06050600.xhp b/helpcontent2/source/text/shared/01/06050600.xhp
index 8f9b1feb30..5d50012a57 100644
--- a/helpcontent2/source/text/shared/01/06050600.xhp
+++ b/helpcontent2/source/text/shared/01/06050600.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06050600.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -44,13 +42,13 @@
</meta>
<body>
<section id="position">
-<paragraph role="head1" id="hd_id3150467" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
+<paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
<paragraph role="paragraph" id="par_id3158397" xml-lang="en-US" l10n="U" oldref="2">Sets the indent, spacing, and alignment options for the numbered or bulleted list.</paragraph>
</section><comment>do we have a how-to for numbering/bullets/outlines with/without styles? seems we really need one</comment>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#numposition"/>
</section>
-<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".</paragraph>
+<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".<comment>see http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
@@ -60,7 +58,7 @@
<paragraph role="paragraph" id="par_id423291" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the element that will follow the numbering: a tab stop, a space, or nothing.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_LISTTAB" id="bm_id3496810" localize="false"/>
<paragraph role="heading" id="hd_id7809686" xml-lang="en-US" level="3" l10n="NEW">at</paragraph>
-<paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp><comment>Position from where?</comment></paragraph>
+<paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN" id="bm_id3151246" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN" id="bm_id3151245" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN_2" id="bm_id5262611" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06130000.xhp b/helpcontent2/source/text/shared/01/06130000.xhp
index cc5841c823..41b0bbfc52 100644
--- a/helpcontent2/source/text/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/shared/01/06130000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,95 +32,123 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106130000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Macro</title>
<filename>/text/shared/01/06130000.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_BASICCHOOSER" id="bm_id870519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id3149948" localize="false"/><paragraph role="heading" id="hd_id3157552" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id3149948" localize="false"/>
+<paragraph role="heading" id="hd_id3157552" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Macro</paragraph>
<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="makro"><ahelp hid=".uno:MacroDialog">Opens a dialog to organize macros.</ahelp>
</variable><comment>UFI: it is not the dialog to run a macro</comment></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#makro"/>
+<embed href="text/shared/00/00000406.xhp#makro"/>
</section>
<embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME" id="bm_id3155351" localize="false"/><paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME" id="bm_id3155351" localize="false"/>
+<paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME">Displays the name of the selected macro. To create or to change the name of a macro, enter a name here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/><paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Lists the macros that are contained in the module selected in the <emph>Macro from </emph>list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/>
+<paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Lists the macros that are contained in the module selected in the <emph>Macro from </emph>list.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW"><comment>UFI: Important: do not add Help IDS for SELECTOR_COMMANDS and SELECTOR_CATEGORIES, because they are reused for Customize dialog and will lead to display errors there if assigned. See #i51556#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/>
+<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_BASICIDE_LIBS">Lists the libraries and the modules where you can open or save your macros. To save a macro with a particular document, open the document, and then open this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN" id="bm_id3147577" localize="false"/><paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN" id="bm_id3147577" localize="false"/>
+<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN">Runs or saves the current macro.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN" id="bm_id3150694" localize="false"/><paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN" id="bm_id3150694" localize="false"/>
+<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN">Opens the <link href="text/shared/01/06140000.xhp" name="Customize">Customize</link> dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT" id="bm_id3147276" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT" id="bm_id5118869" localize="false"/><paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT" id="bm_id5118869" localize="false"/>
+<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT">Starts the $[officename] Basic editor and opens the selected macro or dialog for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL" id="bm_id3155390" localize="false"/>
+<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="CHG" oldref="20">To create a new macro, select the "Standard" module in the <emph>Macro from</emph> list, and then click <emph>New</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="21">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB" id="bm_id3152910" localize="false"/><paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB" id="bm_id3152910" localize="false"/>
+<paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB">Saves the recorded macro in a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD" id="bm_id3155262" localize="false"/><paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD" id="bm_id3155262" localize="false"/>
+<paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD">Saves the recorded macro in a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG" id="bm_id3150118" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG" id="bm_id3150118" localize="false"/>
+<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Module/Dialog tab page</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Lets you manage modules or dialog boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/>
+<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT" id="bm_id3153779" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT" id="bm_id3153779" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT">Opens the selected macro or dialog for editing.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD" id="bm_id3156080" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New<comment>UFI: i40875</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD" id="bm_id3156080" localize="false"/>
+<paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New<comment>UFI: i40875</comment></paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD">Opens the editor and creates a new module.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG" id="bm_id3150496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG" id="bm_id5659047" localize="false"/><paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="3" l10n="CHG" oldref="39">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG" id="bm_id5659047" localize="false"/>
+<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="3" l10n="CHG" oldref="39">New</paragraph>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="CHG" oldref="40"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG">Opens the editor and creates a new dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE" id="bm_id3143232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE" id="bm_id3214514" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
-<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="3" l10n="U" oldref="42">Libraries tab page</paragraph><comment>the three tab pages have no Help button, so no need to have three help pages</comment><paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS" id="bm_id3150650" localize="false"/><paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="CHG" oldref="44">Location</paragraph>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
+<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="3" l10n="U" oldref="42">Libraries tab page</paragraph><comment>the three tab pages have no Help button, so no need to have three help pages</comment>
+<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS" id="bm_id3150650" localize="false"/>
+<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="CHG" oldref="44">Location</paragraph>
<paragraph role="paragraph" id="par_id3150290" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS">Select the application or the document containing the macro libraries that you want to organize.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS_TREE" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="46">Library</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS_TREE" id="bm_id3154910" localize="false"/>
+<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="46">Library</paragraph>
<paragraph role="paragraph" id="par_id3147500" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_BASICIDE_LIBS_TREE">Lists the existing macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT" id="bm_id3156212" localize="false"/><paragraph role="heading" id="hd_id3157320" xml-lang="en-US" level="3" l10n="U" oldref="48">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT" id="bm_id3156212" localize="false"/>
+<paragraph role="heading" id="hd_id3157320" xml-lang="en-US" level="3" l10n="U" oldref="48">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT">Opens the $[officename] Basic editor so that you can modify the selected library.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD" id="bm_id3148561" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="50">Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD" id="bm_id3148561" localize="false"/>
+<paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="50">Password</paragraph>
<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD">Assigns or edits the <link href="text/shared/01/06130100.xhp" name="password">password</link> for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB" id="bm_id3153056" localize="false"/><paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="3" l10n="U" oldref="52">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB" id="bm_id3153056" localize="false"/>
+<paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="3" l10n="U" oldref="52">New</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB">Creates a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME" id="bm_id3154985" localize="false"/><paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="56">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME" id="bm_id3154985" localize="false"/>
+<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="56">Name</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME">Enter a name for the new library or module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND" id="bm_id3153951" localize="false"/><paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="CHG" oldref="54">Import<comment>changed in #i64102</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND" id="bm_id3153951" localize="false"/>
+<paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="CHG" oldref="54">Import<comment>changed in #i64102</comment></paragraph>
<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND">Locate that $[officename] Basic library that you want to add to the current list, and then click Open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_DELETE" id="bm_id3145749" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
-<paragraph role="paragraph" id="par_idN10A39" xml-lang="en-US" l10n="NEW"><variable id="script">Scripts
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
+<paragraph role="paragraph" id="par_idN10A39" xml-lang="en-US" l10n="NEW"><variable id="script">Scripts
</variable></paragraph>
<paragraph role="paragraph" id="par_idN109BB" xml-lang="en-US" l10n="NEW">To open the BeanShell Macros dialog box, choose Tools - Macros - Organize Macros - BeanShell. To open the JavaScript dialog box, choose Tools - Macros - Organize Macros - JavaScript.</paragraph>
<paragraph role="heading" id="hd_id6963408" xml-lang="en-US" level="2" l10n="NEW">Export</paragraph>
<paragraph role="paragraph" id="par_id8968169" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to export the selected library either as an extension or as a Basic library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCRIPTSBOX" id="bm_id7982421" localize="false"/><paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Macros</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCRIPTSBOX" id="bm_id7982421" localize="false"/>
+<paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Macros</paragraph>
<paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a macro or script from "user", "share", or an open document. To view the available macros or scripts, double-click an entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/><paragraph role="heading" id="par_idN109CD" xml-lang="en-US" level="3" l10n="NEW">Run</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/>
+<paragraph role="heading" id="par_idN109CD" xml-lang="en-US" level="3" l10n="NEW">Run</paragraph>
<paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731587">To run a script, select a script in the list, and then click Run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/><paragraph role="heading" id="par_idN109E8" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/>
+<paragraph role="heading" id="par_idN109E8" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
<paragraph role="paragraph" id="par_idN109EC" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731589">Creates a new script.</ahelp> The default script editor opens after you enter a name for the script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:DLG_NEWLIB:ED_LIBNAME" id="bm_id5546128" localize="false"/><paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:DLG_NEWLIB:ED_LIBNAME">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/><paragraph role="heading" id="par_idN10A2F" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:DLG_NEWLIB:ED_LIBNAME" id="bm_id5546128" localize="false"/>
+<paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:DLG_NEWLIB:ED_LIBNAME">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/>
+<paragraph role="heading" id="par_idN10A2F" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN10A33" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731590">Opens the default script editor for your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/><paragraph role="heading" id="par_idN10A4B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/>
+<paragraph role="heading" id="par_idN10A4B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
<paragraph role="paragraph" id="par_idN10A4F" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731591">Opens a dialog where you can change the name of the selected script.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/><paragraph role="heading" id="par_idN10A66" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/>
+<paragraph role="heading" id="par_idN10A66" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10A6A" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731592">Prompts you to delete the selected script.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10AE5" xml-lang="en-US" l10n="NEW">The Macro Selector dialog contains two list boxes, namely the Library list box and the Macro name list box.</paragraph>
<paragraph role="heading" id="par_idN10AFC" xml-lang="en-US" level="3" l10n="NEW">Library</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06130010.xhp b/helpcontent2/source/text/shared/01/06130010.xhp
index 2d69bbc473..cdf1b17810 100644
--- a/helpcontent2/source/text/shared/01/06130010.xhp
+++ b/helpcontent2/source/text/shared/01/06130010.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130010.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,33 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared0106130010xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Record Macro</title>
+<topic id="textshared0106130010xml" indexer="include">
+<title id="tit" xml-lang="en-US">Record Macro</title>
<filename>/text/shared/01/06130010.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="recordmacro">
- <bookmark xml-lang="en-US" branch="hid/SID_RECORDMACRO" id="bm_id986626" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:MacroRecorder" xml-lang="en-US" id="bm_id3156045"/><paragraph id="hd_id3153383" role="heading" level="1" oldref="5" l10n="U" xml-lang="en-US"><link href="text/shared/01/06130010.xhp" name="Record Macro">Record Macro</link></paragraph>
- <paragraph id="par_id3152952" l10n="U" role="paragraph" oldref="1" xml-lang="en-US"><ahelp hid=".uno:MacroRecorder" visibility="visible">Records a new a macro.</ahelp><comment> icon and comnmand!</comment></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#recordmacro"/>
+<section id="recordmacro">
+<bookmark xml-lang="en-US" branch="hid/SID_RECORDMACRO" id="bm_id986626" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MacroRecorder" id="bm_id3156045" localize="false"/>
+<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="5"><link href="text/shared/01/06130010.xhp" name="Record Macro">Record Macro</link></paragraph>
+<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="1"><ahelp hid=".uno:MacroRecorder">Records a new macro.</ahelp><comment> icon and comnmand!</comment></paragraph>
</section>
- <bookmark xml-lang="en-US" branch="hid/SID_STOP_RECORDING" id="bm_id1545801" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:StopRecording" xml-lang="en-US" id="bm_id3150264"/><paragraph role="heading" level="2" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="2">Stop Recording</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3146067" xml-lang="en-US" oldref="4"><ahelp hid=".uno:StopRecording" visibility="visible">Stops recording a macro.</ahelp></paragraph>
- <section id="relatedtopics">
- <embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
- <embed href="text/shared/main0600.xhp#programming"/>
- </section>
- </body>
+<section id="howtoget">
+<embed href="text/shared/00/00000406.xhp#recordmacro"/>
+</section>
+<bookmark xml-lang="en-US" branch="hid/SID_STOP_RECORDING" id="bm_id1545801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:StopRecording" id="bm_id3150264" localize="false"/>
+<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="2" l10n="U" oldref="2">Stop Recording</paragraph>
+<paragraph role="paragraph" id="par_id3146067" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:StopRecording">Stops recording a macro.</ahelp></paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
+<embed href="text/shared/main0600.xhp#programming"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 068a11cf41..37776201ef 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06140200.xhp,v $
- *
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -34,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106140200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106140200xml" indexer="include">
<title id="tit" xml-lang="en-US">Keyboard</title>
<filename>/text/shared/01/06140200.xhp</filename>
</topic>
@@ -50,7 +47,8 @@
<bookmark_value>editing;shortcut keys</bookmark_value>
<bookmark_value>styles;keyboard shortcuts</bookmark_value>
</bookmark><comment>MW deleted "modifying;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_ACCEL" id="bm_id3154183" localize="false"/><paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140200.xhp" name="Keyboard">Keyboard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_ACCEL" id="bm_id3154183" localize="false"/>
+<paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140200.xhp" name="Keyboard">Keyboard</link></paragraph>
<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_ACCEL">Assigns or edits the shortcut keys for $[officename] commands, or $[officename] Basic macros.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -60,33 +58,45 @@
<section id="operatinghint">
<paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="29">Avoid assigning shortcut keys that are currently used by your operating system.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE" id="bm_id3151226" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE" id="bm_id3151226" localize="false"/>
+<paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE">Displays shortcut keys that are common to all $[officename] applications.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE" id="bm_id3145345" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
+<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE" id="bm_id3145345" localize="false"/>
+<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
</caseinline><caseinline select="CALC">Calc
</caseinline><caseinline select="IMPRESS">Impress
</caseinline><caseinline select="DRAW">Draw
</caseinline><caseinline select="MATH">Math
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE">Displays shortcut keys for the current $[officename] application.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="3">Shortcut keys</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/>
+<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="3">Shortcut keys</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_ACCELCONFIG_LISTBOX">Lists the shortcut keys and the associated commands. To assign or modify the shortcut key for the command selected in the <emph>Function</emph> list, click a shortcut in this list, and then click <emph>Modify</emph>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="2" l10n="U" oldref="5">Functions</paragraph>
<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="6">Lists the function categories and the $[officename] functions that you can assign shortcut keys to.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIGGROUP_ACC_LISTBOX" id="bm_id3155503" localize="false"/><paragraph role="heading" id="hd_id3155321" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIGGROUP_ACC_LISTBOX" id="bm_id3155503" localize="false"/>
+<paragraph role="heading" id="hd_id3155321" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
<paragraph role="paragraph" id="par_id3149166" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="HID_CONFIGGROUP_ACC_LISTBOX">Lists the available function categories. To assign shortcuts to Styles, open the "Styles" category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIGFUNCTION_ACC_LISTBOX" id="bm_id3159342" localize="false"/><paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIGFUNCTION_ACC_LISTBOX" id="bm_id3159342" localize="false"/>
+<paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
<paragraph role="paragraph" id="par_id3159148" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CONFIGFUNCTION_ACC_LISTBOX">Select a function that you want to assign a shortcut key to, click a key combination in the <emph>Shortcut keys</emph> list, and then click <emph>Modify</emph>. If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY" id="bm_id3153666" localize="false"/>
+<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY">Displays the shortcut keys that are assigned to the selected function.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE" id="bm_id3156153" localize="false"/>
+<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE">Assigns the key combination selected in the <emph>Shortcut keys</emph> list to the command selected in the <emph>Function </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE" id="bm_id3149578" localize="false"/><paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD" id="bm_id3151245" localize="false"/><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE" id="bm_id3149578" localize="false"/>
+<paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD" id="bm_id3151245" localize="false"/>
+<paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD">Replaces the shortcut key configuration with one that was previously saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE" id="bm_id3148943" localize="false"/><paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE" id="bm_id3148943" localize="false"/>
+<paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
<paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_RESET" id="bm_id3147265" localize="false"/><paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment><section id="relatedtopics">
+<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET" id="bm_id0904200812484017" localize="false"/>
+<paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
+<section id="relatedtopics">
<embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/01/06150000.xhp b/helpcontent2/source/text/shared/01/06150000.xhp
index 522cae8e04..c404e46a37 100644
--- a/helpcontent2/source/text/shared/01/06150000.xhp
+++ b/helpcontent2/source/text/shared/01/06150000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 06150000.xhp,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -104,7 +104,7 @@
<paragraph role="listitem" id="par_id3154577" xml-lang="en-US" l10n="U" oldref="14">Click a filter to select it.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="15">Shift-click or Ctrl-click to select several filters.</paragraph>
+<paragraph role="listitem" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="15">Shift-click or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click to select several filters.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="16">Double-click a name to edit the filter.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
index 0ab9fd398c..87f86a8bf8 100644
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ b/helpcontent2/source/text/shared/01/08060100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 08060100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0108060100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0108060100xml" indexer="include">
<title id="tit" xml-lang="en-US">Registration</title>
<filename>/text/shared/01/08060100.xhp</filename>
</topic>
@@ -49,7 +47,9 @@
<bookmark_value>registering; %PRODUCTNAME</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_ONLINE_REGISTRATION" id="bm_id3640231" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/><paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/>
+<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
<paragraph role="paragraph" id="par_id3153882" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -59,12 +59,15 @@
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U" oldref="10">Register Now</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/><paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="3" l10n="U" oldref="11">Remind me to register later</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER" id="bm_id3156302" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/><paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
+<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="12">Never register</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/><paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
+<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index 9a2ad2127e..e83b1d19d0 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: about_meta_tags.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01about_meta_tagsxml" indexer="include" status="PUBLISH">
+<topic id="textshared01about_meta_tagsxml" indexer="include">
<title id="tit" xml-lang="en-US">HTML import and export</title>
<filename>/text/shared/01/about_meta_tags.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T13:05:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154380"><bookmark_value>importing; HTML with META tags</bookmark_value>
@@ -57,48 +53,49 @@
<paragraph role="paragraph" id="par_id3148552" xml-lang="en-US" l10n="U" oldref="21">The following file properties are converted to META tags when you export a file as an HTML document:</paragraph>
<table id="tbl_id3147304">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="2">File Property</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="3">&lt;TITLE&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="4">Subject</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="5">&lt;META NAME="CLASSIFICATION" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="6">Keywords</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="7">&lt;META NAME="KEYWORDS" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="8">Description</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="9">&lt;META NAME="DESCRIPTION" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="10">Info fields 1...4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157892" xml-lang="en-US" l10n="U" oldref="11">&lt;META NAME="Info field name" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="note" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="22">When you import an HTML containing these META tags, the contents of the tags are added to the corresponding $[officename] file property box. </paragraph>
+<paragraph role="tip" id="par_id0926200812164481" xml-lang="en-US" l10n="NEW">Keywords must be separated by commas. A keyword can contain white space characters or semicolons.</paragraph>
<paragraph role="heading" id="hd_id3163822" xml-lang="en-US" level="3" l10n="U" oldref="12">Import Tips</paragraph>
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/gallery.xhp b/helpcontent2/source/text/shared/01/gallery.xhp
index 17d4c36067..6df461b946 100644
--- a/helpcontent2/source/text/shared/01/gallery.xhp
+++ b/helpcontent2/source/text/shared/01/gallery.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gallery.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01galleryxml" indexer="include" status="PUBLISH">
+<topic id="textshared01galleryxml" indexer="include">
<title id="tit" xml-lang="en-US">Gallery</title>
<filename>/text/shared/01/gallery.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-01T12:04:49">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_ICONVIEW" id="bm_id3146946" localize="false"/>
@@ -48,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_LISTVIEW" id="bm_id3152821" localize="false"/>
<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_GALLERY_LISTVIEW" visibility="hidden">Displays the contents of the <emph>Gallery </emph>as small icons, with title and path information.</ahelp></paragraph>
<section id="stargallery">
-<bookmark xml-lang="en-US" branch="hid/SID_GALLERY" id="bm_id2975847" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_GALLERY" id="bm_id2975847" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Gallery" id="bm_id3150616" localize="false"/>
<paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></paragraph>
<paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Gallery">Opens the <emph>Gallery</emph>, where you can select graphics and sounds to insert into your document.</ahelp></paragraph>
@@ -56,7 +54,7 @@
<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="44">You can display the contents of the <emph>Gallery </emph>as icons, or icons with titles and path information.</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="45">To zoom in or zoom out on a single object in the <emph>Gallery</emph>, double-click the object, or select the object, and then press the Spacebar.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#gallery"/>
+<embed href="text/shared/00/00000406.xhp#gallery"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_THEMELIST" id="bm_id3150774" localize="false"/>
<paragraph role="paragraph" id="par_id3145346" xml-lang="en-US" l10n="U" oldref="26">Themes are listed on the left side of the <emph>Gallery</emph>.<ahelp hid="HID_GALLERY_THEMELIST">Click a theme to view the objects associated with the theme.</ahelp></paragraph>
@@ -82,6 +80,6 @@
<paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="2" l10n="U" oldref="25"><link href="text/shared/01/gallery_files.xhp" name="Files">Files</link></paragraph>
<embed href="text/shared/01/gallery_files.xhp#stargallerymanager"/>
<embed href="text/shared/00/00000010.xhp#hinzufuegen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PREVIEW" id="bm_id3153896" localize="false"/><embed href="text/shared/00/00000010.xhp#vorschau"/>
+<embed href="text/shared/00/00000010.xhp#vorschau"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index 38c0be0fd4..d56720daa0 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: grid.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,8 +55,7 @@
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph>
<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph>
-<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Control key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
+<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
index 60e26bc9ed..749ffe8a3a 100755
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: guides.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,8 +55,7 @@
<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph>
<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph>
<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph>
-<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Control key
-</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
+<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 51adbfe9a7..684ee2a8a4 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.21 $
+# $Revision: 1.21.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -183,19 +183,25 @@ XHPFILES = \
05080400.xhp \
05090000.xhp \
05100000.xhp \
+ 05100100.xhp \
+ 05100200.xhp \
+ 05100500.xhp \
+ 05100600.xhp \
+ 05100700.xhp \
05110000.xhp \
05110100.xhp \
05110200.xhp \
05110300.xhp \
05110400.xhp \
05110500.xhp \
- 05110600.xhp \
+ 05110600m.xhp \
05110700.xhp \
05110800.xhp \
05120000.xhp \
05120100.xhp \
05120200.xhp \
05120300.xhp \
+ 05120600.xhp \
05140100.xhp \
05150101.xhp \
05190000.xhp \
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index 061832ad44..2b68f5a091 100755
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: packagemanager.xhp,v $
- *
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textshared01packagemanagerxml" indexer="include" status="PUBLISH">
+<topic id="textshared01packagemanagerxml" indexer="include">
<title id="tit" xml-lang="en-US">Extension Manager</title>
<filename>/text/shared/01/packagemanager.xhp</filename>
</topic>
@@ -50,7 +48,9 @@
</bookmark><comment>MW corrected typos in "UNO components;...", made "Extension Manager" a two level entry and changed the "packages" reference</comment>
<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER_MENU_ITEM" id="bm_id307931" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.deployment.ui.PackageManagerDialog" id="bm_id2198553" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER" id="bm_id828882" localize="false"/><paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment><paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER" id="bm_id828882" localize="false"/>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#packagemanager"/>
@@ -75,7 +75,7 @@
</list>
<paragraph role="heading" id="hd_id8570513" xml-lang="en-US" level="2" l10n="NEW">Extension Scope</paragraph>
<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="CHG">Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="CHG">A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users.</paragraph>
</listitem>
@@ -115,7 +115,6 @@
</paragraph>
</listitem>
</list>
-<embed href="text/shared/01/packagemanager.xhp#sharedextnotes"/>
<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER_TREELISTBOX" id="bm_id8800927" localize="false"/>
<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="CHG"><ahelp hid="42769">Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD" id="bm_id788903" localize="false"/>
@@ -146,6 +145,5 @@
<bookmark xml-lang="en-US" branch="hid/42792" id="bm_id052320081054360" localize="false"/>
<paragraph role="heading" id="hd_id4921414" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
<paragraph role="paragraph" id="par_id1439558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
-<embed href="text/shared/01/packagemanager.xhp#sharedextnotes"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 4c6e37173e..2c7522e04f 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: password_dlg.xhp,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,32 +30,30 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared01password_dlgxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Password</title>
+<topic id="textshared01password_dlgxml" indexer="include">
+<title id="tit" xml-lang="en-US">Password</title>
<filename>/text/shared/01/password_dlg.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="passwort">
- <paragraph id="hd_id3146902" role="heading" level="1" oldref="63" l10n="U" xml-lang="en-US"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
- <paragraph role="paragraph" id="par_id3154350" l10n="U" xml-lang="en-US" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
- <bookmark branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" xml-lang="en-US" id="bm_id3152876"/><bookmark branch="hid/HID_PASSWD_TABLE" xml-lang="en-US" id="bm_id3154044"/><paragraph role="heading" level="2" id="hd_id3146857" l10n="U" xml-lang="en-US" oldref="65">Password</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150502" xml-lang="en-US" oldref="62"><ahelp hid="HID_PASSWD_TABLE" visibility="visible">Type a password that is at least five characters long. A password is case sensitive.</ahelp></paragraph>
- <bookmark branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" xml-lang="en-US" id="bm_id3149495"/><bookmark branch="hid/HID_PASSWD_DOC" xml-lang="en-US" id="bm_id3154863"/><paragraph role="heading" level="2" id="hd_id3153029" l10n="U" xml-lang="en-US" oldref="66">Confirm</paragraph>
- <paragraph role="paragraph" id="par_id3151100" l10n="U" xml-lang="en-US" oldref="67">Re-enter the password.</paragraph>
- <paragraph role="heading" level="2" id="hd_id3155351" l10n="U" xml-lang="en-US" oldref="68">Undoing password protection</paragraph>
- <paragraph role="paragraph" id="par_id3146109" l10n="U" xml-lang="en-US" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
- <paragraph role="warning" id="par_id3148621" l10n="U" xml-lang="en-US" oldref="46">$[officename] will not help you to open a document that is protected with a password.</paragraph>
- </section>
-
- </body>
+<section id="passwort">
+<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="1" l10n="U" oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
+<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
+<paragraph role="heading" id="hd_id3146857" xml-lang="en-US" level="2" l10n="U" oldref="65">Password</paragraph>
+<paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password that is at least five characters long. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
+<paragraph role="heading" id="hd_id3153029" xml-lang="en-US" level="2" l10n="U" oldref="66">Confirm</paragraph>
+<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="67">Re-enter the password.</paragraph>
+<paragraph role="heading" id="hd_id3155351" xml-lang="en-US" level="2" l10n="U" oldref="68">Undoing password protection</paragraph>
+<paragraph role="paragraph" id="par_id3146109" xml-lang="en-US" l10n="U" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index e356e5e624..31dcfcb86a 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ref_pdf_export.xhp,v $
- *
- * $Revision: 1.23 $
+ * $Revision: 1.23.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,13 +52,13 @@
<paragraph role="heading" id="hd_id3149532" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="export_as_pdf"><variable id="ref_pdf_export"><link href="text/shared/01/ref_pdf_export.xhp" name="Export as PDF">Export as PDF</link>
</variable>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF).</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
+<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
</variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#exportpdf"/>
</section>
-<paragraph role="heading" id="hd_id746482" xml-lang="en-US" level="2" l10n="NEW">General<comment>UFI: all on one page because they will shrink to AHID tags with OOo3 anyway</comment></paragraph>
+<paragraph role="heading" id="hd_id746482" xml-lang="en-US" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="3" l10n="CHG" oldref="2">Pages</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL" id="bm_id1623889" localize="false"/>
@@ -102,8 +100,8 @@
<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="3" l10n="NEW">General</paragraph>
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Sets general PDF export options.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_PDFA_1B_SELECT" id="bm_id303964" localize="false"/>
-<paragraph role="heading" id="hd_id2796411" xml-lang="en-US" level="3" l10n="NEW">PDF/A-1</paragraph>
-<paragraph role="paragraph" id="par_id5016327" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1 format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id2796411" xml-lang="en-US" level="3" l10n="NEW">PDF/A-1a</paragraph>
+<paragraph role="paragraph" id="par_id5016327" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1a format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF" id="bm_id3958250" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF" id="bm_id6884975" localize="false"/>
<paragraph role="heading" id="par_idN107A0" xml-lang="en-US" level="3" l10n="NEW">Tagged PDF</paragraph>
@@ -123,11 +121,15 @@
<bookmark xml-lang="en-US" branch="hid/filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT" id="bm_id3088167" localize="false"/>
<paragraph role="heading" id="hd_id6585283" xml-lang="en-US" level="4" l10n="NEW">Submit format</paragraph>
<paragraph role="paragraph" id="par_idN107F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0901200811454970" xml-lang="en-US" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
<paragraph role="paragraph" id="par_idN10807" xml-lang="en-US" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES" id="bm_id113223" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph role="heading" id="hd_id3946958" xml-lang="en-US" level="3" l10n="NEW">Export automatically inserted blank pages</paragraph>
<paragraph role="paragraph" id="par_id8551896" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
+<paragraph role="heading" id="hd_id080420080355360" xml-lang="en-US" level="3" l10n="NEW">Create hybrid file</paragraph>
+<paragraph role="paragraph" id="par_id0804200803553767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">Sun PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
<paragraph role="heading" id="hd_id9796441" xml-lang="en-US" level="2" l10n="NEW">Initial View</paragraph>
<paragraph role="heading" id="hd_id1218604" xml-lang="en-US" level="3" l10n="NEW">Panes</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/selectcertificate.xhp b/helpcontent2/source/text/shared/01/selectcertificate.xhp
index 23cb77cac5..a3578bdadb 100644
--- a/helpcontent2/source/text/shared/01/selectcertificate.xhp
+++ b/helpcontent2/source/text/shared/01/selectcertificate.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: selectcertificate.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,25 +32,22 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01selectcertificatexhp" indexer="include" status="PUBLISH">
+<topic id="textshared01selectcertificatexhp" indexer="include">
<title id="tit" xml-lang="en-US">Select Certificate</title>
<filename>/text/shared/01/selectcertificate.xhp</filename>
</topic>
-<history>
-<created date="2004-08-25T17:40:19">UFI: Select Certificate from Digital Signatures dialog</created>
-<lastedited date="2007-03-02T16:29:48">DEDR: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1" l10n="NEW">Select Certificate</paragraph>
<paragraph role="paragraph" id="par_idN10545" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the certificate that you want to <link href="text/shared/01/digitalsignatures.xhp">digitally sign</link> the current document with.</ahelp></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#digitalsigsel"/>
+<embed href="text/shared/00/00000401.xhp#digitalsigsel"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_CHOOSESIGNATURES" id="bm_id8177129" localize="false"/><embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_CHOOSESIGNATURES" id="bm_id8177129" localize="false"/>
<paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the certificate that you want to digitally sign the current document with.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_CERTCHOOSER_BTN_VIEWCERT" id="bm_id5101168" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/xformsdata.xhp b/helpcontent2/source/text/shared/01/xformsdata.xhp
index ca0011d95a..507976dfa6 100644
--- a/helpcontent2/source/text/shared/01/xformsdata.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdata.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xformsdata.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,103 +32,80 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01xformsdataxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Data Navigator</title>
+<topic id="textshared01xformsdataxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Data Navigator</title>
<filename>/text/shared/01/xformsdata.xhp</filename>
</topic>
</meta>
<body>
-
-
- <section id="datanavigator">
-
-
+<section id="datanavigator">
<bookmark xml-lang="en-US" branch="index" id="bm_id6823023"><bookmark_value>data structure of XForms</bookmark_value>
<bookmark_value>deleting;models/instances</bookmark_value>
<bookmark_value>models in XForms</bookmark_value>
<bookmark_value>Data Navigator;display options</bookmark_value>
-</bookmark>
- <comment>MW made "Data Navigator.." a two level entry</comment>
-
+</bookmark><comment>MW made "Data Navigator.." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOW_DATANAVIGATOR" id="bm_id7463799" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:ShowDataNavigator" id="bm_id7677236" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1054E" role="heading" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
+<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
-
- </section>
-
+<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
+</section>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_LIST" id="bm_id759300" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Model name</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2" l10n="NEW">Model name</paragraph>
+<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_MENUBTN" id="bm_id6110721" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Models</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">Models</paragraph>
+<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_ADD" id="bm_id6934415" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10604" role="heading" level="3" l10n="NEW">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10608" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10604" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN10608" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
+<paragraph role="heading" id="hd_id0910200811173295" xml-lang="en-US" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
+<paragraph role="paragraph" id="par_id0910200811173255" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_REMOVE" id="bm_id5671559" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10612" role="heading" level="3" l10n="NEW">Remove</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10616" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10612" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<paragraph role="paragraph" id="par_idN10616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_EDIT" id="bm_id8617816" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10743" role="heading" level="3" l10n="NEW">Rename</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10749" role="paragraph" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10743" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
+<paragraph role="paragraph" id="par_idN10749" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_SHOW_DETAILS" id="bm_id5646229" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10619" role="heading" level="3" l10n="NEW">Show Details</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1061D" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN10619" xml-lang="en-US" level="3" l10n="NEW">Show Details</paragraph>
+<paragraph role="paragraph" id="par_idN1061D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_ITEMS_LIST" id="bm_id2524491" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1057D" role="heading" level="2" l10n="NEW">Instance</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10682" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Instance</paragraph>
+<paragraph role="paragraph" id="par_idN10682" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id4040955" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1058B" role="heading" level="2" l10n="NEW">Submissions</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1058F" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10592" role="heading" level="2" l10n="NEW">Bindings</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10596" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Submissions</paragraph>
+<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+<paragraph role="heading" id="par_idN10592" xml-lang="en-US" level="2" l10n="NEW">Bindings</paragraph>
+<paragraph role="paragraph" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_INSTANCES_MENUBTN" id="bm_id3339335" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10599" role="heading" level="2" l10n="NEW">Instances</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1059D" role="paragraph" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2" l10n="NEW">Instances</paragraph>
+<paragraph role="paragraph" id="par_idN1059D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_ADD" id="bm_id9214148" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10649" role="heading" level="3" l10n="NEW">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1064D" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10649" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1064D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_EDIT" id="bm_id4229255" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10650" role="heading" level="3" l10n="NEW">Edit</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10654" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10650" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
+<paragraph role="paragraph" id="par_idN10654" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_REMOVE" id="bm_id1858882" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10657" role="heading" level="3" l10n="NEW">Remove</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1065B" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1065E" role="heading" level="3" l10n="NEW">Show data types</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10662" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<paragraph role="paragraph" id="par_idN1065B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN1065E" xml-lang="en-US" level="3" l10n="NEW">Show data types</paragraph>
+<paragraph role="paragraph" id="par_idN10662" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" id="bm_id2156132" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" id="bm_id9931943" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id1840876" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="3" l10n="CHG">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="3" l10n="CHG">Add</paragraph>
+<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_EDIT" id="bm_id1051362" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10624" role="heading" level="3" l10n="CHG">Edit</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10628" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10624" xml-lang="en-US" level="3" l10n="CHG">Edit</paragraph>
+<paragraph role="paragraph" id="par_idN10628" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_REMOVE" id="bm_id3862117" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1062B" role="heading" level="3" l10n="CHG">Delete</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1062F" role="paragraph" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
- </body>
+<paragraph role="heading" id="par_idN1062B" xml-lang="en-US" level="3" l10n="CHG">Delete</paragraph>
+<paragraph role="paragraph" id="par_idN1062F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 346111a830..12c4979e14 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170000.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,21 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Controls</title>
<filename>/text/shared/02/01170000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T15:17:05">UFI: adding new controls, several dba specs
-YJ:checked
-UFI: added dba.features: Form Navigation bar
-dedr:reviewed
-UFI: I did not separate Controls and More Controls toolbars, because FS told me they look different according to doc type</lastedited>
-</history>
</meta>
<body>
<section id="formularfunktionen">
@@ -72,20 +64,21 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<bookmark xml-lang="en-US" branch="hid/SID_FM_CONFIG" id="bm_id4029443" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id3153252" localize="false"/>
<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph>
-<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="formulartext"><ahelp hid=".uno:Config">The Form Controls icon opens a toolbar with the tools that you need to create an interactive form.</ahelp>
+<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="formulartext"><ahelp hid=".uno:Config">The Form Controls toolbar contains tools that you need to create an interactive form.</ahelp>
</variable> You can use the toolbar to add controls to a form in a text, spreadsheet, presentation, or HTML document, for example a button that runs a macro.</paragraph>
</section>
<section id="howtoget">
-<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="68">Icon on the <emph>Insert</emph> toolbar:</paragraph>
+<paragraph role="paragraph" id="par_id1027200809391346" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="68">Icon on the <emph>Insert</emph> toolbar (you may need to enable this initially invisible icon):</paragraph>
<section id="syformular">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
</tablecell>
</tablerow>
@@ -104,13 +97,13 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10C4D" xml-lang="en-US" l10n="NEW">In the document, drag to create the control. </paragraph>
-<paragraph role="paragraph" id="par_idN10C50" xml-lang="en-US" l10n="NEW">To create a square control field, hold down the <item type="keycode">Shift</item> key while you drag.</paragraph>
+<paragraph role="paragraph" id="par_idN10C50" xml-lang="en-US" l10n="NEW">To create a square control field, hold down the Shift key while you drag.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="78">To add a field from the field list of a table or query to a form, drag a cell into the form. In a text document, you can also drag a column header to add a field to a form. To include a label for the field, hold down the <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="78">To add a field from the field list of a table or query to a form, drag a cell into the form. In a text document, you can also drag a column header to add a field to a form. To include a label for the field, hold down the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift key down when you drag a column head.</paragraph>
<paragraph role="heading" id="par_idN10C87" xml-lang="en-US" level="2" l10n="NEW">Modifying a Control</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="5">Right-click the control and choose <emph>Control</emph>. A dialog opens where you can define the properties of the control.</paragraph>
</listitem>
@@ -125,12 +118,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3154411" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Select<comment>controls and design bars</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
</tablecell>
</tablerow>
@@ -148,12 +141,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3146914" xml-lang="en-US" level="2" l10n="U" oldref="10">Check Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
</tablecell>
</tablerow>
@@ -166,12 +159,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153794" xml-lang="en-US" level="2" l10n="U" oldref="16">Text Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
</tablecell>
</tablerow>
@@ -184,12 +177,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3151218" xml-lang="en-US" level="2" l10n="U" oldref="124">Formatted Field<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
+<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147547" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid=".uno:FormattedField">Creates a formatted field.</ahelp> A formatted field is a text box in which you can define how the inputs and outputs are formatted, and which limiting values apply.</paragraph>
</tablecell>
</tablerow>
@@ -203,12 +196,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3148774" xml-lang="en-US" level="2" l10n="U" oldref="6">Push Button<comment>controls bar</comment></paragraph>
<table id="tbl_id3154501">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
+<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147046" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid=".uno:Pushbutton">Creates a push button.</ahelp> This function can be used to execute a command for a defined event, such as a mouse click.</paragraph>
<paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U" oldref="138">You can apply text and graphics to these buttons.</paragraph>
</tablecell>
@@ -222,12 +215,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3157844" xml-lang="en-US" level="2" l10n="U" oldref="8">Option Button<comment>controls bar</comment></paragraph>
<table id="tbl_id3151318">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="E">
-<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
+<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".uno:RadioButton">Creates an option button.</ahelp> Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (<link href="text/shared/02/01170101.xhp" name="Name"><emph>Name</emph></link>
<emph>property</emph>). Normally, they are given a <link href="text/shared/02/01170000.xhp" name="group box">group box</link>.</paragraph>
</tablecell>
@@ -241,12 +234,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156064" xml-lang="en-US" level="2" l10n="U" oldref="18">List Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="E">
-<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
+<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3166428" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".uno:ListBox">Creates a list box.</ahelp> A list box lets users select an entry from a list. If the form is linked to a database and the database connection is active, the<link href="text/shared/02/01170900.xhp" name="List Box Wizard"><emph>List Box Wizard</emph></link> will automatically appear after the list box is inserted in the document. This wizard helps you create the list box.</paragraph>
</tablecell>
</tablerow>
@@ -259,12 +252,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="2" l10n="U" oldref="20">Combo Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149981" xml-lang="en-US" l10n="E">
-<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
+<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149407" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid=".uno:ComboBox">Creates a combo box.</ahelp> A combo box is a single-line list box with a drop-down list from which users choose an option. You can assign the "read-only" property to the combo box so that users cannot enter other entries than those found in the list. If the form is bound to a database and the database connection is active, the <link href="text/shared/02/01170900.xhp" name="Combo Box Wizard"><emph>Combo Box Wizard</emph></link> will automatically appear after you insert the combo box in the document.</paragraph>
</tablecell>
</tablerow>
@@ -277,12 +270,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3145618" xml-lang="en-US" level="2" l10n="U" oldref="12">Label Field<comment>controls bar</comment></paragraph>
<table id="tbl_id3156712">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="E">
-<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
+<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148534" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:Label">Creates a field for displaying text.</ahelp> These labels are only for displaying predefined text. Entries cannot be made in these fields.</paragraph>
</tablecell>
</tablerow>
@@ -301,12 +294,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11B57" xml-lang="en-US" level="2" l10n="NEW">Wizards On/Off<comment>Controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B65" xml-lang="en-US" l10n="NEW">
-<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id6128727" xml-lang="en-US">wizards on off control</alt>
+<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B76" xml-lang="en-US" l10n="CHG">Turns on and turns off the automatic form controls wizards.</paragraph>
<paragraph role="paragraph" id="par_id6403088" xml-lang="en-US" l10n="NEW">These wizards help you to enter the properties of list boxes, table controls, and other controls.</paragraph>
</tablecell>
@@ -324,12 +317,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11A56" xml-lang="en-US" level="2" l10n="NEW">Spin Button<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11A64" xml-lang="en-US" l10n="NEW">
-<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id7816400" xml-lang="en-US">spin button control</alt>
+<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11A75" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:SpinButton">Creates a spin button.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -343,12 +336,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11ABC" xml-lang="en-US" level="2" l10n="NEW">Scrollbar<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11ACA" xml-lang="en-US" l10n="NEW">
-<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id8203985" xml-lang="en-US">scrollbar control</alt>
+<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11ADB" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:ScrollBar">Creates a scrollbar.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -357,82 +350,82 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="paragraph" id="par_idN11CA3" xml-lang="en-US" l10n="NEW">You can specify the following properties for a scrollbar:</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11CDA" xml-lang="en-US" l10n="NEW">UI name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11CE0" xml-lang="en-US" l10n="NEW">Semantics</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CE7" xml-lang="en-US" l10n="NEW">Scroll value min</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CED" xml-lang="en-US" l10n="NEW">Specifies the minimum height or the minimum width of a scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CF4" xml-lang="en-US" l10n="NEW">Scroll value max</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CFA" xml-lang="en-US" l10n="NEW">Specifies the maximum height or the maximum width of a scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D01" xml-lang="en-US" l10n="NEW">Default scroll value</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D07" xml-lang="en-US" l10n="CHG">Specifies the default value of a scrollbar, used when the form is reset.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D0E" xml-lang="en-US" l10n="NEW">Orientation</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D14" xml-lang="en-US" l10n="NEW">Specifies the orientation of a scrollbar, that is, horizontal or vertical.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D1B" xml-lang="en-US" l10n="CHG">Small change</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D21" xml-lang="en-US" l10n="NEW">Specifies the minimum amount by which you can scroll a scrollbar, for example, by clicking an arrow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D28" xml-lang="en-US" l10n="CHG">Large change</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D2E" xml-lang="en-US" l10n="NEW">Specifies the amount that a large step scrolls a scrollbar, for example, when you click between the scrollbar thumb and a scrollbar arrow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D35" xml-lang="en-US" l10n="NEW">Delay</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D3B" xml-lang="en-US" l10n="NEW">Specifies the delay in milliseconds between scrollbar trigger events. For example, the delay that occurs when you click an arrow button on the scrollbar and hold down the mouse button.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D42" xml-lang="en-US" l10n="NEW">Symbol color</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D48" xml-lang="en-US" l10n="NEW">Specifies the color of the arrows on the scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D4F" xml-lang="en-US" l10n="NEW">Visible Size</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D55" xml-lang="en-US" l10n="NEW">Specifies the size of the scrollbar thumb in "value units". For example, a value of ("Scroll value max." minus "Scroll value min.") / 2 results in a scrollbar thumb that occupies half of the scrollbar.</paragraph>
<paragraph role="tablecontent" id="par_idN11D58" xml-lang="en-US" l10n="NEW">To make the width of the scrollbar equal to the height of the scrollbar, set the Visible Size to zero.</paragraph>
</tablecell>
@@ -447,12 +440,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153316" xml-lang="en-US" level="2" l10n="U" oldref="22">Image Button<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159622" xml-lang="en-US" l10n="E">
-<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
+<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148601" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:Imagebutton">Creates a button displayed as an image.</ahelp> Aside from the graphic representation, an image button has the same properties as a "normal" button.</paragraph>
</tablecell>
</tablerow>
@@ -465,12 +458,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3159171" xml-lang="en-US" level="2" l10n="U" oldref="49">Image Control<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="E">
-<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
+<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149596" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid=".uno:ImageControl">Creates an image control. It can only be used to add images from a database.</ahelp> In the form document, double-click one of these controls to open the <emph>Insert Graphic</emph> dialog to insert the image. There is also a context menu (not in design mode) with commands for inserting and deleting the image.</paragraph>
<paragraph role="paragraph" id="par_id3150318" xml-lang="en-US" l10n="U" oldref="70">Images from a database can be displayed in a form, and new images can be inserted in the database as long as the image control is not write-protected. The control must refer to a database field of the image type. Therefore, enter the data field into the properties window on the <emph>Data</emph> tab page.</paragraph>
</tablecell>
@@ -484,12 +477,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156040" xml-lang="en-US" level="2" l10n="U" oldref="29">Date Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149423" xml-lang="en-US" l10n="E">
-<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
+<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151312" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:DateField">Creates a date field.</ahelp> If the form is linked to a database, the date values can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -505,12 +498,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3152369" xml-lang="en-US" level="2" l10n="U" oldref="31">Time Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153687" xml-lang="en-US" l10n="E">
-<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
+<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155399" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:TimeField">Creates a time field.</ahelp> If the form is linked to a database, the time values for the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -524,12 +517,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156186" xml-lang="en-US" level="2" l10n="U" oldref="27">File Selection<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150531" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
+<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.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_id3149438" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:FileControl">Creates a button that enables file selection.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -542,12 +535,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="2" l10n="U" oldref="33">Numerical Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149396" xml-lang="en-US" l10n="E">
-<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
+<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145601" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:NumericField">Creates a numerical field.</ahelp> If the form is linked to a database, the numerical values in the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -560,12 +553,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153612" xml-lang="en-US" level="2" l10n="U" oldref="35">Currency Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145324" xml-lang="en-US" l10n="E">
-<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
+<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145115" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:CurrencyField">Creates a currency field.</ahelp> If the form is linked to a database, the currency field contents for in the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -578,12 +571,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3148825" xml-lang="en-US" level="2" l10n="U" oldref="37">Pattern Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149742" xml-lang="en-US" l10n="E">
-<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
+<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:PatternField">Creates a pattern field.</ahelp> Pattern fields consist of an edit mask and a literal mask. The edit mask determines which data can be entered. The literal mask determines the contents of the pattern field when loading the form.</paragraph>
</tablecell>
</tablerow>
@@ -597,12 +590,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="2" l10n="U" oldref="14">Group Box<comment>more controls bar</comment></paragraph>
<table id="tbl_id3154020">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="E">
-<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
+<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154572" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid=".uno:GroupBox">Creates a frame to visually group several controls.</ahelp> Group boxes allow you to group option buttons in a frame.</paragraph>
<paragraph role="paragraph" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="72">If you insert a group frame into the document, the <link href="text/shared/autopi/01120000.xhp" name="Group Element Wizard">Group Element Wizard</link> starts, which allows you to easily create an option group.</paragraph>
</tablecell>
@@ -610,7 +603,7 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
</table>
<paragraph role="paragraph" id="par_id3150567" xml-lang="en-US" l10n="U" oldref="65">
-<emph>Note:</emph> When you drag a group box over already existing controls and then want to select a control, you have to first open the context menu of the group box and choose <emph>Arrange - Send to Back</emph>. Then select the control while pressing <switchinline select="sys"><caseinline select="MAC">Command
+<emph>Note:</emph> When you drag a group box over already existing controls and then want to select a control, you have to first open the context menu of the group box and choose <emph>Arrange - Send to Back</emph>. Then select the control while pressing <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>.</paragraph>
<paragraph role="note" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="66">Group boxes are used only for a visual effect. A functional grouping of option fields can be made through the name definition: under the <link href="text/shared/02/01170101.xhp" name="Name"><emph>Name</emph></link> properties of all option fields, enter the same name in order to group them.</paragraph>
</section>
@@ -620,12 +613,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3157996" xml-lang="en-US" level="2" l10n="U" oldref="39">Table Control<comment>more controls bar</comment></paragraph>
<table id="tbl_id3153023">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156402" xml-lang="en-US" l10n="E">
-<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
+<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154579" xml-lang="en-US" l10n="CHG" oldref="40"><ahelp hid=".">Creates a table control to display a database table.</ahelp> If you create a new table control, the <link href="text/shared/02/01170800.xhp" name="Table Element Wizard">Table Element Wizard</link> appears.</paragraph>
</tablecell>
</tablerow>
@@ -639,12 +632,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11B1E" xml-lang="en-US" level="2" l10n="NEW">Navigation bar<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US" l10n="NEW">
-<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id5074922" xml-lang="en-US">navigation bar control</alt>
+<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US" l10n="NEW"><ahelp hid="SID_FM_NAVIGATIONBAR">Creates a navigation bar.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -663,12 +656,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="2" l10n="U" oldref="136">Automatic Control Focus<comment>design bar</comment></paragraph>
<table id="tbl_id3154633">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150261" xml-lang="en-US" l10n="E">
-<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
+<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3109848" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid=".uno:AutoControlFocus">If<emph> Automatic Control Focus </emph>is activated, the first form control will be selected when you open the document. If the button is not activated, the text will be selected after opening. The <link href="text/shared/02/01170300.xhp" name="Tab Order">Tab Order</link> that you have specified determines which is the first form control.</ahelp></paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/shared/02/01170004.xhp b/helpcontent2/source/text/shared/02/01170004.xhp
index 84ea4a4879..a0a842c439 100755
--- a/helpcontent2/source/text/shared/02/01170004.xhp
+++ b/helpcontent2/source/text/shared/02/01170004.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170004.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -67,16 +67,16 @@
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SID_FM_SHOWCOLS">Calls a submenu where you can select the columns to show again.</ahelp> To show only one column, click the column name. You see only the first 16 hidden columns. If there are more hidden columns, choose the <emph>More</emph> command to call the <emph>Show Columns</emph> dialog.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWCOLS_MORE" id="bm_id3150669" localize="false"/><paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="83">More</paragraph>
<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SID_FM_SHOWCOLS_MORE">Calls the <emph>Show Columns</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl key to select multiple entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl (Mac: Command) key to select multiple entries.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWALLCOLS" id="bm_id3145119" localize="false"/><paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="86">All</paragraph>
<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SID_FM_SHOWALLCOLS">Click <emph>All </emph>if you want to show all columns.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="127">Keyboard-only control of Table Controls</paragraph>
-<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="126">If you use the keyboard only to travel through controls in your document, you will find one difference to the other types of controls: the Tab key does not move the cursor to the next control, but moves to the next column inside the table control. Press Ctrl+Tab to move to the next control, or press Shift+Ctrl+Tab to move to the previous control.</paragraph>
+<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="126">If you use the keyboard only to travel through controls in your document, you will find one difference to the other types of controls: the Tab key does not move the cursor to the next control, but moves to the next column inside the table control. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to move to the next control, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to move to the previous control.</paragraph>
<paragraph role="heading" id="hd_id3153062" xml-lang="en-US" level="3" l10n="U" oldref="128">To enter the special keyboard-only edit mode for Table Controls:</paragraph>
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="129">The form document must be in <link href="text/shared/02/01170500.xhp" name="design mode">design mode</link>.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="130">Press Ctrl+F6 to select the document. </paragraph>
+<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="130">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to select the document.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3161657" xml-lang="en-US" l10n="CHG" oldref="131">Press Shift+F4 to select the first control. If the Table Control is not the first control, press Tab until it is selected.</paragraph>
@@ -88,7 +88,7 @@
<paragraph role="listitem" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="133">In the edit mode, you can open the edit mode context menu by pressing Shift+F10.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="134">If you want to edit columns, press Shift+Space to enter column edit mode. Now you can rearrange the order of columns with Ctrl+Arrow keys. The Delete key deletes the current column.</paragraph>
+<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="134">If you want to edit columns, press Shift+Space to enter column edit mode. Now you can rearrange the order of columns with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow keys. The Delete key deletes the current column.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="135">Press the Escape key to exit the edit mode.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170100.xhp b/helpcontent2/source/text/shared/02/01170100.xhp
index e28cdb9e08..8ce33995dc 100644
--- a/helpcontent2/source/text/shared/02/01170100.xhp
+++ b/helpcontent2/source/text/shared/02/01170100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170100.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,7 +74,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="4">Alt+Down Arrow</paragraph>
+<paragraph role="tablecontent" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150944" xml-lang="en-US" l10n="U" oldref="5">Opens the combo box</paragraph>
@@ -82,7 +82,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="6">Alt+Up Arrow</paragraph>
+<paragraph role="tablecontent" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153063" xml-lang="en-US" l10n="U" oldref="7">Closes the combo box</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index 589ae3a2b0..34d06943ec 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170101.xhp,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -629,7 +629,7 @@
<bookmark_value>names; multi-line titles</bookmark_value>
<bookmark_value>controls; multi-line titles</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+Ctrl+Enter.</paragraph>
+<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<paragraph role="note" id="par_id3159407" xml-lang="en-US" l10n="U" oldref="55">The <emph>Title</emph> property is only used for labeling a form element in the interface visible to the user. If you work with macros, note that at runtime, a control is always addressed through the <emph>Name</emph> property.</paragraph>
</section>
<section id="Section11">
diff --git a/helpcontent2/source/text/shared/02/01170102.xhp b/helpcontent2/source/text/shared/02/01170102.xhp
index d2a3995655..4343301582 100644
--- a/helpcontent2/source/text/shared/02/01170102.xhp
+++ b/helpcontent2/source/text/shared/02/01170102.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170102.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0201170102xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170102xml" indexer="include">
<title id="tit" xml-lang="en-US">Data</title>
<filename>/text/shared/02/01170102.xhp</filename>
</topic>
@@ -51,20 +49,24 @@
<bookmark_value>cells;linked to controls</bookmark_value>
<bookmark_value>links;between cells and controls</bookmark_value>
<bookmark_value>controls;assigning data sources</bookmark_value>
-</bookmark><comment>MW made "cells..." a two level entry, changed "linked cells;" to "links;" and "list contents" to "lists;"</comment><paragraph role="heading" id="hd_id3155413" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170102.xhp" name="Data">Data</link></paragraph>
+</bookmark><comment>MW made "cells..." a two level entry, changed "linked cells;" to "links;" and "list contents" to "lists;"</comment>
+<paragraph role="heading" id="hd_id3155413" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170102.xhp" name="Data">Data</link></paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="2">The<emph> Data </emph>tab page allows you to assign a data source to the selected control.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#controleigenschaftendaten"/>
+<embed href="text/shared/00/00040501.xhp#controleigenschaftendaten"/>
</section>
<paragraph role="note" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="64">For forms with database links, the associated database is defined in the <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link>. You will find the functions for this on the <link href="text/shared/02/01170203.xhp" name="Data"><emph>Data</emph></link> tab page.</paragraph>
<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="65">The possible settings of the <emph>Data</emph> tab page of a control depend on the respective control. You will only see the options that are available for the current control and context. The following fields are available:</paragraph>
-<sort order="asc"><section id="Section10">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_UNCHECKEDREFVALUE" id="bm_id7939695" localize="false"/><paragraph role="heading" id="par_idN108B4" xml-lang="en-US" level="2" l10n="NEW">Reference value (off)</paragraph>
+<sort order="asc">
+<section id="Section10">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_UNCHECKEDREFVALUE" id="bm_id7939695" localize="false"/>
+<paragraph role="heading" id="par_idN108B4" xml-lang="en-US" level="2" l10n="NEW">Reference value (off)</paragraph>
<paragraph role="paragraph" id="par_idN108B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check boxes and radio buttons in spreadsheets can be bound to cells in the current document. If the control is enabled, the value you enter in Reference value (on) is copied to the cell. If the control is disabled, the value from Reference value (off) is copied to the cell.</ahelp></paragraph>
</section>
<section id="Section23">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REFVALUE" id="bm_id3147327" localize="false"/><paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="CHG" oldref="71">Reference value (on)<comment>UFI: moved section from 01170101, changed name</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REFVALUE" id="bm_id3147327" localize="false"/>
+<paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="CHG" oldref="71">Reference value (on)<comment>UFI: moved section from 01170101, changed name</comment></paragraph>
<paragraph role="paragraph" id="par_id3163812" xml-lang="en-US" l10n="U" oldref="141"><ahelp hid="HID_PROP_REFVALUE" visibility="hidden">You can enter a reference value for the web form, which will be remitted to a server when sending the form. With database forms, the value entered is written in the database field, assigned to the control field.</ahelp>You can assign a reference value to option buttons and check boxes. The reference value will be remitted to a server when sending the web form. With database forms the value entered here will be written in the database assigned to the control field.</paragraph>
<paragraph role="paragraph" id="par_id3150225" xml-lang="en-US" l10n="U" oldref="204">
<emph>Reference values for web forms</emph>
@@ -77,10 +79,11 @@
<paragraph role="paragraph" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="207">For database forms, you can also characterize the status of an option or a check box by a reference value, storing it in the database. If you have a set of three options, for example "in progress", "completed", and "resubmission", with the respective reference values, "ToDo", "OK", and "RS", these reference values appear in the database if the respective option is clicked.</paragraph>
</section>
<section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLSOURCE" id="bm_id3157976" localize="false"/><paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="5">Data field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLSOURCE" id="bm_id3157976" localize="false"/>
+<paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="5">Data field</paragraph>
<paragraph role="paragraph" id="par_id3155852" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_PROP_CONTROLSOURCE" visibility="hidden">Specifies the field of the data source table to which the control refers.</ahelp>With database forms, you can link controls with the data fields.</paragraph>
<paragraph role="paragraph" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="75">You have several possibilities:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3159110" xml-lang="en-US" l10n="U" oldref="66">First case: There is only one table in the form.</paragraph>
<paragraph role="listitem" id="par_id3156356" xml-lang="en-US" l10n="U" oldref="67">Under <emph>Data field</emph>, specify the field of the data source table whose contents you want to be displayed.</paragraph>
@@ -90,7 +93,7 @@
<paragraph role="listitem" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="77">Under <emph>Data field</emph>, specify the field of the SQL statement whose contents you want to be displayed.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153949" xml-lang="en-US" l10n="U" oldref="78">Third case: <link href="text/shared/02/01170900.xhp" name="Combo Boxes">Combo Boxes</link></paragraph>
<paragraph role="listitem" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="79">For combo boxes, the field of the data source table in which the values entered or selected by the user should be stored is specified under <emph>Data field</emph>. The values displayed in the list of the combo box are based on an SQL statement, which is entered under <emph>List content</emph>.</paragraph>
@@ -116,7 +119,8 @@
<paragraph role="paragraph" id="par_id3151186" xml-lang="en-US" l10n="U" oldref="57">If you work with reference values of a value list, the contents of the data field that you specified under <emph>Data Field</emph> in the form are not visible, but rather the assigned values. If you chose "Valuelist" on the <emph>Data</emph> tab under <emph>Type of list contents</emph> and assigned a reference value to the visible list entries in the form under <emph>List entries</emph> (entered in the <link href="text/shared/02/01170101.xhp" name="General"><emph>General</emph></link> tab), then the reference values are compared with the data content of the given data field. If a reference value corresponds to the content of a data field, the associated list entries are displayed in the form.</paragraph>
</section>
<section id="Section2">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUNDCOLUMN" id="bm_id3150297" localize="false"/><paragraph role="heading" id="hd_id3154664" xml-lang="en-US" level="2" l10n="U" oldref="3">Bound field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUNDCOLUMN" id="bm_id3150297" localize="false"/>
+<paragraph role="heading" id="hd_id3154664" xml-lang="en-US" level="2" l10n="U" oldref="3">Bound field</paragraph>
<paragraph role="paragraph" id="par_id3148475" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_PROP_BOUNDCOLUMN" visibility="hidden">Use an index to specify the table field or table SQL query to link to the field that is provided under <emph>Data field</emph>. Valid values for this property are 1, 2, 3, and so on.</ahelp><comment>UFI: issue #i32749#</comment></paragraph>
<paragraph role="note" id="par_idN10AD2" xml-lang="en-US" l10n="NEW">If you delete the contents of the <emph>Bound field</emph> cell in the property browser, the first field of the result set is used to display and to exchange data.<comment>UFI: issue #i32749#</comment></paragraph>
<paragraph role="paragraph" id="par_id3154588" xml-lang="en-US" l10n="U" oldref="72">This property for list boxes defines which data field of a linked table is displayed in the form.</paragraph>
@@ -125,74 +129,78 @@
<paragraph role="paragraph" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="39">If you selected "SQL" under <emph>Type of list contents</emph>, the SQL command determines the index to be specified. Example: If you specify an SQL command such as "SELECT Field1, Field2 FROM tablename" under <emph>List content</emph>, refer to the following table:</paragraph>
<table id="tbl_id3151070">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154716" xml-lang="en-US" l10n="U" oldref="40">Bound field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150666" xml-lang="en-US" l10n="U" oldref="41">Link</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154206" xml-lang="en-US" l10n="CHG" oldref="42">{empty}<comment>FS told me this</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145257" xml-lang="en-US" l10n="U" oldref="43">The database field "Field1" is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150887" xml-lang="en-US" l10n="U" oldref="44">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="45">The database field "Field2" is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3154134" xml-lang="en-US" l10n="U" oldref="46">If you selected "Table" under <emph>Type of list contents</emph>, the table structure defines the index to be specified. Example: If a database table is selected under <emph>List content</emph>, refer to the following table:</paragraph>
<table id="tbl_id3150426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155379" xml-lang="en-US" l10n="U" oldref="47">Bound field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="48">Link</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155373" xml-lang="en-US" l10n="CHG" oldref="49">{empty}<comment>FS told me this</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="50">The 1st column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156448" xml-lang="en-US" l10n="U" oldref="51">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="52">The 2nd column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="53">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146767" xml-lang="en-US" l10n="U" oldref="54">The 3rd column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section3">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCETYPE" id="bm_id3153316" localize="false"/><paragraph role="heading" id="hd_id3149772" xml-lang="en-US" level="2" l10n="U" oldref="9">Type of list contents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCETYPE" id="bm_id3153316" localize="false"/>
+<paragraph role="heading" id="hd_id3149772" xml-lang="en-US" level="2" l10n="U" oldref="9">Type of list contents</paragraph>
<paragraph role="paragraph" id="par_id3154419" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_PROP_LISTSOURCETYPE" visibility="hidden">Determines the data to fill the lists in list and combo boxes.</ahelp>Determines the data to fill the lists in list and combo boxes.</paragraph>
<paragraph role="paragraph" id="par_id3153326" xml-lang="en-US" l10n="U" oldref="13">With the "Valuelist" option, all entries entered in the <emph>List entries</emph> field of the <link href="text/shared/02/01170101.xhp" name="General"><emph>General</emph></link> tab appear in the control. For database forms, you can use reference values (see the <link href="text/shared/02/01170102.xhp" name=" References Using Value Lists"><emph>References Using Value Lists</emph></link> section).</paragraph>
<paragraph role="paragraph" id="par_id3153067" xml-lang="en-US" l10n="U" oldref="14">If the content of the control is read from a database, you can determine the type of the data source with the other options. For example, you can choose between tables and queries.</paragraph>
</section>
<section id="Section4">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCE" id="bm_id3148839" localize="false"/><paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="7">List content</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCE" id="bm_id3148839" localize="false"/>
+<paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="7">List content</paragraph>
<paragraph role="paragraph" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_PROP_LISTSOURCE">With database forms, specifies the data source for the list content of the form-element. This field can be used to define a value list for documents without a database connection.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3168456" xml-lang="en-US" l10n="U" oldref="15">In the case of database forms, the data source determines the entries of the list or combo box. Depending on the selected type, you have a choice between different data sources under <emph>List content</emph>, provided that these objects exist in your database. All available database objects of the type selected under <emph>Type of list contents</emph> are offered here. If you have selected the "Value List" option as the type, you can use references for database forms. If the display of the control is controlled by an SQL command, the SQL statement is entered here.</paragraph>
<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="81">Examples of SQL statements:</paragraph>
@@ -211,338 +219,348 @@
<paragraph role="paragraph" id="par_id3156309" xml-lang="en-US" l10n="U" oldref="19">The following table shows the connections between HTML, JavaScript, and the $[officename] field <emph>List content</emph> using an example list box named "ListBox1". In this case, "Item" designates a list entry visible in the form:</paragraph>
<table id="tbl_id3145656">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159204" xml-lang="en-US" l10n="U" oldref="20">
<emph>HTML Tag</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152539" xml-lang="en-US" l10n="U" oldref="21">
<emph>JavaScript</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158404" xml-lang="en-US" l10n="U" oldref="22">
<emph>Entry in value list of the control (List content)</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151198" xml-lang="en-US" l10n="U" oldref="23">
<emph>Transmitted data</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154668" xml-lang="en-US" l10n="U" oldref="24">&lt;OPTION&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154269" xml-lang="en-US" l10n="U" oldref="25">Not possible</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153109" xml-lang="en-US" l10n="U" oldref="26">""</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154596" xml-lang="en-US" l10n="U" oldref="27">the visible list entry ("ListBox1=Item")</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146892" xml-lang="en-US" l10n="U" oldref="28">&lt;OPTION VALUE="Value"&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154604" xml-lang="en-US" l10n="U" oldref="29">ListBox1.options[0].value="Value"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153689" xml-lang="en-US" l10n="U" oldref="30">"Value"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159226" xml-lang="en-US" l10n="U" oldref="31">The value assigned to the list entry ("ListBox1=Value")</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155944" xml-lang="en-US" l10n="U" oldref="32">&lt;OPTION VALUE=""&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155147" xml-lang="en-US" l10n="U" oldref="33">ListBox1.options[0].value=""</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154763" xml-lang="en-US" l10n="U" oldref="34">"$$$empty$$$"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151012" xml-lang="en-US" l10n="U" oldref="35">An empty string ("ListBox1=")</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_EMPTY_IS_NULL" id="bm_id3150628" localize="false"/><paragraph role="heading" id="hd_id3148901" xml-lang="en-US" level="2" l10n="U" oldref="11">Empty string is NULL</paragraph>
-<paragraph role="paragraph" id="par_id3145357" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_PROP_EMPTY_IS_NULL">Defines how an empty string input should be handled.</ahelp> If this property is set (Yes), a string with only one or more spaces will be interpreted as a NULL value and stored in the database. If this property is not set (No), the string will be treated as an empty value.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_EMPTY_IS_NULL" id="bm_id3150628" localize="false"/>
+<paragraph role="heading" id="hd_id3148901" xml-lang="en-US" level="2" l10n="U" oldref="11">Empty string is NULL</paragraph>
+<paragraph role="paragraph" id="par_id3145357" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_EMPTY_IS_NULL">Defines how an empty string input should be handled. If set to Yes, an input string of length zero will be treated as a value NULL. If set to No, any input will be treated as-is without any conversion.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0820200812403467" xml-lang="en-US" l10n="NEW">An empty string is a string of length zero (""). Normally, a value NULL is not the same as an empty string. In general, a term NULL is used to denote an undefined value, an unknown value, or "no value has been entered yet."</paragraph>
+<paragraph role="paragraph" id="par_id0820200812403455" xml-lang="en-US" l10n="NEW">Database systems vary and they might handle a value NULL differently. Refer to documentations of the database that you are using.</paragraph>
</section>
<section id="Section6">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTERPROPOSAL" id="bm_id3149393" localize="false"/><paragraph role="heading" id="hd_id3161653" xml-lang="en-US" level="2" l10n="U" oldref="88">Filter proposal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTERPROPOSAL" id="bm_id3149393" localize="false"/>
+<paragraph role="heading" id="hd_id3161653" xml-lang="en-US" level="2" l10n="U" oldref="88">Filter proposal</paragraph>
<paragraph role="paragraph" id="par_id3151221" xml-lang="en-US" l10n="U" oldref="89"><variable id="filtervorschlag"><ahelp hid="HID_PROP_FILTERPROPOSAL">While designing your form, you can set the "Filter proposal" property for each text box in the <emph>Data</emph> tab of the corresponding <emph>Properties</emph> dialog. In subsequent searches in the filter mode, you can select from all information contained in these fields.</ahelp> The field content can then be selected using the AutoComplete function. Note, however, that this function requires a greater amount of memory space and time, especially when used in large databases and should therefore be used sparingly.
</variable></paragraph>
</section>
<section id="Section9">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUND_CELL" id="bm_id4214300" localize="false"/><paragraph role="heading" id="par_idN10EE3" xml-lang="en-US" level="2" l10n="NEW">Linked cell</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUND_CELL" id="bm_id4214300" localize="false"/>
+<paragraph role="heading" id="par_idN10EE3" xml-lang="en-US" level="2" l10n="NEW">Linked cell</paragraph>
<paragraph role="paragraph" id="par_idN10EE7" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_BOUND_CELL">Specifies the reference to a linked cell on a spreadsheet. The live state or contents of the control are linked to the cell contents.</ahelp> The following tables list the controls and their corresponding link type:</paragraph>
<paragraph role="heading" id="par_idN10EF7" xml-lang="en-US" level="3" l10n="NEW">Check box with linked cell</paragraph>
<table id="tbl_id4947965">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F04" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F0A" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F11" xml-lang="en-US" l10n="NEW">Select the check box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F17" xml-lang="en-US" l10n="NEW">TRUE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F1E" xml-lang="en-US" l10n="NEW">Deselect the check box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F24" xml-lang="en-US" l10n="NEW">FALSE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F2B" xml-lang="en-US" l10n="NEW">Tri-state check box is set to "undetermined" state</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F31" xml-lang="en-US" l10n="NEW">#NV is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F38" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F3E" xml-lang="en-US" l10n="NEW">If entered value is TRUE or not 0: Check box is selected<br/>If entered value is FALSE or 0: Check box is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F4D" xml-lang="en-US" l10n="NEW">Check box is set to "undetermined" state if it is a tri-state check box, else check box is deselected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11023" xml-lang="en-US" l10n="NEW">Select the box. The Reference value box contains text.<comment>UFI: sc.features "eforms2 option buttons check boxes now also exchanging text"</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1103A" xml-lang="en-US" l10n="NEW">The text from the Reference value box is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11040" xml-lang="en-US" l10n="NEW">Deselect the box. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11008" xml-lang="en-US" l10n="NEW">An empty string is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1104B" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter the same text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11050" xml-lang="en-US" l10n="NEW">The check box is selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11056" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter another text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1105B" xml-lang="en-US" l10n="NEW">The check box is deselected.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN10F58" xml-lang="en-US" level="3" l10n="NEW">Option button (radio button) with linked cell</paragraph>
<table id="tbl_id9255348">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F65" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F6B" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F72" xml-lang="en-US" l10n="NEW">Select the option button</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F78" xml-lang="en-US" l10n="NEW">TRUE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F7F" xml-lang="en-US" l10n="NEW">Option button is deselected by selecting another option button</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F85" xml-lang="en-US" l10n="NEW">FALSE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F8C" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F92" xml-lang="en-US" l10n="NEW">If entered value is TRUE or not 0: Option button is selected<br/>If entered value is FALSE or 0: Option button is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F9B" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FA1" xml-lang="en-US" l10n="NEW">Option button is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110EF" xml-lang="en-US" l10n="NEW">Click the option button. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110F4" xml-lang="en-US" l10n="NEW">The text from the Reference value box is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110FA" xml-lang="en-US" l10n="NEW">Click another option button of the same group. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110EA" xml-lang="en-US" l10n="NEW">An empty string is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11105" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter the same text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1110A" xml-lang="en-US" l10n="NEW">The option button is selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11110" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter another text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11115" xml-lang="en-US" l10n="NEW">The option button is cleared.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN10FAC" xml-lang="en-US" level="3" l10n="NEW">Text box with linked cell</paragraph>
<table id="tbl_id6909695">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10FB9" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10FBF" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FC6" xml-lang="en-US" l10n="NEW">Enter text into the text box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FCC" xml-lang="en-US" l10n="NEW">Text is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FD3" xml-lang="en-US" l10n="NEW">Clear the text box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FD9" xml-lang="en-US" l10n="NEW">Linked cell is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FE0" xml-lang="en-US" l10n="NEW">Enter text or a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FE6" xml-lang="en-US" l10n="NEW">Text or number is copied into the text box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FED" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FF3" xml-lang="en-US" l10n="NEW">Formula result is copied into the text box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FFA" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11000" xml-lang="en-US" l10n="NEW">Text box is cleared</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1100B" xml-lang="en-US" level="3" l10n="NEW">Numerical field and formatted field with linked cell</paragraph>
<table id="tbl_id2086550">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11018" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1101E" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11025" xml-lang="en-US" l10n="NEW">Enter a number into the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1102B" xml-lang="en-US" l10n="NEW">Number is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11032" xml-lang="en-US" l10n="NEW">Clear the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11038" xml-lang="en-US" l10n="NEW">Value 0 is set in the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1103F" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11045" xml-lang="en-US" l10n="NEW">Number is copied into the field</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1104C" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11052" xml-lang="en-US" l10n="NEW">Value 0 is set in the field</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1105D" xml-lang="en-US" level="3" l10n="NEW">List box with linked cell</paragraph>
<paragraph role="paragraph" id="par_idN11060" xml-lang="en-US" l10n="NEW">List boxes support two different linking modes, see the property "Contents of the linked cell".</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN11066" xml-lang="en-US" l10n="NEW">Linked contents: Synchronize the text contents of the selected list box entry with the cell contents.</paragraph>
</listitem>
@@ -552,137 +570,140 @@
</list>
<table id="tbl_id5350505">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11077" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1107D" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11084" xml-lang="en-US" l10n="NEW">Select a single list item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1108A" xml-lang="en-US" l10n="NEW">Contents are linked: Text of the item is copied into the linked cell.</paragraph>
<paragraph role="tablecontent" id="par_idN1108D" xml-lang="en-US" l10n="NEW">Selection is linked: Position of the selected item is copied into the linked cell. For example, if the third item is selected, the number 3 will be copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11094" xml-lang="en-US" l10n="NEW">Select several list items</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1109A" xml-lang="en-US" l10n="NEW">#NV is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110A1" xml-lang="en-US" l10n="NEW">Deselect all list items</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110A7" xml-lang="en-US" l10n="NEW">Contents are linked: Linked cell is cleared</paragraph>
<paragraph role="tablecontent" id="par_idN110AA" xml-lang="en-US" l10n="NEW">Selection is linked: Value 0 is entered in the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110B1" xml-lang="en-US" l10n="NEW">Enter text or a number into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110B7" xml-lang="en-US" l10n="NEW">Contents are linked: Find and select an equal list item</paragraph>
<paragraph role="tablecontent" id="par_idN110BA" xml-lang="en-US" l10n="NEW">Selection is linked: The list item at the specified position (starting with 1 for the first item) is selected. If not found, all items are deselected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110C1" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110C7" xml-lang="en-US" l10n="NEW">Find and select a list item that matches the formula result and link mode</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110CE" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110D4" xml-lang="en-US" l10n="NEW">Deselect all items in the list box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110DB" xml-lang="en-US" l10n="NEW">Change the contents of the list source range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110E1" xml-lang="en-US" l10n="NEW">List box items are updated according to the change. The selection is preserved. This may cause an update to the linked cell.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN110EC" xml-lang="en-US" level="3" l10n="NEW">Combo box with linked cell</paragraph>
<table id="tbl_id3521225">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN110F9" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN110FF" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11106" xml-lang="en-US" l10n="NEW">Enter text into the edit field of the combo box, or select an entry from the drop-down list</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1110C" xml-lang="en-US" l10n="NEW">Text is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11113" xml-lang="en-US" l10n="NEW">Clear the edit field of the combo box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11119" xml-lang="en-US" l10n="NEW">Linked cell is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11120" xml-lang="en-US" l10n="NEW">Enter text or a number into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11126" xml-lang="en-US" l10n="NEW">Text or number is copied into the edit field of the combo box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1112D" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11133" xml-lang="en-US" l10n="NEW">Formula result is copied into the edit field of the combo box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1113A" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11140" xml-lang="en-US" l10n="NEW">Edit field of the combo box is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11147" xml-lang="en-US" l10n="NEW">Change the contents of the list source range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1114D" xml-lang="en-US" l10n="NEW">Drop-down list items are updated according to the change. The edit field of the combo box and the linked cell are not changed.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section8">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CELL_EXCHANGE_TYPE" id="bm_id5563219" localize="false"/><paragraph role="heading" id="par_idN11163" xml-lang="en-US" level="2" l10n="NEW">Contents of the linked cell</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CELL_EXCHANGE_TYPE" id="bm_id5563219" localize="false"/>
+<paragraph role="heading" id="par_idN11163" xml-lang="en-US" level="2" l10n="NEW">Contents of the linked cell</paragraph>
<paragraph role="paragraph" id="par_idN11167" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_CELL_EXCHANGE_TYPE">Select the mode of linking a list box with a linked cell on a spreadsheet.</ahelp></paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN11179" xml-lang="en-US" l10n="NEW">Linked contents: Synchronize the text contents of the selected list box entry with the cell contents. Select "The selected entry"</paragraph>
</listitem>
@@ -692,8 +713,10 @@
</list>
</section>
<section id="Section7">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LIST_CELL_RANGE" id="bm_id9886165" localize="false"/><paragraph role="heading" id="par_idN1118B" xml-lang="en-US" level="2" l10n="NEW">Source cell range<comment>UFI: in the spec, this is "Source range of the list". Named it as seen in 680m38</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LIST_CELL_RANGE" id="bm_id9886165" localize="false"/>
+<paragraph role="heading" id="par_idN1118B" xml-lang="en-US" level="2" l10n="NEW">Source cell range<comment>UFI: in the spec, this is "Source range of the list". Named it as seen in 680m38</comment></paragraph>
<paragraph role="paragraph" id="par_idN111A1" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_LIST_CELL_RANGE">Enter a cell range that contains the entries for a list box or combo box on a spreadsheet.</ahelp> If you enter a multi-column range, only the contents of the leftmost column are used to fill the control.</paragraph>
</section>
-</sort></body>
+</sort>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170600.xhp b/helpcontent2/source/text/shared/02/01170600.xhp
index c30e49deaa..1ac56f776a 100644
--- a/helpcontent2/source/text/shared/02/01170600.xhp
+++ b/helpcontent2/source/text/shared/02/01170600.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170600.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,7 +60,7 @@
<embed href="text/shared/00/00040501.xhp#formex"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_FORM_NAVIGATOR" id="bm_id3153748" localize="false"/><paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FORM_NAVIGATOR">The <emph>Form Navigator</emph> contains a list of all created (logical) forms with the corresponding control fields.</ahelp> You can see whether a form contains control fields by the plus sign displayed before the entry. Click the plus sign to open the list of the form elements.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="4">You can change how the different controls are arranged by dragging and dropping them in the <emph>Form Navigator</emph>. Select one or more controls and drag them into another form. Alternatively use Ctrl+X or the context menu command <emph>Cut</emph> to move a control to the clipboard and Ctrl+V or the command <emph>Insert</emph> to insert the control into another position.</paragraph>
+<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="4">You can change how the different controls are arranged by dragging and dropping them in the <emph>Form Navigator</emph>. Select one or more controls and drag them into another form. Alternatively use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X or the context menu command <emph>Cut</emph> to move a control to the clipboard and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V or the command <emph>Insert</emph> to insert the control into another position.</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="22">To edit the name in the <emph>Form Navigator</emph>, click on the name and enter a new name, or use the command in the context menu.</paragraph>
<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5">If you select a control in the <emph>Form Navigator</emph>, the corresponding element is selected in the document.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="6">If you call the context menu of a selected entry, the <emph>Form Navigator</emph> offers the following functions:</paragraph>
@@ -70,11 +70,8 @@
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SID_FM_NEW_FORM">Creates a new form in the document. </ahelp> To create a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>, add the new form under the desired parent form.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_NEW_HIDDEN" id="bm_id3147618" localize="false"/><paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Hidden Control</paragraph>
<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SID_FM_NEW_HIDDEN">Creates a hidden control in the selected form that is not displayed on the screen. A hidden control serves to include data that is transmitted together with the form.</ahelp> It contains additional information or clarifying text that you can specify when creating the form through the <link href="text/shared/02/01170101.xhp" name="Special Properties">Special Properties</link> of the control. Select the entry of the hidden control in the <emph>Form Navigator</emph> and select the <emph>Properties</emph> command.</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="19">You can copy controls in the document through the clipboard (shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C for copying and <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V for inserting). You can copy hidden controls in the <emph>Form Navigator</emph> by using drag-and-drop while keeping the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed.</paragraph>
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="20">Drag and drop to copy controls within the same document or between documents. Open another form document and drag the hidden control from the <emph>Form Navigator</emph> into the <emph>Form Navigator</emph> of the target document. Click a visible control directly in the document, rest the mouse for a moment so that a copy of the control is added to the drag-and-drop clipboard, then drag the copy into the other document. If you want a copy in the same document, press Ctrl while dragging.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="19">You can copy controls in the document through the clipboard (shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C for copying and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V for inserting). You can copy hidden controls in the <emph>Form Navigator</emph> by using drag-and-drop while keeping the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed.</paragraph>
+<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="20">Drag and drop to copy controls within the same document or between documents. Open another form document and drag the hidden control from the <emph>Form Navigator</emph> into the <emph>Form Navigator</emph> of the target document. Click a visible control directly in the document, rest the mouse for a moment so that a copy of the control is added to the drag-and-drop clipboard, then drag the copy into the other document. If you want a copy in the same document, press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>while dragging.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETE" id="bm_id3154073" localize="false"/><paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="13">Delete</paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SID_FM_DELETE">Deletes the selected entry.</ahelp> This allows you to delete individual form components as well as whole forms with one mouse click.</paragraph>
<paragraph role="heading" id="hd_id3153799" xml-lang="en-US" level="2" l10n="U" oldref="15">Tab order</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170802.xhp b/helpcontent2/source/text/shared/02/01170802.xhp
index 2ad2f23dbe..f39cf41664 100755
--- a/helpcontent2/source/text/shared/02/01170802.xhp
+++ b/helpcontent2/source/text/shared/02/01170802.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170802.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170802xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170802xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Element Wizard: Field Selection</title>
<filename>/text/shared/02/01170802.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-03T12:09:29">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="seite2">
@@ -48,13 +46,13 @@
<paragraph role="paragraph" id="par_id3150476" xml-lang="en-US" l10n="U" oldref="10">Specifies which fields in the table control field should be displayed.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#aupitab2"/>
+<embed href="text/shared/00/00040501.xhp#aupitab2"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS" id="bm_id3149283" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT" id="bm_id3159201" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT" id="bm_id3150178" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT" id="bm_id3147043" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT" id="bm_id3156136" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS" id="bm_id3157958" localize="false"/>
<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="11">Selected Fields</paragraph>
<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS">Displays the data fields that are accepted into the form field.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170900.xhp b/helpcontent2/source/text/shared/02/01170900.xhp
index 52ad6b4c01..7affd3f45b 100644
--- a/helpcontent2/source/text/shared/02/01170900.xhp
+++ b/helpcontent2/source/text/shared/02/01170900.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170900.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170900xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170900xml" indexer="include">
<title id="tit" xml-lang="en-US">Combo Box/List Box Wizard</title>
<filename>/text/shared/02/01170900.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-13T11:14:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159233"><bookmark_value>forms; Combo Box/List Box Wizard</bookmark_value>
@@ -50,7 +46,7 @@
<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170900.xhp" name="Combo Box/List Box Wizard">Combo Box/List Box Wizard</link></paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="2">If you insert a combo box or a list box in a document, a wizard starts automatically. This wizard allows you to interactively specify which information is shown.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#aupikomli"/>
+<embed href="text/shared/00/00040501.xhp#aupikomli"/>
</section>
<paragraph role="note" id="par_id3145211" xml-lang="en-US" l10n="CHG" oldref="21">You can use the <link href="text/shared/02/01171100.xhp" name="Wizards On/Off"><emph>Wizards On/Off</emph></link> icon to keep the wizard from starting automatically.</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="22">The wizards for combo boxes and list boxes differ from each other in their final step. This is because the nature of control fields:</paragraph>
@@ -72,8 +68,8 @@
<embed href="text/shared/02/01170902.xhp#seite2"/>
<embed href="text/shared/02/01170903.xhp#seite3a"/>
<embed href="text/shared/02/01170904.xhp#seite3b"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_PREVIOUS" id="bm_id3156155" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_NEXT" id="bm_id3155135" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01230000.xhp b/helpcontent2/source/text/shared/02/01230000.xhp
index 95113cd691..e063651fbd 100644
--- a/helpcontent2/source/text/shared/02/01230000.xhp
+++ b/helpcontent2/source/text/shared/02/01230000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01230000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3149999" src="res/sc05539.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
+<image id="img_id3149999" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 478015a736..9bd966ebbb 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02130000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,7 +65,7 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the<emph> Decrease Indent</emph> icon while holding down the Ctrl key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
+<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index a1f2a678d3..18f60c0ecb 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,7 +69,7 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the Ctrl key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
+<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
</caseinline></switchinline></paragraph>
@@ -85,8 +85,7 @@
<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Indent increased</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp
index a0b8b2668e..5c87ff4b70 100644
--- a/helpcontent2/source/text/shared/02/03200000.xhp
+++ b/helpcontent2/source/text/shared/02/03200000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03200000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,22 +32,20 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0203200000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0203200000xml" indexer="include">
<title id="tit" xml-lang="en-US">Change Anchor</title>
<filename>/text/shared/02/03200000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:31:09">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="verankerung">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153323"><bookmark_value>anchors; changing</bookmark_value>
-</bookmark><comment>UFI: removed help ids</comment>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_TOGGLE" id="bm_id571270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToggleAnchorType" id="bm_id3147399" localize="false"/>
<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>
diff --git a/helpcontent2/source/text/shared/02/04210000.xhp b/helpcontent2/source/text/shared/02/04210000.xhp
new file mode 100644
index 0000000000..00ea6c78bc
--- /dev/null
+++ b/helpcontent2/source/text/shared/02/04210000.xhp
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 04210000.xhp,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0204210000xhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Optimize</title>
+<filename>/text/shared/02/04210000.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="optimieren">
+<bookmark xml-lang="en-US" branch="hid/FN_OPTIMIZE_TABLE" id="bm_id6810577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:OptimizeTable" id="bm_id3149292" localize="false"/>
+<paragraph role="heading" id="hd_id3151185" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/04210000.xhp" name="Optimize">Optimize</link></paragraph>
+<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptimizeTable">Opens a toolbar that contains functions for optimizing the rows and columns in a table.</ahelp></paragraph>
+</section>
+<section id="syoptimieren">
+<table id="tbl_id3145760">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="E">
+<image id="img_id3149684" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="4">Optimize</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="5">You can select from the following functions:</paragraph>
+<embed href="text/shared/01/05120600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05120600.xhp#syverteilentext"/>
+<embed href="text/shared/01/05110600m.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05110600m.xhp#syverteilenzeile"/>
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
+<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
+<embed href="text/swriter/00/00000405.xhp#syoptimalzeile"/>
+<paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/swriter/01/05120200.xhp" name="Optimal Column Width">Optimal Column Width</link></paragraph>
+<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
+<embed href="text/swriter/00/00000405.xhp#syoptimalspalte"/>
+</case>
+</switch>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/06100000.xhp b/helpcontent2/source/text/shared/02/06100000.xhp
index 96b7f192ff..e1331c755b 100644
--- a/helpcontent2/source/text/shared/02/06100000.xhp
+++ b/helpcontent2/source/text/shared/02/06100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="5">If you have numbered paragraphs and click the<emph> Move Up </emph>icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Up </emph>icon is only visible when the cursor is positioned in a bulleted or numbered list.
</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Up </emph>icon appears on the <emph>Text Formatting</emph> Bar when you use the outline view.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow.</paragraph>
<section id="syhochschieben">
<table id="tbl_id3155535">
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/06110000.xhp b/helpcontent2/source/text/shared/02/06110000.xhp
index 0569ab9028..d4bb49c6b2 100644
--- a/helpcontent2/source/text/shared/02/06110000.xhp
+++ b/helpcontent2/source/text/shared/02/06110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06110000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US" l10n="CHG" oldref="5">If you have numbered paragraphs and click the<emph> Move Down </emph>icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Down </emph>icon is only visible when the cursor is positioned in a bulleted or numbered list.
</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Down </emph>icon appears on the <emph>Text Formatting</emph> Bar when you use the outline view.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow.</paragraph>
<section id="syhinunterschieben">
<table id="tbl_id3155535">
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/07080000.xhp b/helpcontent2/source/text/shared/02/07080000.xhp
index 60c1a326d3..34375cc137 100644
--- a/helpcontent2/source/text/shared/02/07080000.xhp
+++ b/helpcontent2/source/text/shared/02/07080000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,40 +30,22 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0207080000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0207080000xml" indexer="include">
<title id="tit" xml-lang="en-US">Stop Loading</title>
<filename>/text/shared/02/07080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:24:28">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="stop">
<bookmark xml-lang="en-US" branch="hid/SID_BROWSE_STOP" id="bm_id1158113" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Stop" id="bm_id3148520" localize="false"/>
<paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/07080000.xhp" name="Stop Loading">Stop Loading</link></paragraph>
-<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Stop">Click to interrupt the current loading process, Ctrl-click to interrupt all loading processes.</ahelp></paragraph>
-</section>
-<section id="systop">
-<table id="tbl_id3149180">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="E">
-<image id="img_id3147399" src="res/sc06302.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147399" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145211" xml-lang="en-US" l10n="U" oldref="3">Stop Loading</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
+<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Stop">Click to interrupt the current loading process, Ctrl-click (Mac: Command-click) to interrupt all loading processes.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index aaa7b5f0ec..79a756ebfa 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 10100000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_CLOSEWIN" id="bm_id8159155" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CloseWin" id="bm_id3148520" localize="false"/>
<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/10100000.xhp" name="Close">Close</link></paragraph>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close</emph>, or press Ctrl+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="5">If additional views of the current document were opened by <emph>Window - New Window</emph>, this command will close only the current view.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 277c226856..82159826fd 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12100200.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0212100200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0212100200xml" indexer="include">
<title id="tit" xml-lang="en-US">Find Record</title>
<filename>/text/shared/02/12100200.xhp</filename>
</topic>
@@ -50,14 +48,15 @@
<bookmark_value>databases; searching records</bookmark_value>
</bookmark><comment>mw changed" database tables;" to "tables in databases;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SEARCH" id="bm_id9750501" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:RecSearch" id="bm_id3154812" localize="false"/><section id="findrecord">
+<bookmark xml-lang="en-US" branch="hid/.uno:RecSearch" id="bm_id3154812" localize="false"/>
+<section id="findrecord">
<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="datensatzsuche"><link href="text/shared/02/12100200.xhp" name="Find Record">Find Record</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchentext"><ahelp hid=".uno:RecSearch" visibility="hidden">Searches database tables and forms.</ahelp>In forms or database tables, you can search through data fields, list boxes, and check boxes for specific values.
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#datensuchen"/>
+<embed href="text/shared/00/00000450.xhp#datensuchen"/>
</section>
<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="U" oldref="3">When searching a table, the data fields of the current table are searched. When searching in a form, the data fields of the table linked with the form are searched.</paragraph>
<paragraph role="tip" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="111">The search described here is carried out by <item type="productname">%PRODUCTNAME</item>. If you want to use the SQL server to search in a database, then you should use the <link href="text/shared/02/12110000.xhp" name="Form-based Filters">Form-based Filters</link> icon on the <link href="text/shared/main0213.xhp" name="Form Bar">Form Bar</link>.</paragraph>
@@ -65,68 +64,77 @@
<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="2" l10n="U" oldref="112">Search for</paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="113">Specifies the type of search.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_TEXT" id="bm_id3154317" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="6">Text:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/>
+<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="6">Text:</paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT">Enter the search term in the box or select it from the list.</ahelp> The text under the cursor is already copied into the <emph>Text</emph> combo box. Note that while running a search in a form, tabs and line breaks cannot be processed.</paragraph>
<paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8">Your search terms will be saved as long as the table or the formula document is open. If you are running more than one search and you would like to repeat the search term, you can select a previously used search term from the combo box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="114">Field content is NULL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/>
+<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="114">Field content is NULL</paragraph>
<paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="115"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL">Specifies that fields will be found that contain no data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="116">Field content is not NULL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/>
+<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="116">Field content is not NULL</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="117"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL">Specifies that fields will be found that contain data.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="2" l10n="U" oldref="9">Where to search</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="10">Specifies the fields for the search.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3154564" xml-lang="en-US" level="3" l10n="U" oldref="105">Form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM" id="bm_id3150670" localize="false"/>
+<paragraph role="heading" id="hd_id3154564" xml-lang="en-US" level="3" l10n="U" oldref="105">Form</paragraph>
<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="106"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM">Specifies the logical form in which you want the search to take place.</ahelp></paragraph>
<paragraph role="note" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="107">The<emph> Form </emph>combo box is only visible if the current document is a form document with more than one logical form. It does not appear during a search in tables or queries.</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="108">Form documents may contain multiple logical forms. These are individual form components, which are each linked to a table.</paragraph>
<paragraph role="paragraph" id="par_id3145086" xml-lang="en-US" l10n="U" oldref="109">The <emph>Form</emph> combo box contains the names of all logical forms for which controls exist.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_ALLFIELDS" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3159414" xml-lang="en-US" level="3" l10n="U" oldref="11">All Fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_ALLFIELDS" id="bm_id3149047" localize="false"/>
+<paragraph role="heading" id="hd_id3159414" xml-lang="en-US" level="3" l10n="U" oldref="11">All Fields</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_SEARCH_ALLFIELDS">Searches through all fields.</ahelp> If you are running a search in a table, all fields in the table will be searched. If you are running a search in a form, all fields of the logical form (entered under <emph>Form</emph>) will be searched. If you are running a search in a table control field, all columns that are linked to a valid database table field will be searched.</paragraph>
<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="13">Note that the fields of the current logical form do not have to be identical to the fields of the form document. If the form document contains fields that point to multiple data sources (that is, multiple logical forms), the <emph>All Fields</emph> option will only search for the fields linked to data sources in the form document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FIELDSELECTION" id="bm_id3153524" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD" id="bm_id3150400" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="15">Single field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD" id="bm_id3150400" localize="false"/>
+<paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="15">Single field</paragraph>
<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD">Searches through a specified data field.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="2" l10n="U" oldref="17">Settings</paragraph>
<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="U" oldref="18">Defines settings to control the search.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_POSITION" id="bm_id3143233" localize="false"/><paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="19">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_POSITION" id="bm_id3143233" localize="false"/>
+<paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="19">Position</paragraph>
<paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_SEARCH_POSITION">Specifies the relationship of the search term and the field contents.</ahelp> The following options are available:</paragraph>
<table id="tbl_id3155994">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="21">anywhere in the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="22">Returns all fields containing the search pattern anywhere in the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="23">beginning of field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="24">Returns all fields containing the search pattern at the beginning of the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="74">end of field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="75">Returns all fields containing the search pattern at the end of the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="25">entire field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="26">Returns all fields containing the search pattern as an exact match to the contents of the field.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="27">If the <emph>Wildcard expression</emph> check box is marked, this function is not available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FORMATTER" id="bm_id3154147" localize="false"/><paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="28">Apply field format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FORMATTER" id="bm_id3154147" localize="false"/>
+<paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="28">Apply field format</paragraph>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SEARCH_FORMATTER">Specifies that all field formats are considered when searching in the current document.</ahelp> Field formats are all visible formats that are created using the following possibilities:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="78">in table design mode for field properties,</paragraph>
</listitem>
@@ -142,159 +150,168 @@
<paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="83">You have a date field, which is saved in "DD.MM.YY" format in the database (for example, 17.02.65). The format of the entry is changed in the data source view to "DD. MMM YYYY" (17 Feb 1965). Following this example, a record containing February 17 is only found when the <emph>Apply field format</emph> option is on:</paragraph>
<table id="tbl_id3151076">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="84">Apply field format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="85">Search pattern</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3083279" xml-lang="en-US" l10n="U" oldref="86">on</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155850" xml-lang="en-US" l10n="U" oldref="87">"Feb" is returned, but not "2".</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148590" xml-lang="en-US" l10n="U" oldref="88">off</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="89">"2" is returned, but not "Feb".</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="90">It is recommended that you always search using field formatting.</paragraph>
<paragraph role="paragraph" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="91">The following examples show possible issues when searching without field formatting. These issues depend on the database used and only occur for certain internal default formatting:</paragraph>
<table id="tbl_id3156320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="92">Search results</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="93">Cause</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="94">"5" returns "14:00:00" as a time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="95">Time fields are not defined for dBASE databases and must be simulated. To internally display the time "14:00:00", a 5 is necessary.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="96">"00:00:00" returns all records of a standard date field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="97">The database stores a date value internally using a combined date/time field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="98">"45.79" does not return "45.79" although the <emph>entire field</emph> option is selected under <emph>Position</emph>.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155518" xml-lang="en-US" l10n="U" oldref="99">The view shown does not match what is stored internally. For example, if value 45.789 is stored in the database as a field of type Number/Double and the shown formatting is set to display only two decimals, "45.79" is only returned in searches with field formatting.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="100">In this case, standard formatting is formatting that refers to the internally stored data. It is not always visible to the user, especially if it is used for simulating data types (for example, time fields in dBASE databases). This depends on the database used and the individual data type. Searching with field formatting is appropriate if you only want to find what is actually shown. This includes fields of type Date, Time, Date/Time and Number/Double.</paragraph>
<paragraph role="paragraph" id="par_id3154507" xml-lang="en-US" l10n="U" oldref="31">However, searching without <emph>Apply field format </emph>is appropriate for larger databases with no formatting issues, because it is faster.</paragraph>
<paragraph role="paragraph" id="par_id3153355" xml-lang="en-US" l10n="CHG" oldref="118">If you are searching the values of check boxes, and <emph>Apply field format</emph> is on, then you will receive a "1" for marked check boxes, a "0" for unmarked check boxes, and an empty string for undefined (tristate) check boxes. If the search has been carried out with <emph>Apply field format</emph> set to off, you will see the language-dependent default values "TRUE" or "FALSE".</paragraph>
<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US" l10n="U" oldref="119">If you use <emph>Apply field format</emph> when searching in list boxes, you find the text displayed in list boxes. If you do not use <emph>Apply field format,</emph> you will find the contents corresponding to the standard field format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_CASE" id="bm_id3156717" localize="false"/><paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_CASE" id="bm_id3156717" localize="false"/>
+<paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_SEARCH_CASE">Specifies that upper and lower case are taken into consideration during the search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BACKWARD" id="bm_id3151101" localize="false"/><paragraph role="heading" id="hd_id3145297" xml-lang="en-US" level="3" l10n="U" oldref="34">Search backwards</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BACKWARD" id="bm_id3151101" localize="false"/>
+<paragraph role="heading" id="hd_id3145297" xml-lang="en-US" level="3" l10n="U" oldref="34">Search backwards</paragraph>
<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SEARCH_BACKWARD">Specifies that the search process will run in reverse direction, from the last to the first record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_STARTOVER" id="bm_id3166447" localize="false"/><paragraph role="heading" id="hd_id3152484" xml-lang="en-US" level="3" l10n="U" oldref="36">From top / From bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_STARTOVER" id="bm_id3166447" localize="false"/>
+<paragraph role="heading" id="hd_id3152484" xml-lang="en-US" level="3" l10n="U" oldref="36">From top / From bottom</paragraph>
<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_SEARCH_STARTOVER">Restarts the search. A forward search restarts with the first record. A backwards search restarts with the last record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_WILDCARD" id="bm_id3156713" localize="false"/><paragraph role="heading" id="hd_id3163724" xml-lang="en-US" level="3" l10n="U" oldref="38">Wildcard expression</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_WILDCARD" id="bm_id3156713" localize="false"/>
+<paragraph role="heading" id="hd_id3163724" xml-lang="en-US" level="3" l10n="U" oldref="38">Wildcard expression</paragraph>
<paragraph role="paragraph" id="par_id3149255" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="HID_SEARCH_WILDCARD" visibility="hidden">Allows a search with a * or ? wildcard.</ahelp> You can use the following wildcards:</paragraph>
<table id="tbl_id3151187">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3146317" xml-lang="en-US" l10n="U" oldref="39">Wildcards</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="40">Meaning</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="41">Example</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="42">?</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148874" xml-lang="en-US" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="44">"?loppy" returns "Floppy"</paragraph>
<paragraph role="tablecontent" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="65">"M?ller" returns, for example, Miller and Moller</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148803" xml-lang="en-US" l10n="U" oldref="45">*</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="47">"*-*" returns "ZIP-Drive" and "CD-ROM"</paragraph>
<paragraph role="tablecontent" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="66">"M*er" returns all entries starting with an "M" and ending in "er" (for example, Miller, Moller, Mather)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression </emph>is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/><paragraph role="heading" id="hd_id3147130" xml-lang="en-US" level="3" l10n="U" oldref="49">Regular expression</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/>
+<paragraph role="heading" id="hd_id3147130" xml-lang="en-US" level="3" l10n="U" oldref="49">Regular expression</paragraph>
<paragraph role="paragraph" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
<paragraph role="paragraph" id="par_id3154718" xml-lang="en-US" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
<table id="tbl_id3148682">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153705" xml-lang="en-US" l10n="U" oldref="68">Search with wildcard expression</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="69">Search with regular expressions</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151045" xml-lang="en-US" l10n="U" oldref="70">?</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150384" xml-lang="en-US" l10n="U" oldref="71">.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153793" xml-lang="en-US" l10n="U" oldref="72">*</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="73">.*</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROX" id="bm_id3154814" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROXSETTINGS" id="bm_id3154817" localize="false"/><embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/><embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
+<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+<embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
<embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/><embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
+<embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
<embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/><embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
+<embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
<embed href="text/shared/optionen/01150200.xhp#asia"/>
<paragraph role="heading" id="hd_id3150861" xml-lang="en-US" level="2" l10n="U" oldref="101">State</paragraph>
<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="102">The <emph>State</emph> line shows the records returned by the search. If the search reaches the end (or the beginning) of a table, the search is automatically continued at the other end.</paragraph>
<paragraph role="paragraph" id="par_id3163720" xml-lang="en-US" l10n="U" oldref="103">In very large databases, finding the record in reverse search order can take some time. In this case, the status bar informs you that the records are still being counted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_SEARCH" id="bm_id3149494" localize="false"/><paragraph role="heading" id="hd_id3147389" xml-lang="en-US" level="2" l10n="U" oldref="51">Search / Cancel</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_SEARCH" id="bm_id3149494" localize="false"/>
+<paragraph role="heading" id="hd_id3147389" xml-lang="en-US" level="2" l10n="U" oldref="51">Search / Cancel</paragraph>
<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_SEARCH_BTN_SEARCH" visibility="hidden">Starts or cancels the search.</ahelp> If the search is successfully completed, the corresponding field in the table is highlighted. You can continue the search by clicking the <emph>Search</emph> button again. You can cancel a search process by clicking the <emph>Cancel</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_CLOSE" id="bm_id3152453" localize="false"/><paragraph role="heading" id="hd_id3145080" xml-lang="en-US" level="2" l10n="U" oldref="53">Close</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_CLOSE" id="bm_id3152453" localize="false"/>
+<paragraph role="heading" id="hd_id3145080" xml-lang="en-US" level="2" l10n="U" oldref="53">Close</paragraph>
<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="HID_SEARCH_BTN_CLOSE">Closes the dialog. The settings of the last search will be saved until you quit <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="104">If several tables or forms are open, you can set different search options for each document. When you close the documents only the search options of the document last closed are saved.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/13020000.xhp b/helpcontent2/source/text/shared/02/13020000.xhp
index 6774c5b635..2bc26884c0 100644
--- a/helpcontent2/source/text/shared/02/13020000.xhp
+++ b/helpcontent2/source/text/shared/02/13020000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 13020000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -118,8 +118,7 @@
</tablerow>
</table>
-<paragraph role="tip" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="16">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl </defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</paragraph>
+<paragraph role="tip" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="16">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl </defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</paragraph>
<paragraph role="note" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">Tabs that have been set are not changed when indenting a paragraph. If the set tabs end up outside the margins of the paragraph, they are no longer displayed, but they still exist.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/20050000.xhp b/helpcontent2/source/text/shared/02/20050000.xhp
index b513c6819e..397d6b02d4 100644
--- a/helpcontent2/source/text/shared/02/20050000.xhp
+++ b/helpcontent2/source/text/shared/02/20050000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 20050000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -113,7 +113,7 @@
<paragraph role="paragraph" id="par_id7234717" xml-lang="en-US" l10n="NEW">BLK</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection mode (Ctrl+Shift+F8)</paragraph>
+<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection mode (<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id5258644" xml-lang="en-US" l10n="NEW">A block of text can be selected.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/24100000.xhp b/helpcontent2/source/text/shared/02/24100000.xhp
index 6eb9a388e5..1c864313c4 100644
--- a/helpcontent2/source/text/shared/02/24100000.xhp
+++ b/helpcontent2/source/text/shared/02/24100000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 24100000.xhp,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0224100000xml" indexer="include">
+<topic id="textshared0224100000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Crop</title>
<filename>/text/shared/02/24100000.xhp</filename>
</topic>
@@ -49,7 +49,7 @@
<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/24100000.xhp" name="Crop">Crop</link></paragraph>
<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:GrafAttrCrop">Allows to crop the display of an inserted picture. Only the display gets cropped, the inserted picture is not changed.</ahelp> A picture must be selected to enable cropping.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:Crop" id="bm_id0514200804065077" localize="false"/>
-<paragraph role="paragraph" id="par_id0514200804261097" xml-lang="en-US" l10n="NEW">In Impress and Draw no dialog is shown when you click the icon, but you see eight cropping handles. Open the context menu of a selected picture and choose <item type="menuitem">Drop Picture</item>, if you want to use the <link href="text/shared/01/05030800.xhp">dialog</link> for cropping.</paragraph>
+<paragraph role="paragraph" id="par_id0514200804261097" xml-lang="en-US" l10n="NEW">In Impress and Draw no dialog is shown when you click the icon, but you see eight cropping handles. Open the context menu of a selected picture and choose <item type="menuitem">Crop Picture</item>, if you want to use the <link href="text/shared/01/05030800.xhp">dialog</link> for cropping.</paragraph>
<paragraph role="paragraph" id="par_id0514200804261043" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Drag any of the eight cropping handles to crop the picture.</ahelp></paragraph>
</section>
<section id="sycut">
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index a11060381f..73c361ee7c 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -98,6 +98,7 @@ XHPFILES = \
03140000.xhp \
03150000.xhp \
03200000.xhp \
+ 04210000.xhp \
05020000.xhp \
05090000.xhp \
05110000.xhp \
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index b858c21f89..57ac1e1dd8 100755
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared02paintbrushxml" indexer="include" status="PUBLISH">
+<topic id="textshared02paintbrushxml" indexer="include">
<title id="tit" xml-lang="en-US">Format Paintbrush</title>
<filename>/text/shared/02/paintbrush.xhp</filename>
</topic>
@@ -45,26 +43,28 @@
<body>
<section id="paintbrush">
<bookmark xml-lang="en-US" branch="hid/SID_FORMATPAINTBRUSH" id="bm_id1629078" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FormatPaintbrush" id="bm_id3944822" localize="false"/><paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/paintbrush.xhp">Format Paintbrush</link></paragraph>
-<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select a text (in Writer) or an object, then click this icon. Now click another text (in Writer) or another object to apply the same formatting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatPaintbrush" id="bm_id3944822" localize="false"/>
+<paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/paintbrush.xhp">Format Paintbrush</link></paragraph>
+<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting.</ahelp><comment>i93691</comment></paragraph>
<section id="howtoget">
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW">Click the <emph>Format Paintbrush</emph> icon
-<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
- </image> on the <emph>Standard</emph> toolbar.</paragraph>
+<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image> on the <emph>Standard</emph> toolbar. </paragraph>
</section>
<section id="sypaintbrush">
<table id="tbl_id4703817">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">
-<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
+<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10657" xml-lang="en-US" l10n="NEW">Format Paintbrush</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index e1742aaaec..5f7dfe45ce 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0401010000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0401010000xml" indexer="include">
<title id="tit" xml-lang="en-US">General Shortcut Keys in $[officename]</title>
<filename>/text/shared/04/01010000.xhp</filename>
</topic>
@@ -55,8 +53,8 @@
</section>
<embed href="text/shared/00/00000099.xhp#keys"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
-</caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down the key <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
+</caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then press the O key. Release both keys after the dialog appears.</paragraph>
<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="5">When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available.</paragraph>
<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
@@ -68,21 +66,21 @@
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="11">Pressing ESC closes the dialog without saving changes. <switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>If you place the focus on a button, not only will you see the dotted line framing the name of the button, but also a thicker shadow under the button selected. This indicates that if you exit the dialog by pressing the Enter key, it is the equivalent of pressing that button itself.</defaultinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3147209" xml-lang="en-US" level="2" l10n="U" oldref="105">Shortcut Keys for Mouse Actions</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> to access additional functionality. The modified functions available when holding down keys during drag-and-drop are indicated by the mouse pointer changing form. When selecting files or other objects, the modifier keys can extend the selection - the functions are explained where applicable. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="127">Practical Text Input Fields</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="129">You can open a context menu, which contains some of the most often-used commands.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog to insert one or more special characters.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to select the entire text. Use the right or left arrow key to remove the selection.</paragraph>
</listitem>
<listitem>
@@ -92,11 +90,11 @@
<paragraph role="listitem" id="par_id3149785" xml-lang="en-US" l10n="CHG" oldref="133">A triple-click in a text input field selects the entire field. A triple-click in a text document selects the current sentence.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del to delete everything from the cursor position to the end of the word.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and right or left arrow key, the cursor will jump from word to word; if you also hold down the Shift key, one word after the other is selected.</paragraph>
</listitem>
<listitem>
@@ -106,15 +104,15 @@
<paragraph role="listitem" id="par_id3148757" xml-lang="en-US" l10n="U" oldref="137">Drag-and-drop can be used within and outside of a text box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z shortcut keys are used to undo modifications one step at a time; the text will then have the status it had before the first change.</paragraph>
</listitem>
</list>
<section id="autocompurl">
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
-</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
+<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
+</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
</caseinline><defaultinline>in your home folder</defaultinline></switchinline> that starts with the letter "a".</paragraph>
</listitem>
<listitem>
@@ -123,819 +121,819 @@
</list>
</section>
<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="163">Interrupting Macros</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q.</paragraph>
<paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2" l10n="U" oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="13">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.)
</caseinline></switchinline></paragraph>
<table id="tbl_id3555101">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3153367" xml-lang="en-US" l10n="U" oldref="14">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="15">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149260" xml-lang="en-US" l10n="U" oldref="16">Enter key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153727" xml-lang="en-US" l10n="U" oldref="17">Activates the focused button in a dialog</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153142" xml-lang="en-US" l10n="U" oldref="18">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="19">Terminates the action or dialog. If in $[officename] Help: goes up one level.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151118" xml-lang="en-US" l10n="U" oldref="20">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="21">Toggles the focused check box in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152791" xml-lang="en-US" l10n="U" oldref="22">Arrow keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="23">Changes the active control field in an option section of a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154188" xml-lang="en-US" l10n="U" oldref="24">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="25">Advances focus to the next section or element in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153363" xml-lang="en-US" l10n="U" oldref="26">Shift + Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="27">Moves the focus to the previous section or element in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="154">Opens the list of the control field currently selected in a dialog. These shortcut keys apply not only to combo boxes but also to icon buttons with pop-up menus. Close an opened list by pressing the Escape key.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159348" xml-lang="en-US" l10n="U" oldref="172">Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144765" xml-lang="en-US" l10n="U" oldref="171">Deletes the selected item(s) into the recycle bin.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149379" xml-lang="en-US" l10n="U" oldref="174">Shift+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149412" xml-lang="en-US" l10n="U" oldref="173">Deletes the selected item(s) without putting them in the recycle bin.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154792" xml-lang="en-US" l10n="U" oldref="176">Backspace</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="175">When a folder is shown: goes up one level (goes back)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10BC0" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10BC0" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10BE8" xml-lang="en-US" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Tab</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149912" xml-lang="en-US" l10n="CHG" oldref="142">When positioned at the start of a header, a tab is inserted.<comment>UFI: fixes #i21687#</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148573" xml-lang="en-US" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="288">Activates the selected OLE object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146990" xml-lang="en-US" l10n="U" oldref="290">Enter (if a drawing object or text object is selected)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153839" xml-lang="en-US" l10n="U" oldref="291">Activates text input mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + O</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="29">Opens a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + S</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="31">Saves the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + N</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="33">Creates a new document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="177">Opens <emph>Templates and Documents</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + P</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="35">Prints document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Q</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="114">Exits application.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + X</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="37">Cuts out the selected elements.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + C</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148537" xml-lang="en-US" l10n="U" oldref="39">Copies the selected items.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + V</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + V</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+V</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F4B" xml-lang="en-US" l10n="NEW">Opens the <emph>Paste Special</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + A</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="43">Selects all.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Z</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45">Undoes last action.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147095" xml-lang="en-US" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Y</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147095" xml-lang="en-US" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="352">Redoes last action.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + Y</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Y</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id8709677" xml-lang="en-US" l10n="NEW">Repeats last command.<comment>[framework-features] new/SRC680_m221 : Shortcut for "Repeat"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="166">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="168">Searches for the last entered search term.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154198" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Ctrl+Shift+J</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150567" xml-lang="en-US" l10n="CHG" oldref="49"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Toggles the view between fullscreen mode and normal mode in Writer or Calc</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+R</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148462" xml-lang="en-US" l10n="U" oldref="51">Redraws the document view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150665" xml-lang="en-US" l10n="CHG" oldref="350">Enable or disable the selection cursor in read-only text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148753" xml-lang="en-US" l10n="U" oldref="91">The <emph>Italic</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also marked in italic.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150490" xml-lang="en-US" l10n="U" oldref="93">The <emph>Bold</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also put in bold.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153228" xml-lang="en-US" l10n="U" oldref="95">The <emph>Underlined</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also underlined.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3152891" xml-lang="en-US" level="2" l10n="U" oldref="60">Shortcut Keys Using the Function Keys</paragraph>
<paragraph role="paragraph" id="par_id3152457" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="sys"><caseinline select="MAC">Not all of the function shortcut keys are available on the Mac.
</caseinline></switchinline></paragraph>
<table id="tbl_id1489608">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3149726" xml-lang="en-US" l10n="U" oldref="183">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153756" xml-lang="en-US" l10n="U" oldref="184">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149404" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>F1</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Starts the $[officename] Help</defaultinline></switchinline></paragraph>
<paragraph role="tablecontent" id="par_id3153697" xml-lang="en-US" l10n="U" oldref="152">In the $[officename] Help: jumps to main help page.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Shift + F1</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153309" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Context Help</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159220" xml-lang="en-US" l10n="U" oldref="292">Shift+F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="293">Turns on Extended Tips for the currently selected command, icon or control.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4 or <switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4 or <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+F4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="69">Closes the current document (close $[officename] when the last open document is closed)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154532" xml-lang="en-US" l10n="U" oldref="180">F6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144506" xml-lang="en-US" l10n="U" oldref="179">Sets focus in next subwindow (for example, document/data source view)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3144771" xml-lang="en-US" l10n="U" oldref="182">Shift+F6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147075" xml-lang="en-US" l10n="U" oldref="181">Sets focus in previous subwindow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156191" xml-lang="en-US" l10n="U" oldref="294">F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156172" xml-lang="en-US" l10n="U" oldref="295">Activates the first menu (File menu)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159093" xml-lang="en-US" l10n="U" oldref="146">Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148606" xml-lang="en-US" l10n="U" oldref="147">Opens the context menu.</paragraph>
</tablecell>
</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148822" xml-lang="en-US" l10n="U" oldref="353">Ctrl+F11</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149156" xml-lang="en-US" l10n="U" oldref="354">Opens the Style Catalog.<comment>UFI: may get discarded</comment></paragraph>
-</tablecell>
-</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3153288" xml-lang="en-US" level="2" l10n="U" oldref="287">Shortcut keys in the Gallery</paragraph>
<table id="tbl_id310678">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3156308" xml-lang="en-US" l10n="U" oldref="286">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149440" xml-lang="en-US" l10n="U" oldref="285">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149971" xml-lang="en-US" l10n="U" oldref="284">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="283">Moves between areas.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148971" xml-lang="en-US" l10n="U" oldref="282">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154059" xml-lang="en-US" l10n="U" oldref="281">Moves between areas (backwards)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3152368" xml-lang="en-US" level="3" l10n="U" oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
<table id="tbl_id8934598">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11555" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1155B" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159192" xml-lang="en-US" l10n="U" oldref="279">Up arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152540" xml-lang="en-US" l10n="U" oldref="278">Moves the selection up one.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150892" xml-lang="en-US" l10n="U" oldref="277">Down arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151004" xml-lang="en-US" l10n="U" oldref="276">Moves the selection down.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148652" xml-lang="en-US" l10n="U" oldref="273">Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="272">Opens a context menu.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150099" xml-lang="en-US" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="268">Opens the <emph>Enter Title</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153653" xml-lang="en-US" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155946" xml-lang="en-US" l10n="U" oldref="265">Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145372" xml-lang="en-US" l10n="U" oldref="264">Inserts a new theme</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3150633" xml-lang="en-US" level="3" l10n="U" oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
<table id="tbl_id9288308">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN116D6" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN116DC" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149343" xml-lang="en-US" l10n="U" oldref="262">Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153241" xml-lang="en-US" l10n="U" oldref="261">Jumps to the first entry.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148809" xml-lang="en-US" l10n="U" oldref="260">End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148902" xml-lang="en-US" l10n="U" oldref="259">Jumps to the last entry.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149382" xml-lang="en-US" l10n="U" oldref="258">Left Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="257">Selects the next Gallery element on the left.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152926" xml-lang="en-US" l10n="U" oldref="256">Right Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153802" xml-lang="en-US" l10n="U" oldref="255">Selects the next Gallery element on the right.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="254">Up Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="253">Selects the next Gallery element above.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147517" xml-lang="en-US" l10n="U" oldref="252">Down Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="251">Selects the next Gallery element below.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145602" xml-lang="en-US" l10n="U" oldref="250">Page Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147081" xml-lang="en-US" l10n="U" oldref="249">Scroll up one screen.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153045" xml-lang="en-US" l10n="U" oldref="355">Page Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150411" xml-lang="en-US" l10n="U" oldref="248">Scroll down one screen.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153614" xml-lang="en-US" l10n="U" oldref="245">Inserts the selected object as a linked object into the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153608" xml-lang="en-US" l10n="U" oldref="243">Inserts a copy of the selected object into the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+T</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156370" xml-lang="en-US" l10n="U" oldref="241">Opens the <emph>Enter Title</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146107" xml-lang="en-US" l10n="U" oldref="239">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147552" xml-lang="en-US" l10n="U" oldref="238">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145324" xml-lang="en-US" l10n="U" oldref="237">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148978" xml-lang="en-US" l10n="U" oldref="236">Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="235">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154108" xml-lang="en-US" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153294" xml-lang="en-US" l10n="U" oldref="233">Switches back to main overview.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="dbtable">
<paragraph role="heading" id="hd_id3149722" xml-lang="en-US" level="2" l10n="CHG" oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
<table id="tbl_id1178319">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11906" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1190C" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150963" xml-lang="en-US" l10n="U" oldref="331">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="332">Toggles row selection, except when the row is in edit mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="334">Toggles row selection</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147482" xml-lang="en-US" l10n="U" oldref="335">Shift+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149319" xml-lang="en-US" l10n="U" oldref="336">Selects the current column</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW">Ctrl+PgUp</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1743522" xml-lang="en-US" l10n="NEW">Moves pointer to the first row</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW">Ctrl+PgDn</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7870113" xml-lang="en-US" l10n="NEW">Moves pointer to the last row</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="zeichenobjekte">
<paragraph role="heading" id="hd_id3147411" xml-lang="en-US" level="2" l10n="U" oldref="230">Shortcut Keys for Drawing Objects</paragraph>
<table id="tbl_id1152073">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1199F" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN119A5" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149684" xml-lang="en-US" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149684" xml-lang="en-US" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150264" xml-lang="en-US" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150264" xml-lang="en-US" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 and press Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154055" xml-lang="en-US" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149242" xml-lang="en-US" l10n="U" oldref="225">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157902" xml-lang="en-US" l10n="U" oldref="224">Selects the next Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149349" xml-lang="en-US" l10n="U" oldref="223">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="222">Selects the previous Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="220">Selects the first Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3161664" xml-lang="en-US" l10n="U" oldref="218">Selects the last Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153099" xml-lang="en-US" l10n="U" oldref="217">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149009" xml-lang="en-US" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156271" xml-lang="en-US" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152818" xml-lang="en-US" l10n="U" oldref="339">Exit Handle Selection Mode and return to Object Selection Mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151258" xml-lang="en-US" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159162" xml-lang="en-US" l10n="U" oldref="191">Move the selected point (the snap-to-grid functions are temporarily disabled, but end points still snap to each other).</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up/Down/Left/Right Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="212">Moves the selected Drawing Object one pixel (in Selection Mode)</paragraph>
<paragraph role="tablecontent" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="211">Re-sizes a Drawing Object (in Handle Selection Mode)</paragraph>
<paragraph role="tablecontent" id="par_id3145306" xml-lang="en-US" l10n="U" oldref="210">Rotates a Drawing Object (in Rotation Mode)</paragraph>
@@ -944,93 +942,95 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153580" xml-lang="en-US" l10n="U" oldref="207">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153053" xml-lang="en-US" l10n="U" oldref="206">Select a point of a drawing object (in Point Selection mode) / Cancel selection.</paragraph>
<paragraph role="tablecontent" id="par_id3145629" xml-lang="en-US" l10n="U" oldref="205">The selected point blinks once per second.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148624" xml-lang="en-US" l10n="U" oldref="204">Shift+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154842" xml-lang="en-US" l10n="U" oldref="203">Select an additional point in Point Selection mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152955" xml-lang="en-US" l10n="U" oldref="201">Select the next point of the drawing object (Point Selection mode)</paragraph>
<paragraph role="tablecontent" id="par_id3149753" xml-lang="en-US" l10n="U" oldref="200">In Rotation mode, the center of rotation can also be selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151296" xml-lang="en-US" l10n="U" oldref="198">Select the previous point of the drawing object (Point Selection mode)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="341">A new drawing object with default size is placed in the center of the current view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter at the Selection icon</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="343">Activates the first drawing object in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154569" xml-lang="en-US" l10n="U" oldref="196">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149994" xml-lang="en-US" l10n="U" oldref="195">Leave the Point Selection mode. The drawing object is selected afterwards.</paragraph>
<paragraph role="tablecontent" id="par_id3155512" xml-lang="en-US" l10n="U" oldref="193">Edit a point of a drawing object (Point Edit mode)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148580" xml-lang="en-US" l10n="U" oldref="344">Any text or numerical key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="345">If a drawing object is selected, switches to edit mode and places the cursor at the end of the text in the drawing object. A printable character is inserted.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW">Alt key while creating or scaling a graphic object</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while creating or scaling a graphic object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id8308969" xml-lang="en-US" l10n="NEW">The position of the object's center is fixed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id526444" xml-lang="en-US" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id4939725" xml-lang="en-US" l10n="NEW">The ratio of the object's width to height is fixed.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="relatedtopics">
<embed href="text/shared/04/01020000.xhp#DB_keys"/>
diff --git a/helpcontent2/source/text/shared/04/01020000.xhp b/helpcontent2/source/text/shared/04/01020000.xhp
index 4fb8f95b55..aff765f66c 100755
--- a/helpcontent2/source/text/shared/04/01020000.xhp
+++ b/helpcontent2/source/text/shared/04/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -134,8 +134,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153510" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3153510" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="21">Opens the combo box.</paragraph>
@@ -143,8 +142,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151205" xml-lang="en-US" l10n="U" oldref="22"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3151205" xml-lang="en-US" l10n="U" oldref="22"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145302" xml-lang="en-US" l10n="U" oldref="23">Closes the combo box.</paragraph>
@@ -184,8 +182,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155766" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</paragraph>
+<paragraph role="tablecontent" id="hd_id3155766" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="58">Sets the focus (if not in design mode) to the first control. The first control is the first one listed in the Form Navigator.</paragraph>
@@ -204,8 +201,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156054" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageUp</paragraph>
+<paragraph role="tablecontent" id="hd_id3156054" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150389" xml-lang="en-US" l10n="U" oldref="34">Jumps between tabs.</paragraph>
@@ -213,8 +209,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156384" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageDown</paragraph>
+<paragraph role="tablecontent" id="hd_id3156384" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="36">Jumps between tabs.</paragraph>
@@ -246,8 +241,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154967" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
+<paragraph role="tablecontent" id="hd_id3154967" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3147255" xml-lang="en-US" l10n="U" oldref="44">Inserts the selected control.</paragraph>
@@ -256,7 +250,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="hd_id3163726" xml-lang="en-US" l10n="U" oldref="45">Arrow key</paragraph>
-<paragraph role="tablecontent" id="par_idN109BA" xml-lang="en-US" l10n="NEW">Ctrl + arrow key</paragraph>
+<paragraph role="tablecontent" id="par_idN109BA" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145791" xml-lang="en-US" l10n="U" oldref="46">Moves the selected control in steps of 1 mm in the respective direction. In point edit mode, it changes the size of the selected control.</paragraph>
@@ -264,8 +258,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154665" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
+<paragraph role="tablecontent" id="hd_id3154665" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="50">In point edit mode, jumps to next handle.</paragraph>
@@ -273,8 +266,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150208" xml-lang="en-US" l10n="U" oldref="51">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
+<paragraph role="tablecontent" id="hd_id3150208" xml-lang="en-US" l10n="U" oldref="51">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="52">In point edit mode, jumps to previous handle.</paragraph>
diff --git a/helpcontent2/source/text/shared/04/makefile.mk b/helpcontent2/source/text/shared/04/makefile.mk
index 5f46044bd4..59727b800e 100644
--- a/helpcontent2/source/text/shared/04/makefile.mk
+++ b/helpcontent2/source/text/shared/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b2fbc034ae..b4028ba58e 100755
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0500000001xml" indexer="include" status="PUBLISH">
+<topic id="textshared0500000001xml" indexer="include">
<title id="tit" xml-lang="en-US">Getting Support</title>
<filename>/text/shared/05/00000001.xhp</filename>
</topic>
@@ -54,10 +52,15 @@
<paragraph role="paragraph" id="par_id9173253" xml-lang="en-US" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
<paragraph role="paragraph" id="par_id3150667" xml-lang="en-US" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment><paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
+<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
+<paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
<paragraph role="paragraph" id="par_id1318380" xml-lang="en-US" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id2611386" xml-lang="en-US" level="2" l10n="NEW">Mailing lists</paragraph>
-<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="heading" id="hd_id0915200811081722" xml-lang="en-US" level="2" l10n="NEW">Forum</paragraph>
+<paragraph role="paragraph" id="par_id0915200811081778" xml-lang="en-US" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
+<paragraph role="heading" id="hd_id0804200803314150" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
+<paragraph role="paragraph" id="par_id0804200803314235" xml-lang="en-US" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
<paragraph role="heading" id="hd_id3168534" xml-lang="en-US" level="2" l10n="NEW">Downloads</paragraph>
<paragraph role="paragraph" id="par_id3028143" xml-lang="en-US" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id2602967" xml-lang="en-US" level="2" l10n="NEW">Documentation</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index e19c2b646b..55d77ffb7f 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000110.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -129,7 +129,7 @@
<paragraph role="paragraph" id="par_idN1092C" xml-lang="en-US" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press Ctrl+C.</paragraph>
+<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_idN10933" xml-lang="en-US" l10n="NEW">To search the current Help page:</paragraph>
@@ -137,7 +137,7 @@
<listitem>
<paragraph role="paragraph" id="par_idN10939" xml-lang="en-US" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10940" xml-lang="en-US" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
-<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press Ctrl+F.</paragraph>
+<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10A22" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index a1e2e634e0..b53847959e 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/07/makefile.mk b/helpcontent2/source/text/shared/07/makefile.mk
index 8c344b9784..c080f0760b 100644
--- a/helpcontent2/source/text/shared/07/makefile.mk
+++ b/helpcontent2/source/text/shared/07/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index d1798fb4c2..1f89e18dc9 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autopi/01010000.xhp b/helpcontent2/source/text/shared/autopi/01010000.xhp
index 2f7abebf88..32930bf472 100644
--- a/helpcontent2/source/text/shared/autopi/01010000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01010000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Letter Wizard</title>
<filename>/text/shared/autopi/01010000.xhp</filename>
</topic>
@@ -48,11 +46,12 @@
<bookmark_value>templates;letters</bookmark_value>
</bookmark><comment>mw made "letters;..." a one level entry</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotLetter" id="bm_id3157898" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/><paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/>
+<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="U" oldref="2"><variable id="brief"><ahelp hid=".uno:AutoPilotLetter">Starts the wizard for a letter template.</ahelp>
</variable> You can use this template for both business and personal correspondence.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
+<embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
</section>
<paragraph role="paragraph" id="par_id3149178" xml-lang="en-US" l10n="U" oldref="3">$[officename] comes with sample templates for personal or business letters, which you can customize to your own needs with the help of the wizard. The wizard leads you step-by-step in creating a document template and offers numerous layout and design options. The preview gives you an impression of how the finished letter will appear according to the settings you choose.</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Within the wizard, you can modify your entries and options at any time. You may also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -64,15 +63,23 @@
<embed href="text/shared/autopi/01010500.xhp#seite5"/>
<embed href="text/shared/autopi/01010600.xhp#seite6"/>
<section id="zurueck">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/><paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
+<paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
<paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="HID_LTRWIZARD_BACK">Allows you to view the selections that you made on the previous steps.</ahelp> The current settings will be saved. </paragraph>
</section>
<section id="weiter">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/><paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/>
+<paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="HID_LTRWIZARD_NEXT">Saves the current settings and continues to the next page.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/>
+<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_LTRWIZARD_CREATE">According to your selections, the wizard creates a new document template and saves it on your hard disk.</ahelp> $[officename] creates a new document based on the existing templates with the "Untitled X" name (X stands for the consecutive numbering) and displays it on the work area.</paragraph>
<paragraph role="note" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="16">$[officename] saves the current settings in the wizard according to the chosen template. These settings are used as the default settings the next time you activate the wizard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/></body>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index c69724477d..86ef883c14 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01020000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Fax Wizard</title>
<filename>/text/shared/autopi/01020000.xhp</filename>
</topic>
@@ -48,11 +46,12 @@
<bookmark_value>templates;faxes</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotFax" id="bm_id3143281" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/><paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/>
+<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="fax"><ahelp hid=".uno:AutoPilotFax">Opens the wizard for faxes.</ahelp> The wizard can help you create document templates for fax documents. You can then print the fax documents to a printer or to a fax machine, if fax driver software is available.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotfax"/>
+<embed href="text/shared/00/00000401.xhp#autopilotfax"/>
</section>
<paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="CHG" oldref="3">$[officename] comes with a template for fax documents, which you can modify with the wizard to suit your own needs. The wizard leads you step-by-step in creating a document template, and offers numerous layout and design options. The document preview gives you an impression of how the finished fax will appear.</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="4">Within the dialog you can modify your entries and options at any time. You can also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -61,12 +60,16 @@
<embed href="text/shared/autopi/01020300.xhp#seite3"/>
<embed href="text/shared/autopi/01020400.xhp#seite4"/>
<embed href="text/shared/autopi/01020500.xhp#seite5"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_BACK" id="bm_id2001709" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="5">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_BACK" id="bm_id2001709" localize="false"/>
+<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="5">Back</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Click the<emph> Back </emph>button to view the settings chosen on the previous page. The current settings will not be modified or deleted if you click this button.<emph> Back </emph>will be active from the second page onwards.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_NEXT" id="bm_id9227271" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_NEXT" id="bm_id9227271" localize="false"/>
+<paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</paragraph>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">The wizard saves the current settings and goes to the next page. The<emph> Next </emph>button will become inactive once you have reached the last page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CREATE" id="bm_id2856532" localize="false"/><paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Finish</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CREATE" id="bm_id2856532" localize="false"/>
+<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Finish</paragraph>
<paragraph role="paragraph" id="par_id3146948" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">According to your selections, the wizard creates a document template and saves it. A new document based on the template appears in the work area, with the filename "UntitledX".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CANCEL" id="bm_id833765" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment></body>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090000.xhp b/helpcontent2/source/text/shared/autopi/01090000.xhp
index a6771245f8..a8f6b09f17 100755
--- a/helpcontent2/source/text/shared/autopi/01090000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01090000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard</title>
<filename>/text/shared/autopi/01090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-14T12:46:21">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_DIALOG" id="bm_id3156211" localize="false"/>
@@ -53,7 +49,7 @@
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2"><variable id="formular"><ahelp hid="HID_DLGFORM_DIALOG">Activates the Wizard for creating forms.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="3">Select the form properties using the following steps:</paragraph>
<embed href="text/shared/autopi/01090100.xhp#fieldselection"/>
@@ -64,10 +60,10 @@
<embed href="text/shared/autopi/01090400.xhp#setdataentry"/>
<embed href="text/shared/autopi/01090500.xhp#applystyles"/>
<embed href="text/shared/autopi/01090600.xhp#setname"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDFINISH" id="bm_id6868800" localize="false"/>
<paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create the form without answering further pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090100.xhp b/helpcontent2/source/text/shared/autopi/01090100.xhp
index 20604181db..92c026a80a 100755
--- a/helpcontent2/source/text/shared/autopi/01090100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090100.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01090100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090100xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard - Field Selection</title>
<filename>/text/shared/autopi/01090100.xhp</filename>
</topic>
@@ -48,51 +46,90 @@
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">On this page of the <link href="text/shared/autopi/01090000.xhp">Form Wizard</link>, you can specify the table or query that you need to create the form as well as the fields that you want to include in the form.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_LBTABLES" id="bm_id3154751" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/>
+<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLGFORM_LBTABLES">Specifies the table or query that you want to create the form for.</ahelp></paragraph>
<section id="vorhandenefelder">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSAVAILABLE" id="bm_id3149177" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/><paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSAVAILABLE" id="bm_id560014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDS" id="bm_id2533341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDS" id="bm_id4751121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS" id="bm_id3149283" localize="false"/>
+<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
+<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
</section>
<section id="uebernehmen">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVESELECTED" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT" id="bm_id3159201" localize="false"/>
+<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="HID_DLGFORM_CMDMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp><comment>i73704</comment></paragraph>
</section>
<section id="uebernehmealle">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVEALL" id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/><paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEALL" id="bm_id6911221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEALL" id="bm_id3862117" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT" id="bm_id3150178" localize="false"/>
+<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="HID_DLGFORM_CMDMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="entfernen">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVESELECTED" id="bm_id3150669" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/><paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVESELECTED" id="bm_id3583483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" id="bm_id9915768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVESELECTED" id="bm_id2427442" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT" id="bm_id3147043" localize="false"/>
+<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_DLGFORM_CMDREMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="entfernealle">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVEALL" id="bm_id3155135" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/><paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT" id="bm_id3156136" localize="false"/>
+<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_DLGFORM_CMDREMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="updown">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEUP" id="bm_id3334452" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_UP" id="bm_id915860" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP" id="bm_id5749382" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/><paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id3135166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
+<paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
<paragraph role="paragraph" id="par_idN1074E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field up one entry in the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEDOWN" id="bm_id5430463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_DOWN" id="bm_id2385937" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN" id="bm_id1741691" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id5736259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
<paragraph role="paragraph" id="par_idN10755" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field down one entry in the list.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSSELECTED" id="bm_id3145673" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/>
+<paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
<paragraph role="paragraph" id="par_id3156194" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_DLGFORM_FIELDSSELECTED">Displays the fields that are in the new form.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="7"><link href="text/shared/autopi/01090200.xhp" name="Form Wizard - Set up a subform">Form Wizard - Set up a subform</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01090210.xhp b/helpcontent2/source/text/shared/autopi/01090210.xhp
index f5d5997cfc..88f9e1b00e 100755
--- a/helpcontent2/source/text/shared/autopi/01090210.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090210.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090210.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01090210xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090210xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard - Add Subform Fields</title>
<filename>/text/shared/autopi/01090210.xhp</filename>
</topic>
-<history>
-<created date="2004-07-02T12:24:48">UFI: new Form Wizard page 3</created>
-<lastedited date="2005-02-15T14:51:39">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="addsubformfields">
@@ -48,18 +46,17 @@
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specify the table or query you need to create the subform, and which fields you wish to include in the subform.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_LBTABLES" id="bm_id2198553" localize="false"/>
<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables or queries</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table or query for which the subform is to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSSELECTED" id="bm_id7471541" localize="false"/>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in my subform</paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new subform.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01100000.xhp b/helpcontent2/source/text/shared/autopi/01100000.xhp
index 29a986805b..d98e06c15c 100755
--- a/helpcontent2/source/text/shared/autopi/01100000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01100000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Report Wizard</title>
<filename>/text/shared/autopi/01100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-12T12:49:21">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_DOCUMENT_CREATE_REPWIZ" id="bm_id3153894" localize="false"/>
@@ -50,7 +46,7 @@
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="1"><variable id="report"><ahelp hid="HID_DOCUMENT_CREATE_REPWIZ">Activates the wizard for creating reports.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotreport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotreport"/>
</section>
<embed href="text/shared/guide/data_report.xhp#data_report"/><comment>UFI: added Help ID, see #i61571</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_DIALOG" id="bm_id6317331" localize="false"/>
@@ -61,8 +57,8 @@
<embed href="text/shared/autopi/01100300.xhp#sortoptions"/>
<embed href="text/shared/autopi/01100400.xhp#chooselayout"/>
<embed href="text/shared/autopi/01100500.xhp#savereport"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01100100.xhp b/helpcontent2/source/text/shared/autopi/01100100.xhp
index d4dfd28038..0dfe78a897 100755
--- a/helpcontent2/source/text/shared/autopi/01100100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100100.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DLGREPORT_1_LBTABLES">Select the table or query for which the report is to be created.</ahelp></paragraph>
<section id="vorhandenefelder">
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSAVAILABLE" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
+<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSSELECTED" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3153031" xml-lang="en-US" level="2" l10n="U" oldref="8">Fields in report</paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGREPORT_1_FIELDSSELECTED">Displays all fields that are included in the new report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01120000.xhp b/helpcontent2/source/text/shared/autopi/01120000.xhp
index 9caf5f7a5a..ecb34db2fb 100755
--- a/helpcontent2/source/text/shared/autopi/01120000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsharedautopi01120000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Group Element Wizard</title>
+<topic id="textsharedautopi01120000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Group Element Wizard</title>
<filename>/text/shared/autopi/01120000.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>
-
-
- <paragraph role="heading" level="1" id="hd_id3149031" l10n="U" xml-lang="en-US" oldref="1">Group Element Wizard</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3151097" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#gruppen"/>
+<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1">Group Element Wizard</paragraph>
+<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
+<section id="howtoget">
+<embed href="text/shared/00/00000401.xhp#gruppen"/>
</section>
- <embed href="text/shared/autopi/01120100.xhp#seite1"/>
- <embed href="text/shared/autopi/01120200.xhp#seite2"/>
- <embed href="text/shared/autopi/01120300.xhp#seite3"/>
- <embed href="text/shared/autopi/01120400.xhp#seite4"/>
- <embed href="text/shared/autopi/01120500.xhp#seite5"/>
- <bookmark branch="hid/HID_GROUPWIZARD_CANCEL" xml-lang="en-US" id="bm_id3149183"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
- <bookmark branch="hid/HID_GROUPWIZARD_PREVIOUS" xml-lang="en-US" id="bm_id3154318"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
- <bookmark branch="hid/HID_GROUPWIZARD_NEXT" xml-lang="en-US" id="bm_id3149095"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
- <bookmark branch="hid/HID_GROUPWIZARD_FINISH" xml-lang="en-US" id="bm_id3155941"/><bookmark branch="hid/HID_GRIDWIZARD_FINISH" xml-lang="en-US" id="bm_id3155391"/><bookmark branch="hid/HID_LISTWIZARD_FINISH" xml-lang="en-US" id="bm_id3153748"/><paragraph role="heading" level="2" id="hd_id3145071" l10n="U" xml-lang="en-US" oldref="5">Create</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149811" xml-lang="en-US" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH" visibility="visible">Creates the object.</ahelp></paragraph>
- </body>
+<embed href="text/shared/autopi/01120100.xhp#seite1"/>
+<embed href="text/shared/autopi/01120200.xhp#seite2"/>
+<embed href="text/shared/autopi/01120300.xhp#seite3"/>
+<embed href="text/shared/autopi/01120400.xhp#seite4"/>
+<embed href="text/shared/autopi/01120500.xhp#seite5"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_FINISH" id="bm_id3155941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GRIDWIZARD_FINISH" id="bm_id3155391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_FINISH" id="bm_id3153748" localize="false"/>
+<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH">Creates the object.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index dd7992190a..12227de0d4 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,18 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01130000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Document Converter</title>
<filename>/text/shared/autopi/01130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T15:38:11">converted from old format - fpe
-checked - yj</lastedited>
-</history>
</meta>
<body><comment>mw deleted all index entries because of guide import_ms.xhp</comment>
<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
@@ -53,7 +48,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="ms"><ahelp hid=".">Copies and converts documents into the OpenDocument XML format used by $[officename].</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
</section>
<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from the binary format from previous $[officename] versions (StarOffice 5.2 and before), as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4">The Document Converter Wizard contains the following pages:</paragraph>
@@ -61,9 +56,8 @@ checked - yj</lastedited>
<embed href="text/shared/autopi/01130200.xhp#seite2"/>
<paragraph role="heading" id="hd_id3154318" xml-lang="en-US" level="2" l10n="U" oldref="7">Document Converter Summary</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="8">Displays a summary which shows what will be converted when you click <emph>Convert</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
<embed href="text/shared/autopi/01010000.xhp#weiter"/>
<embed href="text/shared/00/00000001.xhp#import"/>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 9bf65d6d43..17276999bd 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01170000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Address Data Source</title>
<filename>/text/shared/autopi/01170000.xhp</filename>
</topic>
@@ -46,45 +44,59 @@
<section id="adressdatenquelle">
<bookmark xml-lang="en-US" branch="hid/extensions:TabPage:RID_PAGE_SELECTABTYPE" id="bm_id2237617" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10934" id="bm_id3581347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/><paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/>
+<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".">This wizard registers an existing address book as a data source in $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#addressimport1"/>
+<embed href="text/shared/00/00000401.xhp#addressimport1"/>
</section>
<paragraph role="paragraph" id="par_id3151226" xml-lang="en-US" l10n="CHG" oldref="4">You can register address data and other data sources in $[officename] at any time:</paragraph>
<embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="9">Please select the type of your external address book</paragraph>
<paragraph role="paragraph" id="par_id5782036" xml-lang="en-US" l10n="NEW">Not all types are available on all systems.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/>
+<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option if you already use an address book in Mozilla or Netscape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD" id="bm_id611896" localize="false"/><paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD" id="bm_id611896" localize="false"/>
+<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Thunderbird.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" id="bm_id3147654" localize="false"/><paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="12">LDAP address data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" id="bm_id3147654" localize="false"/>
+<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="12">LDAP address data</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP">Select this option if you already have address data on an LDAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/><paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/>
+<paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK">Select this option if you already use an address book in Microsoft Outlook (not Outlook Express).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/><paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/>
+<paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS">Select this option if you already use an address book in Microsoft Outlook Express.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/><paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/>
+<paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
<paragraph role="paragraph" id="par_id585650" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in KDE Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/><paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/>
+<paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
<paragraph role="paragraph" id="par_id6873683" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in OS X Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/><paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/>
+<paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
<paragraph role="paragraph" id="par_id4368724" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/><paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/>
+<paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
<paragraph role="paragraph" id="par_id6269112" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution LDAP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/><paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/>
+<paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
<paragraph role="paragraph" id="par_id5294045" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Groupwise.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" localize="false"/><paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" localize="false"/>
+<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
<paragraph role="paragraph" id="par_id3156192" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER">Select this option if you want to register another data source as address book in $[officename].</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/><paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/>
+<paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_ABSPILOT_CANCEL">Exits the wizard without implementing any changes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_ABSPILOT_PREVIOUS" visibility="hidden">Go to previous step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/><embed href="text/shared/autopi/01010000.xhp#weiter"/>
+<embed href="text/shared/autopi/01010000.xhp#weiter"/>
<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_ABSPILOT_NEXT" visibility="hidden">Go to next step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/>
+<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_ABSPILOT_FINISH">Establishes the connection to the data source and closes the dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index 383d0e376c..c0c61ff588 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index c9e138d2e3..579af0f79b 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: startup.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopistartupxhp" indexer="include" status="PUBLISH">
+<topic id="textsharedautopistartupxhp" indexer="include">
<title id="tit" xml-lang="en-US">Start-up Wizard</title>
<filename>/text/shared/autopi/startup.xhp</filename>
</topic>
@@ -47,17 +45,21 @@
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">The Start-up Wizard opens when you start %PRODUCTNAME for the first time.</paragraph>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The wizard consists of the following pages:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_WELCOME" id="bm_id8871120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/>
+<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Start-up Wizard helps you to specify the user settings for %PRODUCTNAME. This wizard only runs once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/>
+<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Read and accept the license text to continue. You need to scroll to the end of the license text before you can continue. If you decline the license, the installation is canceled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/><paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/>
+<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can use this page to import user data from a previously installed version of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059F" xml-lang="en-US" level="3" l10n="NEW">Copy personal data</paragraph>
<paragraph role="paragraph" id="par_idN105A3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Copies the user name and other data from a previous %PRODUCTNAME installation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/><paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/>
+<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/><embed href="text/shared/01/08060100.xhp#registrierung"/>
+<embed href="text/shared/01/08060100.xhp#registrierung"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/webwizard00.xhp b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
index 4033473bfa..92c2ab8f74 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard00.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: webwizard00.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopiwebwizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopiwebwizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Web Wizard</title>
<filename>/text/shared/autopi/webwizard00.xhp</filename>
</topic>
-<history>
-<created date="2004-07-13T13:06:46">UFI: Web Wizard main page</created>
-<lastedited date="2006-02-24T11:06:34">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="webwizard">
@@ -52,7 +48,7 @@
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid="34200">The Web Wizard helps you to maintain a web site on an Internet server.</ahelp>The Web Wizard converts files in a local folder to a web format and uploads the files to the server. The wizard also uses one of the supplied templates to create an index page that contains hyperlinks to the uploaded files.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#webwizard"/>
+<embed href="text/shared/00/00000401.xhp#webwizard"/>
</section>
<paragraph role="note" id="par_idN105C4" xml-lang="en-US" l10n="NEW">The Web Wizard uses the File Transfer Protocol (FTP) to upload files to a server. You cannot use the wizard to upload the files if you connect to the internet through a proxy server.</paragraph>
<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW">The wizard involves the following steps:</paragraph>
@@ -63,8 +59,8 @@
<embed href="text/shared/autopi/webwizard05.xhp#design"/>
<embed href="text/shared/autopi/webwizard06.xhp#websiteinfo"/>
<embed href="text/shared/autopi/webwizard07.xhp#preview"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_CANCEL" id="bm_id7899105" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_PREV" id="bm_id1207617" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/><comment>UFI: removed some form help ids</comment>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index acde4d61f1..6f8bedd9dd 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02010100.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id8307138" xml-lang="en-US" l10n="NEW">The Query Design window layout is stored with a created query, but cannot be stored with a created view.</paragraph>
<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="3">The Design View</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="CHG" oldref="4">To create a query, click the <emph>Queries</emph> icon in a database document, then click <emph>Create Query in Design View</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150255" xml-lang="en-US" l10n="U" oldref="5">The lower pane of the Design View is where you <link href="text/shared/explorer/database/02010100.xhp" name="define">define</link> the query. To define a query, specify the database <link href="text/shared/explorer/database/02010100.xhp" name="field names">field names</link> to include and the <link href="text/shared/explorer/database/02010100.xhp" name="criteria">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press Ctrl+arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3150255" xml-lang="en-US" l10n="U" oldref="5">The lower pane of the Design View is where you <link href="text/shared/explorer/database/02010100.xhp" name="define">define</link> the query. To define a query, specify the database <link href="text/shared/explorer/database/02010100.xhp" name="field names">field names</link> to include and the <link href="text/shared/explorer/database/02010100.xhp" name="criteria">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="CHG" oldref="6">In the top of the query Design View window, the <link href="text/shared/main0214.xhp" name="icons">icons</link> of the <emph>Query Design</emph> Bar and the <emph>Design</emph> bar are displayed.</paragraph>
<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="CHG" oldref="287">If you want to test a query, double-click the query name in the database document. The query result is displayed in a table similar to the Data Source View. Note: the table displayed is only temporary.</paragraph>
<paragraph role="heading" id="hd_id8226264" xml-lang="en-US" level="3" l10n="NEW">Keys in Query Design View</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index a7a72d892d..e648dca7a2 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* 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="textsharedexplorerdatabase05020000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabase05020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Relations</title>
<filename>/text/shared/explorer/database/05020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-28T10:37:28">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="relationen">
@@ -53,7 +50,7 @@
</section>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="HID_CTL_RELATIONTAB">Here you can link together tables from the current database through common data fields.</ahelp> Click the <emph>New Relation</emph> icon to create the relationships, or simply drag-and-drop with the mouse.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#relationen"/>
+<embed href="text/shared/00/00000450.xhp#relationen"/>
</section>
<paragraph role="note" id="par_id3145316" xml-lang="en-US" l10n="U" oldref="3">This function is only available if you are working with a relational database.</paragraph>
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click the <emph>Add Tables</emph> icon. The <link href="text/shared/02/14020100.xhp" name="Add Tables">Add Tables</link> dialog opens in which you can select the tables that you want.</paragraph>
@@ -68,9 +65,6 @@
<paragraph role="heading" id="hd_id3148922" xml-lang="en-US" level="2" l10n="U" oldref="6">Primary key and other key</paragraph>
<paragraph role="paragraph" id="par_id3149168" xml-lang="en-US" l10n="U" oldref="7">If you want to define a relation among the different tables, you should enter a <link href="text/shared/00/00000005.xhp#primaerschluessel" name="primary key">primary key</link> that clearly identifies a data field of the existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as an external key.</paragraph>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="8">All data fields referring to a primary key will be identified in the table window by a small key symbol.</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="9">For example, consider the "Item" table, where each individual record can be defined by an item number. The "Item-Number" field is a unique key in this table, and is referred to as a "primary key".</paragraph>
-<paragraph role="paragraph" id="par_id3158410" xml-lang="en-US" l10n="U" oldref="10">There is an additional table with the name "Orders" in the database. The number of the ordered item is assigned to each record in this table through an "Item-Number" field. This field is also a key field. It contains a key used to access the records of another table, in this case the "Item" table. For this reason, this field is referred to as the "foreign key".</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="11">A relation is used to relate the primary key of the "Article" sheet and the other key of the "Orders" sheet.</paragraph>
<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="2" l10n="U" oldref="12">Define relations</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155430"><bookmark_value>relations; creating and deleting (Base)</bookmark_value>
</bookmark><comment>mw added "(Base)"</comment>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 67ea120137..069f855c6b 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 11030000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,31 +32,35 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabase11030000xml" indexer="exclude" status="PUBLISH">
+<topic id="textsharedexplorerdatabase11030000xml" indexer="exclude">
<title id="tit" xml-lang="en-US">dBASE</title>
<filename>/text/shared/explorer/database/11030000.xhp</filename>
</topic>
</meta>
<body>
-<section id="dbase"><comment>ufi: removed remaining two index entries</comment><comment>mw added "(Base)" to all 4 entries and transferred 2 entries to shared/explorer/database/dabawiz02dbase.xhp</comment><paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11030000.xhp" name="dBase">dBASE</link><comment>still two Help IDs in this file. Else file can be removed</comment></paragraph>
+<section id="dbase"><comment>ufi: removed remaining two index entries</comment><comment>mw added "(Base)" to all 4 entries and transferred 2 entries to shared/explorer/database/dabawiz02dbase.xhp</comment>
+<paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11030000.xhp" name="dBase">dBASE</link><comment>still two Help IDs in this file. Else file can be removed</comment></paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Specify the settings for a dBASE database.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#dBase"/>
+<embed href="text/shared/00/00000450.xhp#dBase"/>
</section>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="18">To be able to define relations between tables, use JDBC or ODBC from within $[officename].</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/><paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="4">Display inactive records</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/>
+<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="4">Display inactive records</paragraph>
<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DSADMIN_SHOWDELETED">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="15">To view any changes that you make to the database, close the connection to the database, and then reconnect the database.</paragraph>
<paragraph role="paragraph" id="par_id6051820" xml-lang="en-US" l10n="NEW"><comment>UFI: deleted note about case sensitivity. Should be not other than for all other files.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/><embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/>
+<paragraph role="paragraph" id="par_id0904200811094971" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp></paragraph>
+<embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
<embed href="text/shared/explorer/database/11020000.xhp#sql92"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2" l10n="U" oldref="8">Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/>
+<paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2" l10n="U" oldref="8">Indexes</paragraph>
<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_DBASE_INDICIES">Opens the <link href="text/shared/explorer/database/11030100.xhp" name="Indexes"><emph>Indexes</emph></link> dialog, where you can organize the table indexes in the current dBASE database.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 56ecba807b..54d89b3bd9 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabaadvpropdat.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
<title id="tit" xml-lang="en-US">Special Settings</title>
<filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
</topic>
@@ -54,31 +52,44 @@
<paragraph role="paragraph" id="par_id4572283" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/><paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+<paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_id6151921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/><paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
+<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN105A2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/>
+<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Example:</paragraph>
<paragraph role="example" id="par_idN105C1" xml-lang="en-US" l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/><paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/>
+<paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the database driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/><paragraph role="heading" id="par_idN105CB" xml-lang="en-US" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/>
+<paragraph role="heading" id="par_idN105CB" xml-lang="en-US" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a question mark (?).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/><paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/>
+<paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
<paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/><paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/>
+<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/><paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/>
+<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/><paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/>
+<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/><paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/>
+<paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want to use.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/><paragraph role="heading" id="hd_id1101718" xml-lang="en-US" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/>
+<paragraph role="heading" id="hd_id1101718" xml-lang="en-US" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
<paragraph role="paragraph" id="par_id3783989" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id6684163" xml-lang="en-US" l10n="NEW">If this control box is not enabled, then the forms in the current database will not be checked for required fields.</paragraph>
<paragraph role="paragraph" id="par_id3837397" xml-lang="en-US" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
+<paragraph role="heading" id="hd_id0909200811170166" xml-lang="en-US" level="2" l10n="NEW">Ignore currency field information</paragraph>
+<paragraph role="paragraph" id="par_id0909200811170221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index 2c88ea5ba9..402ffb81e8 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz00.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Wizard</title>
<filename>/text/shared/explorer/database/dabawiz00.xhp</filename>
</topic>
@@ -46,35 +44,38 @@
<section id="dabawiz00">
<bookmark xml-lang="en-US" branch="index" id="bm_id2026429"><bookmark_value>wizards;databases (Base)</bookmark_value>
<bookmark_value>Database Wizard (Base)</bookmark_value>
+<bookmark_value>databases; formats (Base)</bookmark_value>
+<bookmark_value>MySQL databases (Base)</bookmark_value>
+<bookmark_value>dBASE; database settings (Base)</bookmark_value>
+<bookmark_value>spreadsheets;as databases (base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment>
+<paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph>
<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US" l10n="NEW">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
</section>
<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW">If you create a new database file, the wizard contains two steps.</paragraph>
</listitem>
</list>
<embed href="text/shared/explorer/database/dabawiz01.xhp#dabaselection"/>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
<switch select="sys">
-<case select="WIN"><paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft Access connection</link></paragraph>
+<case select="WIN">
+<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft Access connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
</case>
</switch>
<paragraph role="paragraph" id="par_idN10610" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02ldap.xhp">Set up LDAP connection</link></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02adabas.xhp">Set up Adabas D connection</link></paragraph>
-</case>
-</switch>
+<paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02adabas.xhp">Set up Adabas D connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
@@ -82,7 +83,7 @@
<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
<embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_PREVIOUS" id="bm_id5176244" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_NEXT" id="bm_id1058076" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 39a181776f..f291ee3af7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz01.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Selection</title>
<filename>/text/shared/explorer/database/dabawiz01.xhp</filename>
</topic>
@@ -45,25 +43,31 @@
<body>
<section id="dabaselection">
<bookmark xml-lang="en-US" branch="index" id="bm_id2082583"><bookmark_value>databases; connecting (Base)</bookmark_value>
-<bookmark_value>databases; formats (Base)</bookmark_value>
-</bookmark><comment>mw copied two entries from shared/explorer/database/11010000.xhp</comment><paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
+</bookmark><comment>mw moved databases;formats (base) to shared/explorer/database/dabawiz00.xhp</comment>
+<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/><paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/>
+<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
<paragraph role="paragraph" id="par_id8584246" xml-lang="en-US" l10n="NEW"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC" id="bm_id8278756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/><paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
+<paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
<paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST" id="bm_id2050538" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/><paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
+<paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
<paragraph role="paragraph" id="par_idN10618" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT" id="bm_id1602832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/><paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
+<paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
<paragraph role="paragraph" id="par_idN10633" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
+<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a database document for an existing database connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
+<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Mozilla database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US" l10n="NEW">The next wizard page is one of the following pages:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
index 0ba4510fbe..6ed78e6944 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02dbase.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,23 +32,22 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include">
<title id="tit" xml-lang="en-US">dBASE Connection </title>
<filename>/text/shared/explorer/database/dabawiz02dbase.xhp</filename>
</topic>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id8295846"><bookmark_value>dBASE; database settings (Base)</bookmark_value>
-<bookmark_value>databases; dBASE (Base)</bookmark_value>
-</bookmark><comment>mw changed dBase to dBASE</comment><paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1" l10n="CHG"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
+<body><comment>** Expression is faulty **</comment>
+<paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1" l10n="CHG"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="CHG">Path to the dBASE files</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/>
+<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="CHG">Path to the dBASE files</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the dBASE *.dbf files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/><paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/>
+<paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Open a path selection dialog.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 3e19246766..6f5e555579 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02mysql.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,22 +32,15 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include">
<title id="tit" xml-lang="en-US">MySQL Connection</title>
<filename>/text/shared/explorer/database/dabawiz02mysql.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T16:18:21">UFI: Database Wizard MySQL page</created>
-<lastedited date="2006-04-28T12:52:09">YJ: checked</lastedited>
-</history>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id6656086"><bookmark_value>MySQL databases (Base)</bookmark_value>
-<bookmark_value>databases;MySQL (Base)</bookmark_value>
-</bookmark><comment>mw copied two entries from shared/explorer/database/11120000.xhp</comment>
+<body><comment>** Expression is faulty **</comment>
<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="mysql"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL Connection</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
index 5448c0b08d..1ec3a89afc 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02spreadsheet.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,21 +32,15 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml" indexer="include">
<title id="tit" xml-lang="en-US">Spreadsheet Database Connection</title>
<filename>/text/shared/explorer/database/dabawiz02spreadsheet.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T16:35:30">UFI: Database Wizard Spreadsheet page</created>
-<lastedited date="2007-01-16T10:56:10">YJ: checked</lastedited>
-</history>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3656727"><bookmark_value>spreadsheets;as databases (base)</bookmark_value>
-</bookmark><comment>mw changed the index entry</comment>
+<body><comment>** Expression is faulty **</comment>
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Spreadsheet Database Connection</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH" id="bm_id5975218" localize="false"/>
<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="2" l10n="NEW">Location and file name</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 99be399975..3492dd4323 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.13.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
index c3a81a4575..0019cd3083 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard00.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,20 +32,17 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard</title>
<filename>/text/shared/explorer/database/querywizard00.xhp</filename>
</topic>
-<history>
-<created date="2004-07-05T16:31:02">UFI: new Query Wizard</created>
-<lastedited date="2006-11-28T09:12:38">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="querywizard"><comment>mw deleted 2 index entries</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD" id="bm_id1895159" localize="false"/>
<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Query Wizard helps you to design a database query.</ahelp> The saved query can be called later, either from the graphical user interface, or using the automatically created SQL language command.</paragraph>
</section>
@@ -57,11 +54,10 @@
<embed href="text/shared/explorer/database/querywizard06.xhp#groupingconditions"/>
<embed href="text/shared/explorer/database/querywizard07.xhp#aliases"/>
<embed href="text/shared/explorer/database/querywizard08.xhp#overview"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BACK" id="bm_id3681447" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_NEXT" id="bm_id4154179" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/><embed href="text/shared/00/00000001.xhp#finish"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CANCEL" id="bm_id7074800" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#finish"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard01.xhp" name="Query Wizard - Field Selection">Query Wizard - Field selection</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
index 9f4172f9ee..ea6dd5a01d 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard01.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard01xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Field Selection</title>
<filename>/text/shared/explorer/database/querywizard01.xhp</filename>
</topic>
-<history>
-<created date="2004-07-05T16:36:14">UFI: new Query Wizard page 1</created>
-<lastedited date="2006-02-14T13:38:03">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="fieldselection">
@@ -52,13 +48,12 @@
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTTABLES" id="bm_id8819849" localize="false"/>
<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table for which the query is to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDS" id="bm_id4751121" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEALL" id="bm_id3862117" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVESELECTED" id="bm_id2427442" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id3135166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id5736259" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTSELFIELDS" id="bm_id5718253" localize="false"/>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in the Query</paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new query.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
index cea5f798d8..cd5d31bb94 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard05.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard05xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard05xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Grouping</title>
<filename>/text/shared/explorer/database/querywizard05.xhp</filename>
</topic>
-<history>
-<created date="2004-07-06T09:50:03">UFI: new Query Wizard page 5</created>
-<lastedited date="2005-03-02T10:07:06">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="grouping">
<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard05.xhp">Query Wizard - Grouping</link></paragraph>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specifies whether to group the query. The data source must support the SQL statement "Order by clauses" to enable this page of the Wizard.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDS" id="bm_id2533341" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" id="bm_id9915768" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERSELFIELDS" id="bm_id1776482" localize="false"/>
<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Group by</paragraph>
<paragraph role="paragraph" id="par_idN1058D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that are to be used to group the query.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
index 619bf0a815..44889a3944 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tablewizard00.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasetablewizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasetablewizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Wizard</title>
<filename>/text/shared/explorer/database/tablewizard00.xhp</filename>
</topic>
@@ -47,17 +45,18 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id6009094"><bookmark_value>wizards;database tables (Base)</bookmark_value>
<bookmark_value>Table Wizard (Base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/><paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Table Wizard helps you to create a database table.</ahelp></paragraph>
</section>
<embed href="text/shared/explorer/database/tablewizard01.xhp#selecttable"/>
<embed href="text/shared/explorer/database/tablewizard02.xhp#settype"/>
<embed href="text/shared/explorer/database/tablewizard03.xhp#setprimary"/>
<embed href="text/shared/explorer/database/tablewizard04.xhp#createtable"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPREV" id="bm_id1064180" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDNEXT" id="bm_id8281197" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/><embed href="text/shared/00/00000001.xhp#finish"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDCANCEL" id="bm_id4245124" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#finish"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/tablewizard01.xhp" name="Table Wizard - Select fields">Table Wizard - Select fields</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
index 909e3ee22f..043f97aefb 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tablewizard01.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasetablewizard01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasetablewizard01xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Wizard - Select Fields</title>
<filename>/text/shared/explorer/database/tablewizard01.xhp</filename>
</topic>
@@ -47,20 +45,23 @@
<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/tablewizard01.xhp">Table Wizard - Select Fields</link></paragraph>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Select fields from the provided sample tables as a starting point to create your own table.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/><paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Business</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/>
+<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Business</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the business category to see only business sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/><paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Private</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/>
+<paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Private</paragraph>
<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the private category to see only private sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/><paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2" l10n="NEW">Sample tables</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/>
+<paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2" l10n="NEW">Sample tables</paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select one of the sample tables. Then select fields from that table from the left list box. Repeat this step until you have selected all the fields that you need.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSAVAILABLE" id="bm_id560014" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEALL" id="bm_id6911221" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVESELECTED" id="bm_id3583483" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/><paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="CHG">Selected Fields</paragraph>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/>
+<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="CHG">Selected Fields</paragraph>
<paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/tablewizard02.xhp" name="Table Wizard - Set types and formats">Table Wizard - Set types and formats</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index ef0998315b..186deae3c7 100755
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: aaa_start.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.2 $
*
* 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="textsharedguideaaa_startxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideaaa_startxml" indexer="include">
<title id="tit" xml-lang="en-US">First Steps</title>
<filename>/text/shared/guide/aaa_start.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-11T14:25:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3156324"><bookmark_value>samples and templates</bookmark_value>
@@ -51,9 +49,10 @@
</variable></paragraph>
<paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="3" l10n="U" oldref="2">How to simplify your work using samples and templates</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="3">
-<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><link href="text/shared/01/01010100.xhp" name="Templates and Documents"><emph>Templates and Documents</emph></link>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
-<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you call up one of the templates, a new document is created based on this template. You can also use the various Wizards (under the <emph>File</emph> menu) to create user-defined templates such as faxes and letters, which you can use as a basis for further documents.</paragraph>
+<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><link href="text/shared/01/01010100.xhp" name="Templates and Documents"><emph>Templates and Documents</emph></link>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
+<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you open one of the templates, a new document is created based on this template.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803563860" xml-lang="en-US" l10n="NEW">Click the <emph>Get more templates online</emph> link in the dialog to select and download more templates.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803563974" xml-lang="en-US" l10n="NEW">You can also use the various wizards (under the <emph>File - Wizards</emph> menu) to create your own templates, which you can use as a basis for further documents.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/guide/main.xhp" name="Working with %PRODUCTNAME">Working with <item type="productname">%PRODUCTNAME</item></link></paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/guide/main.xhp" name="Working with Text Documents">Working with Text Documents</link>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 8b255c9869..8bbd2ce403 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,8 +60,7 @@
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
<list type="unordered">
<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>
+<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>
<listitem>
<paragraph role="listitem" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/autohide.xhp b/helpcontent2/source/text/shared/guide/autohide.xhp
index c02905976d..ba649d369e 100644
--- a/helpcontent2/source/text/shared/guide/autohide.xhp
+++ b/helpcontent2/source/text/shared/guide/autohide.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: autohide.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,7 +64,7 @@
<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="67">Drag the window by its title bar to the side, or</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the Ctrl key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the Ctrl key. Alternatively, press <item type="keycode">Ctrl+Shift+F10</item>.</paragraph>
+<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the Ctrl key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. Alternatively, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</item>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="69">These methods can also be used to undock a currently docked window.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index cd6ef63d76..943d1988b5 100755
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: breaking_lines.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -62,7 +62,7 @@ YJ: checked</lastedited>
<paragraph role="heading" id="par_idN106D9" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the Ctrl+Enter keys. </paragraph>
+<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
<paragraph role="paragraph" id="par_idN106E3" xml-lang="en-US" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index a6bc31daa0..b685a7bf2c 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: copy_drawfunctions.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,15 +56,13 @@
<paragraph role="listitem" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="29">Select the drawing object or objects.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="31">Copy the drawing object to the clipboard, for example, by using <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
+<paragraph role="listitem" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="31">Copy the drawing object to the clipboard, for example, by using <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="32">Switch to the other document and place the cursor where the drawing object is to be inserted.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="33">Insert the drawing object, for example, by using <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
+<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="33">Insert the drawing object, for example, by using <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="34">Inserting into a text document</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index 52c824932b..f8cca36797 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: copytext2application.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,9 +59,7 @@
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="4">You can insert text into other document types, such as spreadsheets and presentations. Note that there is a difference between whether the text is inserted into a text frame, a spreadsheet cell, or into the outline view of a presentation.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="5">If you copy text to the clipboard, you can paste it with or without text attributes. Use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy and <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V to paste.</paragraph>
+<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="5">If you copy text to the clipboard, you can paste it with or without text attributes. Use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V to paste.</paragraph>
</listitem>
</list>
<table id="tbl_id3166460">
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index 1c596e5d16..a539c61509 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ctl.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,10 +64,10 @@
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="1">You can change the text writing direction directly be pressing one of the following keys:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="2">Ctrl+Shift+D or Ctrl+Right Shift Key - switch to right-to-left text entry</paragraph>
+<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="2"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+D or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Right Shift Key - switch to right-to-left text entry</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="3">Ctrl+Shift+A or Ctrl+Left Shift Key - switch to left-to-right text entry</paragraph>
+<paragraph role="listitem" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+A or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Shift Key - switch to left-to-right text entry</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="4">The modifier-only key combinations only work when CTL support is enabled.</paragraph>
@@ -83,8 +83,7 @@
<paragraph role="listitem" id="par_id3154909" xml-lang="en-US" l10n="U" oldref="8">Use the Delete key to delete a whole composite character. Use the Backspace key to delete the last part of the previous composite character.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="9">Use the Right or Left Arrow key to jump to the next or previous whole composite character. To position the cursor into a composite character, use <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow key.</paragraph>
+<paragraph role="listitem" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="9">Use the Right or Left Arrow key to jump to the next or previous whole composite character. To position the cursor into a composite character, use <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow key.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 46de798f29..21fa70e963 100755
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: data_addressbook.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Data source</emph> combo box, select the system address book or the data source you want to use as an address book.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Administrate</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Configure</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="13">In the <emph>Table</emph> combo box, select the database table you want to use as the address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index d5c09a54da..05a10019eb 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: data_search2.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="CHG" oldref="17">Open a form document that contains database fields.</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="18">As an example, open an empty text document and press F4. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+Ctrl, drag a few column headers into the document so that the form fields are created.</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="18">As an example, open an empty text document and press F4. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, drag a few column headers into the document so that the form fields are created.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="CHG" oldref="19">On the <emph>Form Controls</emph> toolbar, click the <emph>Design Mode On/Off</emph> icon
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index 664f8ccfeb..f1369473ab 100755
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,48 +32,41 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedigital_signaturesxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">About Digital Signatures</title>
+<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+<title id="tit" xml-lang="en-US">About Digital Signatures</title>
<filename>/text/shared/guide/digital_signatures.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
<bookmark_value>digital signatures;overview</bookmark_value>
<bookmark_value>security;digital signatures</bookmark_value>
-</bookmark>
- <comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id2767418" role="heading" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
+</bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
+<paragraph role="heading" id="hd_id2767418" xml-lang="en-US" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
- <paragraph xml-lang="en-US" id="hd_id6564531" role="heading" level="2" l10n="NEW">Certificates</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="2" l10n="NEW">Save and sign the document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10674" role="heading" level="2" l10n="NEW">Open a signed document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id9354228" role="heading" level="2" l10n="NEW">Security Warnings</paragraph>
- <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph" l10n="NEW">Example: Think about someone wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
- <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8635517" role="warning" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
-
- </section>
- </body>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+<paragraph role="heading" id="hd_id6564531" xml-lang="en-US" level="2" l10n="NEW">Certificates</paragraph>
+<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+<paragraph role="heading" id="par_idN1066D" xml-lang="en-US" level="2" l10n="NEW">Save and sign the document</paragraph>
+<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+<paragraph role="heading" id="par_idN10674" xml-lang="en-US" level="2" l10n="NEW">Open a signed document</paragraph>
+<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+<paragraph role="heading" id="hd_id9354228" xml-lang="en-US" level="2" l10n="NEW">Security Warnings</paragraph>
+<paragraph role="paragraph" id="par_id2372508" xml-lang="en-US" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+<paragraph role="paragraph" id="par_id7953123" xml-lang="en-US" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
+<paragraph role="paragraph" id="par_id6195257" xml-lang="en-US" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+<paragraph role="warning" id="par_id8635517" xml-lang="en-US" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
+<paragraph role="paragraph" id="par_id6075624" xml-lang="en-US" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+<paragraph role="warning" id="par_id6819971" xml-lang="en-US" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3204443" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+<paragraph role="paragraph" id="par_id486465" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
+<paragraph role="paragraph" id="par_id3448591" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index ce0b59fd4a..745b7ebecf 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: doc_open.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidedoc_openxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidedoc_openxml" indexer="include">
<title id="tit" xml-lang="en-US">Opening Documents</title>
<filename>/text/shared/guide/doc_open.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T13:36:50">FPE: Deleted screenshot. Cleaned slightly.</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147834"><bookmark_value>opening; documents</bookmark_value>
@@ -67,36 +63,43 @@
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="2">Do one of the following:</paragraph>
<paragraph role="listitem" id="par_idN107A9" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - Open</item>
</paragraph>
-<paragraph role="listitem" id="par_idN107AF" xml-lang="en-US" l10n="NEW">Click the <emph>Open</emph> icon</paragraph>
-<paragraph role="listitem" id="par_idN107B2" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Ctrl+O</item>
-</paragraph>
+<paragraph role="listitem" id="par_idN107AF" xml-lang="en-US" l10n="NEW">Click the <emph>Open</emph> icon on the Standard toolbar</paragraph>
+<paragraph role="listitem" id="par_idN107B2" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O </paragraph>
<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="3">The <link href="text/shared/01/01020000.xhp" name="Open">Open</link> dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="4">Select the file you want to open and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="9">You can also enter a URL in the <emph>File name</emph> box of the <emph>Open</emph> dialog. This must start with the fully extended form with file:/// or ftp:// or http://.</paragraph>
-<switch select="sys">
-<case select="WIN">
-<paragraph role="warning" id="par_idN107C4" xml-lang="en-US" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
-</case>
-</switch>
<paragraph role="heading" id="hd_id3149234" xml-lang="en-US" level="3" l10n="CHG" oldref="13">Restrict Files to Display</paragraph>
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
<paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
<paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: the cursor will be at the same position where it has been when the document was saved. This only works when the author has entered his name in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
-<list type="unordered">
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3148453" xml-lang="en-US" level="2" l10n="U" oldref="17">Opening an Empty Document</paragraph>
-<paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="CHG" oldref="19">Click the <emph>New</emph> icon
-<image id="img_id3145172" src="sfx2/res/sn064.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145172" xml-lang="en-US">Icon</alt>
- </image> on the Standard bar or choose <emph>File - New</emph>. This opens a document of the document type specified.</paragraph>
+<paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="CHG" oldref="19">Click the <emph>New</emph> icon on the Standard bar or choose <emph>File - New</emph>. This opens a document of the document type specified.</paragraph>
<paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="20">If you click the arrow next to the <emph>New</emph> icon, a submenu opens in which you can select another document type.</paragraph>
+<paragraph role="heading" id="hd_id0820200803501358" xml-lang="en-US" level="2" l10n="NEW">System File Dialogs or %PRODUCTNAME Dialogs</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
+<paragraph role="heading" id="hd_id0820200803501453" xml-lang="en-US" level="2" l10n="NEW">Opening Files from a Web Server</paragraph>
+<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="9">You can enter a URL in the <emph>File name</emph> box of the <emph>Open</emph> dialogs. The URL must start with file:/// or ftp:// or http://. </paragraph>
+<paragraph role="paragraph" id="par_id0820200803501548" xml-lang="en-US" l10n="NEW">If you use the %PRODUCTNAME dialog, you can use the https:// prefix for a secure connection, and you can save a document on the web server.</paragraph>
+<switch select="sys">
+<case select="WIN">
+<paragraph role="warning" id="par_idN107C4" xml-lang="en-US" l10n="NEW">When you open a file by a URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens a local copy of the file in the system's temp folder.</paragraph>
+</case>
+</switch>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/01020000.xhp" name="File - Open">File - Open</link></paragraph>
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index b341600199..3a4fca1ed1 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: doc_save.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,8 +56,7 @@
</variable></paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="5">Click the <emph>Save</emph> icon or press the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S.</paragraph>
+<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="5">Click the <emph>Save</emph> icon or press the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S.</paragraph>
</listitem>
</list>
<table id="tbl_id3154307">
diff --git a/helpcontent2/source/text/shared/guide/dragdrop.xhp b/helpcontent2/source/text/shared/guide/dragdrop.xhp
index 4ea83850c2..fc6d407bce 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -94,7 +94,7 @@
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="13">If you press Ctrl or Shift+Ctrl while releasing the mouse button, you can control whether the object is copied, moved, or a link is created.</paragraph>
+<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="13">If you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while releasing the mouse button, you can control whether the object is copied, moved, or a link is created.</paragraph>
<table id="tbl_id3150768">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
index 56fea2ca9b..c2a327abc9 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_beamer.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -76,8 +76,7 @@
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="40">You can insert one or more records into the current sheet of a spreadsheet by selecting the rows in the data source view and dragging and dropping them into the spreadsheet. The data is inserted at the place where you release the mouse button.</paragraph>
<paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="42">Inserting controls in a text form</paragraph>
<paragraph role="paragraph" id="par_id3155132" xml-lang="en-US" l10n="U" oldref="43">When you create a text form linked to a database, you can generate controls by drag-and-drop from the data source view.</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="45">When you drag a database column into the text document, you insert a field. If you hold down Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while dragging, a text field is inserted, grouped with an appropriate label field. The text field already contains all the database information that you need for the form.</paragraph>
+<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="45">When you drag a database column into the text document, you insert a field. If you hold down Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while dragging, a text field is inserted, grouped with an appropriate label field. The text field already contains all the database information that you need for the form.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 849067cb4d..9601093494 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_fromgallery.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,10 +60,10 @@
<paragraph role="listitem" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="43">If you move the graphic (drag it without pressing any key, in which case no additional symbol appears next to the mouse pointer), only the attributes are copied from the graphic and applied to the draw object on which you release the mouse button.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="42">If you copy the graphic (drag it while holding down the Ctrl key, in which case a plus sign appears next to the mouse pointer), the graphic will be inserted as an object.</paragraph>
+<paragraph role="listitem" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="42">If you copy the graphic (drag it while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, in which case a plus sign appears next to the mouse pointer), the graphic will be inserted as an object.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="44">If you create a hyperlink (drag while holding down Shift and Ctrl, in which case a linking arrow appears next to the mouse pointer), the drawing object is replaced by the graphic from the Gallery, but the position and size of the replaced draw object are retained.</paragraph>
+<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="44">If you create a hyperlink (drag while holding down Shift and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, in which case a linking arrow appears next to the mouse pointer), the drawing object is replaced by the graphic from the Gallery, but the position and size of the replaced draw object are retained.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index 9fe454fb7d..c4baa16d10 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_gallery.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,8 +65,7 @@
<paragraph xml-lang="en-US" id="par_id3153748" role="listitem" l10n="U" oldref="51">Position the mouse pointer above the graphic, without clicking.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156346" role="listitem" l10n="U" oldref="52">If the mouse pointer changes to a hand symbol, the graphic refers to a hyperlink. In this case, click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key to select it without executing the respective link.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156346" role="listitem" l10n="U" oldref="52">If the mouse pointer changes to a hand symbol, the graphic refers to a hyperlink. In this case, click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key to select it without executing the respective link.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="53">If the mouse pointer does not change to a hand symbol, you can simply click the graphic to select it.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index f5ac2ffeba..0f1f0a7034 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_graphic.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,8 +60,7 @@
<paragraph role="listitem" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="18">Open the document from which you want to copy the graphic.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="19">Click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key, to select it without executing any hyperlinks it may refer to.</paragraph>
+<paragraph role="listitem" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="19">Click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key, to select it without executing any hyperlinks it may refer to.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="20">Keep the mouse button pressed and wait a moment while the object is copied to an internal memory.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/filternavigator.xhp b/helpcontent2/source/text/shared/guide/filternavigator.xhp
index 0c4686c5da..716e6d5cd4 100644
--- a/helpcontent2/source/text/shared/guide/filternavigator.xhp
+++ b/helpcontent2/source/text/shared/guide/filternavigator.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: filternavigator.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -57,8 +57,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_FM_FILTER_IS_NULL" id="bm_id3146316" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_FM_FILTER_IS_NOT_NULL" id="bm_id3149108" localize="false"/>
<paragraph role="paragraph" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="15">The context menu can be called for each entry in the <emph>Filter navigator</emph>. <ahelp hid="SID_FM_FILTER_IS_NOT_NULL">You can edit the filter conditions in this area directly as text. If you wish to check if a field has content or no content, you can select the filter conditions "empty" (SQL:"Is Null") or "not empty" (SQL: "Is not Null").</ahelp> It is also possible to delete the entry by using the context menu.</paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="16">You can move filter conditions in the <emph>Filter navigator</emph> by dragging and dropping, or use the keys Ctrl+Alt+ArrowUp or Ctrl+Alt+ArrowDown. To copy filter conditions, drag them while holding down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</paragraph>
+<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="16">You can move filter conditions in the <emph>Filter navigator</emph> by dragging and dropping, or use the keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Alt+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Alt+Down Arrow. To copy filter conditions, drag them while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</paragraph>
<embed href="text/shared/02/01170102.xhp#filtervorschlag"/>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/data_search.xhp#data_search"/>
diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
index d2f4b87353..2c4c253758 100644
--- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: floating_toolbar.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -93,7 +93,7 @@
<paragraph role="paragraph" id="par_id6154362" xml-lang="en-US" l10n="NEW">To reattach a floating window, drag-and-drop the window's title bar to an edge of the document window. The mouse pointer should be very close to the document window's edge when you release the mouse button.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id1510055" xml-lang="en-US" l10n="NEW">Depending on your system's window manager settings, you may also double-click an empty place on the toolbar or window, while holding down the Ctrl key. Or double-click the title bar of the floating toolbar or window.</paragraph>
+<paragraph role="paragraph" id="par_id1510055" xml-lang="en-US" l10n="NEW">Depending on your system's window manager settings, you may also double-click an empty place on the toolbar or window, while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. Or double-click the title bar of the floating toolbar or window.</paragraph>
</listitem>
</list>
<section id="docking_win">
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index 87e42e67bf..b23cc2f0b9 100755
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gallery_insert.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -86,7 +86,7 @@
<paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="11">Select an object by a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154140" role="listitem" l10n="U" oldref="12">Drag the object into the document while pressing the Shift and Ctrl keys, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Link</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154140" role="listitem" l10n="U" oldref="12">Drag the object into the document while pressing the Shift and <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>keys, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Link</emph>.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3156282" role="heading" level="2" l10n="U" oldref="13">Inserting an object as a background graphic</paragraph>
@@ -116,7 +116,7 @@
<paragraph xml-lang="en-US" id="par_id3148617" role="listitem" l10n="U" oldref="21">Select an object by a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147443" role="listitem" l10n="U" oldref="22">Drag the object on to the other object in the document while pressing Ctrl.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147443" role="listitem" l10n="U" oldref="22">Drag the object on to the other object in the document while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index bb298dfb27..ec560220f6 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: hyperlink_edit.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@
<bookmark_value>URL;changing hyperlink URLs</bookmark_value>
</bookmark><comment>MW deleted "changing;"</comment><paragraph role="heading" id="hd_id3153910" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="hyperlink_edit"><link href="text/shared/guide/hyperlink_edit.xhp" name="Editing Hyperlinks">Editing Hyperlinks</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id4124881" xml-lang="en-US" l10n="NEW">When you Ctrl-click a hyperlink in a Writer document, your web browser opens with the requested web address. If you don't use a mouse, position the cursor inside the hyperlink and open the context menu by Shift+F10, then choose Open Hyperlink.</paragraph>
+<paragraph role="paragraph" id="par_id4124881" xml-lang="en-US" l10n="NEW">When you <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click a hyperlink in a Writer document, your web browser opens with the requested web address. If you don't use a mouse, position the cursor inside the hyperlink and open the context menu by Shift+F10, then choose Open Hyperlink.</paragraph>
<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="26">Change the text of a hyperlink as follows</paragraph>
<list type="unordered">
<listitem>
@@ -92,8 +92,7 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="34">Edit a hyperlink button</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="13">If the hyperlink is a button, click on the border to select it, or press the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key while clicking. Open the <emph>Properties</emph> dialog through the context menu. You can edit the label text under "Caption," and modify the address in the "URL" field.</paragraph>
+<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="13">If the hyperlink is a button, click on the border to select it, or press the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key while clicking. Open the <emph>Properties</emph> dialog through the context menu. You can edit the label text under "Caption," and modify the address in the "URL" field.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/hyperlink_rel_abs.xhp#hyperlink_rel_abs"/>
</body>
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index b21e457cf6..c0f06f2f30 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_bitmap.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideinsert_bitmapxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideinsert_bitmapxml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting, Editing, Saving Bitmaps</title>
<filename>/text/shared/guide/insert_bitmap.xhp</filename>
</topic>
@@ -65,7 +63,8 @@
<bookmark_value>mosaic filter</bookmark_value>
<bookmark_value>pictures;filters</bookmark_value>
<bookmark_value>filters;pictures</bookmark_value>
-</bookmark><comment>mw made "illustrations,..." a see-reference</comment><paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps</link>
+</bookmark><comment>mw made "illustrations,..." a see-reference</comment>
+<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2" l10n="U" oldref="2">Inserting Bitmaps</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="3">A bitmap image can be inserted in $[officename] Writer, $[officename] Calc, $[officename] Draw and $[officename] Impress documents.</paragraph>
@@ -80,7 +79,8 @@
<paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
<paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
<paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
+<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
@@ -104,7 +104,8 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3153574" xml-lang="en-US" level="2" l10n="U" oldref="16">Saving Bitmaps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="17">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image. This is only possible in $[officename] Draw and $[officename] Impress.</paragraph>
+<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="17">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image.</paragraph>
+<paragraph role="paragraph" id="par_id0801200803544667" xml-lang="en-US" l10n="NEW">To export a bitmap in Draw or Impress:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155414" xml-lang="en-US" l10n="U" oldref="18">Select the bitmap image. You can also select additional objects, such as text, to be exported with the image by pressing the shift key while selecting or by opening a selection frame around all objects.</paragraph>
@@ -124,6 +125,8 @@
<paragraph role="listitem" id="par_id3149417" xml-lang="en-US" l10n="CHG" oldref="23">Enter a name for the file and click <emph>Export</emph>.</paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/FN_SAVE_GRAPHIC" id="bm_id0801200803523126" localize="false"/>
+<paragraph role="paragraph" id="par_id0801200803525078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To export a bitmap in Writer: Right-click the bitmap, choose Save Graphics. You see the Graphics Export dialog. Enter a file name and select a file type.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/imagemap.xhp#imagemap"/>
@@ -147,5 +150,6 @@
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
</case>
-</switch></body>
+</switch>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index ff67c37c40..1a69bdf849 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,22 +32,19 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Editing Graphic Objects </title>
+<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+<title id="tit" xml-lang="en-US">Editing Graphic Objects </title>
<filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>resizing, see also scaling/zooming</bookmark_value>
<bookmark_value>scaling, see also zooming</bookmark_value>
<bookmark_value>drawings, see also draw objects</bookmark_value>
+<bookmark_value>graphic objects, see also draw objects</bookmark_value>
<bookmark_value>text; drawing pictures</bookmark_value>
<bookmark_value>inserting; drawings</bookmark_value>
<bookmark_value>pictures; drawing</bookmark_value>
@@ -64,103 +60,69 @@
<bookmark_value>pasting;draw objects</bookmark_value>
<bookmark_value>editing;draw objects</bookmark_value>
<bookmark_value>pictures;scaling/resizing</bookmark_value>
-</bookmark>
- <comment>MW deleted "adding;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
+</bookmark><comment>MW added "graphic objects, see also..."</comment>
+<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
+<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
+<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
+<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon.
</caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item>
-</caseinline><defaultinline> <item type="keycode">Alt</item></defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
</caseinline></switchinline></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" l10n="CHG">Holding down the <item type="keycode">Shift</item> key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with <item type="keycode">Shift</item> held down, the aspect ratio of the object is retained.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object, first select the object, then press <item type="keycode">Ctrl+Tab</item> repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <item type="keycode">Alt</item> key while pressing an arrow key. Press <item type="keycode">Esc</item> to leave the point edit mode.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="U" oldref="6">To move draw objects, first select them. To select more than one object, press the <item type="keycode">Shift</item> key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location. If you hold down <item type="keycode">Shift</item> while dragging, the objects can only be positioned in places compatible with the page margins and the other objects on the page.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <item type="keycode">Alt</item> key while pressing an arrow key.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3151054" role="listitem" l10n="CHG" oldref="7">To copy a draw object, keep holding down <switchinline select="sys"><caseinline select="MAC">the <item type="keycode">Command</item> key
-</caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline>, click the draw object and wait a second, then with the key still pressed, drag the draw object.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
-
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id9448225" xml-lang="en-US" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id224616" xml-lang="en-US" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id7199316" xml-lang="en-US" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
</case>
-
</switch>
-
- </section>
- </body>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index f6c4df415e..eed0aeebac 100755
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_specialchar.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,7 @@
<paragraph role="listitem" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="6">In the large selection field click the desired character or several characters in succession. The characters are displayed at the bottom of the dialog. When you close the dialog with <emph>OK</emph>, all displayed characters in the selected font are inserted in the current document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find&amp;Replace</emph> dialog) you can press Shift+Ctrl+S to call the <emph>Special Characters</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find &amp; Replace</emph> dialog) you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index 8b156c175d..df46aff9da 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,25 +69,25 @@
<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="34">document</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press Ctrl+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
+<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+Ctrl+Tab to switch through objects in the opposite direction.</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press Ctrl+F6 to switch to the document.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph>
+<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
<paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="21">Calling a menu command</paragraph>
-<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press Alt or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
+<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="17">Executing an icon command</paragraph>
<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
-<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press Ctrl+Enter.</paragraph>
+<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing Ctrl+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
+<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press Ctrl+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use Ctrl+F6 to set the focus into the document.</paragraph>
+<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
@@ -116,22 +116,22 @@
<paragraph role="listitem" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44">Ctrl+Spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
+<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="45">Shift+Spacebar: selection of the current column</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73">Alt+Up Arrow or Alt+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
+<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press Ctrl+Tab. To move to the previous control, press Shift+Ctrl+Tab.</paragraph>
+<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press Alt+Spacebar.</paragraph>
+<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
<paragraph role="listitem" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
</listitem>
<listitem>
@@ -150,7 +150,7 @@
<paragraph role="listitem" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press Ctrl+Shift+F10.</paragraph>
+<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3154479" xml-lang="en-US" level="3" l10n="U" oldref="148">Selecting objects</paragraph>
@@ -164,10 +164,10 @@
<paragraph role="listitem" id="par_id3145619" xml-lang="en-US" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the Alt and arrow keys to move the selected object by one pixel.</paragraph>
+<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use Ctrl+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use Ctrl+Tab to select the next handle. Use (Esc) to exit the handle edit mode.</paragraph>
+<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
@@ -180,10 +180,10 @@
<paragraph role="listitem" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="63">Select the object.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with Ctrl+Tab.</paragraph>
+<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press Ctrl+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+Ctrl+A to activate the anchor directly.
+<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
</caseinline></switchinline></paragraph>
</listitem>
<listitem>
@@ -212,7 +212,7 @@
<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+Ctrl+F6: shows the dividing lines at default positions and focus a line.</paragraph>
+<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
@@ -239,13 +239,13 @@
<paragraph role="paragraph" id="par_id3159109" xml-lang="en-US" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
<paragraph role="paragraph" id="par_id3153229" xml-lang="en-US" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
<paragraph role="paragraph" id="par_id3150312" xml-lang="en-US" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117">Ctrl+Shift+E: switches between data source explorer and table.</paragraph>
+<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="118">Shortcuts in the Query Design Window</paragraph>
<paragraph role="paragraph" id="par_id3152455" xml-lang="en-US" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
-<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120">Alt+Up arrow or Alt+Down arrow: moves the border between table view and selection area up or down.</paragraph>
+<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
<paragraph role="heading" id="hd_id3156288" xml-lang="en-US" level="3" l10n="U" oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
-<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122">Ctrl+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123">Ctrl+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
+<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
<paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
<paragraph role="paragraph" id="par_id3154529" xml-lang="en-US" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
@@ -253,7 +253,7 @@
<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
<paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="U" oldref="129">Shift+Space key: selects the column in the selection area, so you can open its context menu.</paragraph>
<paragraph role="paragraph" id="par_id3156198" xml-lang="en-US" l10n="U" oldref="130">Space key: selects the row. Cancels previous selection.</paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146">Ctrl+Arrow left or right: moves the selected column to the left or to the right.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
<paragraph role="heading" id="hd_id3146152" xml-lang="en-US" level="3" l10n="U" oldref="131">Keys in the Table Design Window</paragraph>
<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
</section>
@@ -261,13 +261,13 @@
<paragraph role="heading" id="hd_id3145075" xml-lang="en-US" level="2" l10n="U" oldref="74">Controlling the ImageMap Editor</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press Ctrl+Enter, an object of the selected type is created in default size.</paragraph>
+<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the icon <emph>Select</emph> is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
+<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
@@ -391,7 +391,7 @@
<paragraph role="listitem" id="par_id3153073" xml-lang="en-US" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144">Alt+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
+<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 1e6d88fc80..3bfdd7593b 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.14 $
+# $Revision: 1.14.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -162,6 +162,7 @@ XHPFILES = \
spadmin.xhp \
standard_template.xhp \
start_parameters.xhp \
+ startcenter.xhp \
tabs.xhp \
text_color.xhp \
textmode_change.xhp \
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 9b38268b43..0c4b9f7ee5 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: microsoft_terms.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -75,6 +73,14 @@
</tablerow>
<tablerow>
<tablecell>
+<paragraph role="tablecontent" id="par_id1029200801240915" xml-lang="en-US" l10n="NEW">Click and Type</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1029200801240965" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/text_direct_cursor.xhp">Direct Cursor</link></paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index 34e02a5dad..f80cce2b39 100755
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_doctypes.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* 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="textsharedguidems_doctypesxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Changing the Association of Microsoft Office Document Types</title>
<filename>/text/shared/guide/ms_doctypes.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T15:56:14">FPE: Deleted screenshot.
-checked - yj</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3143267"><bookmark_value>Microsoft Office;reassigning document types</bookmark_value>
@@ -54,17 +51,14 @@ checked - yj</lastedited>
<section id="ms_extensions">
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="2">Exit $[officename] and the $[officename] Quickstarter.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="3">Run the $[officename] Setup program:</paragraph>
-<paragraph role="listitem" id="par_idN10665" xml-lang="en-US" l10n="NEW">Click the Windows <emph>Start</emph> button, choose <emph>Control Panel</emph>, click <emph>Add or Remove Programs</emph>, select the %PRODUCTNAME %PRODUCTVERSION entry, click <emph>Change</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314147" xml-lang="en-US" l10n="NEW">In Windows Explorer, right-click a file of the type that you want to assign to another application.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">In the $[officename] Setup, check the <emph>Modify</emph> option and click <emph>Next</emph> until you see the file types page.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314268" xml-lang="en-US" l10n="NEW">In the context menu, choose "Open with..."</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="6">Select or deselect the file types. Click <emph>OK</emph> and complete the $[officename] Setup program.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314245" xml-lang="en-US" l10n="NEW">In the list of applications, select the program that should open the current type of files. Make sure that "Always use this program" is selected.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314243" xml-lang="en-US" l10n="NEW">If these steps do not apply to your brand of Microsoft Windows, search your Microsoft Windows Help for instructions how to change the file associations.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index 0285b16794..f230251017 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,171 +32,173 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
-</bookmark>
- <comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
- <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="E" oldref="32" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
+</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
+<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155934" role="paragraph" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147088" role="listitem" l10n="U" oldref="7">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3150774" role="listitem" l10n="U" oldref="8">Revision marks</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147209" role="listitem" l10n="U" oldref="9">OLE objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154749" role="listitem" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="11">Indexes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155342" role="listitem" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153541" role="listitem" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154143" role="listitem" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156117" role="listitem" l10n="U" oldref="15">Animated characters/text</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3150986" role="heading" level="2" l10n="U" oldref="16">Microsoft Excel</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="17">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="18">OLE objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148943" role="listitem" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="20">Pivot tables</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152361" role="listitem" l10n="U" oldref="21">New chart types</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156343" role="listitem" l10n="U" oldref="22">Conditional formatting</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="23">Some functions/formulas</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="U" oldref="24">Microsoft PowerPoint</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154365" role="listitem" l10n="U" oldref="25">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156424" role="listitem" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="27">Master background graphics</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3159151" role="listitem" l10n="U" oldref="28">Grouped objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156282" role="listitem" l10n="U" oldref="29">Certain multimedia effects</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3150439" role="note" l10n="U" oldref="30">For a detailed overview of the converting documents to and from Microsoft Office format, see the $[officename] Migration Guide.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10A9F" role="heading" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
- <paragraph xml-lang="en-US" id="par_id8699606" role="paragraph" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
- <table id="tbl_id4497512">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AB6" role="tablehead" l10n="NEW">Microsoft Office format</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10ABC" role="tablehead" l10n="NEW">Supported encryption method</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AC3" role="tablecontent" l10n="NEW">Word 6.0, Word 95</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AC9" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AD0" role="tablecontent" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AD6" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10ADD" role="tablecontent" l10n="NEW">Word XP, Word 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AE3" role="tablecontent" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AEA" role="tablecontent" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AF0" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AF7" role="tablecontent" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10B04" role="tablecontent" l10n="NEW">Excel XP, Excel 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10B0A" role="tablecontent" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Other encryption methods are not supported.</paragraph>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
- <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
- <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-
- </section>
- </body>
+<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
+<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Revision marks</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="9">OLE objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="11">Indexes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="15">Animated characters/text</paragraph>
+</listitem>
+</list>
+<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="24">Microsoft PowerPoint</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="25">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="27">Master background graphics</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="28">Grouped objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="29">Certain multimedia effects</paragraph>
+</listitem>
+</list>
+<paragraph role="heading" id="hd_id3150986" xml-lang="en-US" level="2" l10n="U" oldref="16">Microsoft Excel</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="17">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="18">OLE objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="20">Pivot tables</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="21">New chart types</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="22">Conditional formatting</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="23">Some functions/formulas (see below)</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0811200801491971" xml-lang="en-US" l10n="NEW">One example of differences between Calc and Excel is the handling of boolean values. Enter TRUE to cells A1 and A2. </paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0811200801491973" xml-lang="en-US" l10n="NEW">In Calc, the formula =A1+A2 returns the value 2, and the formula =SUM(A1;A2) returns 2. </paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+<paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
+<paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
+<table id="tbl_id4497512">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Microsoft Office format</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_idN10ABC" xml-lang="en-US" l10n="NEW">Supported encryption method</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AC3" xml-lang="en-US" l10n="NEW">Word 6.0, Word 95</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AC9" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AD0" xml-lang="en-US" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AD6" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10ADD" xml-lang="en-US" l10n="NEW">Word XP, Word 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AE3" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AEA" xml-lang="en-US" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AF0" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AFD" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10B04" xml-lang="en-US" l10n="NEW">Excel XP, Excel 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10B0A" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 264c3fa09e..5525bec140 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_user.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidems_userxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidems_userxml" indexer="include">
<title id="tit" xml-lang="en-US">Using Microsoft Office and $[officename]</title>
<filename>/text/shared/guide/ms_user.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T13:21:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>Office;Microsoft Office and $[officename]</bookmark_value>
@@ -53,43 +49,43 @@
</bookmark>
<paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="ms_user"><link href="text/shared/guide/ms_user.xhp" name="Using Microsoft Office and $[officename]">Using Microsoft Office and $[officename]</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="1">$[officename] can open and save documents in the Microsoft Office file formats.</paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="1">$[officename] can open and save documents in the Microsoft Office file formats. Microsoft Office Open XML formats can be read, but not saved.</paragraph>
<paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="2">Opening a Microsoft Office File</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Open</emph>. Select a Microsoft Office file in the $[officename] file open dialog.</paragraph>
</listitem>
</list>
<table id="tbl_id3147653">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="4">MS Office file...</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="5">...will open in $[officename] module</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="6">MS Word, *.doc</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="6">MS Word, *.doc, *.docx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="7">$[officename] Writer</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154898" xml-lang="en-US" l10n="U" oldref="8">MS Excel, *.xls</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154898" xml-lang="en-US" l10n="U" oldref="8">MS Excel, *.xls, *.xlsx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="9">$[officename] Calc</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US" l10n="U" oldref="10">MS PowerPoint, *.ppt, *.pps</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US" l10n="U" oldref="10">MS PowerPoint, *.ppt, *.pps, *.pptx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="11">$[officename] Impress</paragraph>
</tablecell>
</tablerow>
@@ -122,18 +118,19 @@
</switch>
<paragraph role="heading" id="hd_id3153092" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Converting Many Microsoft Office Files into OpenDocument Format</paragraph>
<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="CHG" oldref="21">The <emph>Document Converter Wizard</emph> will copy and convert all Microsoft Office files in a folder into $[officename] documents in the OpenDocument file format. You can specify the folder to be read, and the folder where the converted files are to be saved.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="22">Choose <link href="text/shared/autopi/01130000.xhp" name="File - AutoPilot - Document Converter"><emph>File - Wizards - Document Converter</emph></link> to start the wizard.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
+<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 1ac488d61d..0ee5980242 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidepaintbrushxml" indexer="include">
<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
<filename>/text/shared/guide/paintbrush.xhp</filename>
</topic>
@@ -51,7 +49,7 @@
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection or object and apply the formatting to another text selection or object.</paragraph>
+<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
@@ -62,96 +60,99 @@
<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
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id209967" xml-lang="en-US">Icon</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>
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down Ctrl when you click. To exclude character formatting, hold down Ctrl+Shift when you click.</paragraph>
+<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
<table id="tbl_id599688">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<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>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
</tablecell>
</tablerow>
</table>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 54527827b7..310e844612 100755
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: redlining_accept.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideredlining_acceptxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideredlining_acceptxml" indexer="include">
<title id="tit" xml-lang="en-US">Accepting or Rejecting Changes</title>
<filename>/text/shared/guide/redlining_accept.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:51:09">FPE: Deleted screenshot</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150247"><bookmark_value>changes; accepting or rejecting</bookmark_value>
@@ -50,7 +46,12 @@
</bookmark>
<paragraph role="heading" id="hd_id3150247" xml-lang="en-US" level="1" l10n="U" oldref="23"><variable id="redlining_accept"><link href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting Changes">Accepting or Rejecting Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id1491134" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+<paragraph role="paragraph" id="par_id1491134" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="note" id="par_id1110200810120034" xml-lang="en-US" l10n="NEW">In Writer text documents you can also accept or reject changes by choosing commands from the context menu.</paragraph>
+</case>
+</switch>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="24">When you edit a document in which others have made changes, you can accept or reject the changes individually or all together.</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 0fab138853..0b02734ac4 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: scripting.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidescriptingxml" indexer="include">
<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
<filename>/text/shared/guide/scripting.xhp</filename>
</topic>
@@ -52,11 +50,12 @@
<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
<bookmark_value>menus;assigning macros</bookmark_value>
<bookmark_value>events;assigning scripts</bookmark_value>
-</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment><paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment>
+<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
</listitem>
@@ -67,7 +66,7 @@
<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
</listitem>
@@ -156,7 +155,7 @@
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Object - Macro</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index b0f0b26339..796a9db11b 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: space_hyphen.xhp,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textsharedguidespace_hyphenxml" indexer="include">
+<topic id="textsharedguidespace_hyphenxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Inserting Protected Spaces, Hyphens and Conditional Separators</title>
<filename>/text/shared/guide/space_hyphen.xhp</filename>
</topic>
@@ -57,8 +57,8 @@
<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>
</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, press the <switchinline select="sys"><caseinline select="MAC">Command key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you type a space between the words.</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
+</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> and the Shift key when you type a space between the words.</paragraph>
<paragraph role="note" id="par_id5749687" xml-lang="en-US" l10n="NEW">In Calc, you cannot insert non-breaking spaces.</paragraph>
<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>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
new file mode 100644
index 0000000000..cf4cc16071
--- /dev/null
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: startcenter.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsharedguidestartcenterxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Start Center</title>
+<filename/>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0820200802500562"><bookmark_value>backing window</bookmark_value>
+<bookmark_value>start center</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/HID_BACKINGWINDOW" id="bm_id0820200802550234" localize="false"/>
+<paragraph role="heading" id="hd_id0820200802524447" xml-lang="en-US" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id0820200803204063" xml-lang="en-US" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
+<paragraph role="paragraph" id="par_id0820200802524413" xml-lang="en-US" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0820200803104810" xml-lang="en-US" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104978" xml-lang="en-US" l10n="NEW">
+<emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104998" xml-lang="en-US" l10n="NEW">
+<emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104927" xml-lang="en-US" l10n="NEW">
+<emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104948" xml-lang="en-US" l10n="NEW">
+<emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803105089" xml-lang="en-US" l10n="NEW">
+<emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803105015" xml-lang="en-US" l10n="NEW">
+<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0820200803105045" xml-lang="en-US" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id082020080310500" xml-lang="en-US" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803105158" xml-lang="en-US" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 47e631efc1..8f5dba7586 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 569976ea7f..da5ba92584 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 01010200.xhp,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.20.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textsharedoptionen01010200xml" indexer="include">
+<topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">General</title>
<filename>/text/shared/optionen/01010200.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/optionen/01010301.xhp b/helpcontent2/source/text/shared/optionen/01010301.xhp
index d2a8f40a4f..fbd4b27e3f 100755
--- a/helpcontent2/source/text/shared/optionen/01010301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010301.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,23 +32,19 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010301xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010301xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit Paths</title>
<filename>/text/shared/optionen/01010301.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-07-11T09:45:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Edit Paths</paragraph><comment>changed, see OOoPaths spec doc</comment>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Edit Paths </emph>dialog, you can select some folders that are available in $[officename].</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#pfade"/>
+<embed href="text/shared/00/00000406.xhp#pfade"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATH" id="bm_id3154938" localize="false"/>
<paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Paths</paragraph>
@@ -56,6 +52,6 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH" id="bm_id3150768" localize="false"/>
<paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="5">Add</paragraph>
<paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH">Opens the <emph>Select Path</emph> dialog to select another folder or the <emph>Open</emph> dialog to select another file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index 9e4e6fdbad..e7070bb50d 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010400.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01010400xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010400xml" indexer="include">
<title id="tit" xml-lang="en-US">Writing Aids</title>
<filename>/text/shared/optionen/01010400.xhp</filename>
</topic>
@@ -54,61 +52,77 @@
<bookmark_value>ignore list for spellcheck</bookmark_value>
<bookmark_value>spellcheck; ignore list</bookmark_value>
<bookmark_value>hyphenation; minimal number of characters</bookmark_value>
-<bookmark_value>old German spellcheck</bookmark_value>
-<bookmark_value>new German spellcheck</bookmark_value>
-<bookmark_value>German spellcheck</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing Aids</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><comment>removed "german" references, i78879</comment>
+<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing Aids</link></paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_LINGU">Specifies the properties of the spellcheck, thesaurus and hyphenation.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#writingaids"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/><paragraph role="heading" id="hd_id3149096" xml-lang="en-US" level="2" l10n="U" oldref="33">Available Language Modules</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/>
+<paragraph role="heading" id="hd_id3149096" xml-lang="en-US" level="2" l10n="U" oldref="33">Available Language Modules</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_CLB_LINGU_MODULES">Contains the installed language modules.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="35">A language module can contain one, two or three submodules: Spellcheck, hyphenation and thesaurus. Each sub-module can be available in one or more languages. If you click in front of the name of the module, you activate all the available sub-modules simultaneously. If you remove a set mark, you deactivate all the available sub-modules simultaneously. If you wish to activate or deactivate individual sub-modules, click the<emph> Edit button </emph>to open the <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog.</paragraph>
<paragraph role="note" id="par_id3294778" xml-lang="en-US" l10n="NEW">The configuration allows for two different directories: one folder where the user has write permissions, and one without write permissions. The user can only edit and delete the user dictionaries that are located in the writable path. Other dictionaries can be read only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="36">Edit</paragraph>
-<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog appears.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/>
+<paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="36">Edit</paragraph>
+<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit </emph>
+<emph>Modules</emph></link> dialog appears.</paragraph>
<section id="benutzerwb">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/><paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/>
+<paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_CLB_EDIT_MODULES_DICS">Lists the available user dictionaries.</ahelp> Mark the user dictionaries that you want to use for spellcheck and hyphenation.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_NEW" id="bm_id3149670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/>
+<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
<paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC">Opens the <emph>New Dictionary</emph> dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="65">New Dictionary</paragraph>
<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="66">In the <emph>Dictionary</emph> section you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="67">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="67">Name</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME">Specifies the name of the new custom dictionary.</ahelp> The file extension "*.DIC" is automatically appended.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="69">Language</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/>
+<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="69">Language</paragraph>
<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG">By selecting a certain language you can limit the use of the custom dictionary.</ahelp> By selecting <emph>All</emph> the custom dictionary is used independently of the current language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/>
+<paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT">Specifies whether you wish to avoid certain words in your documents.</ahelp> In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_EDIT" id="bm_id3147213" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/>
+<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC">Opens the <emph>Edit custom dictionary</emph> dialog, in which you can add to your custom dictionary or edit existing entries.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="75">In the <emph>Edit custom dictionary </emph>dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion.</paragraph>
<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="76">When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons <emph>New</emph> and <emph>Delete</emph> are then deactivated. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/><paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="77">Book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/>
+<paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="77">Book</paragraph>
<paragraph role="paragraph" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS">Specifies the book to be edited.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="79"><variable id="ignore">The <emph>IgnoreAllList (All) </emph>includes all words that have been marked with <emph>Ignore</emph> during spellcheck. This list is valid only for the current spellcheck.
</variable></paragraph>
<paragraph role="note" id="par_id3154757" xml-lang="en-US" l10n="U" oldref="80">The <emph>IgnoreAllList</emph> entry cannot be selected and cannot be deleted. Only the words included as content can be deleted. This happens automatically each time that $[officename] is closed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="81">Language</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/>
+<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="81">Language</paragraph>
<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG">Assigns a new language to the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/><paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="3" l10n="U" oldref="83">Word</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/>
+<paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="3" l10n="U" oldref="83">Word</paragraph>
<paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD">You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary.</ahelp> If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=", the word is never automatically hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in the word being hyphenated, or a hyphenation suggested, where you insert the = sign.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/><paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="3" l10n="U" oldref="85">Suggestion</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/>
+<paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="3" l10n="U" oldref="85">Suggestion</paragraph>
<paragraph role="paragraph" id="par_id3147323" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE">This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the "Word" text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/>
+<paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
<paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE">Adds the word in the <emph>Word </emph>text field to your current custom dictionary. The word in the <emph>Suggestion </emph>field is also added when working with exception dictionaries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/><paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/><paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/>
+<paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/>
+<paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
</section>
<section id="optionen">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/><paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
+<paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
<paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_CLB_LINGU_OPTIONS">Defines the options for the spellcheck and hyphenation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/><paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="3" l10n="U" oldref="41">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/>
+<paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="3" l10n="U" oldref="41">Edit</paragraph>
<paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT">If you want to change a value, select the entry and then click <emph>Edit</emph>.</ahelp> You will see a dialog for entering a new value.</paragraph>
<paragraph role="heading" id="hd_id3150983" xml-lang="en-US" level="3" l10n="U" oldref="43">Check uppercase words</paragraph>
<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="CHG" oldref="44">Specifies that capitalization is checked during spellcheck.</paragraph>
@@ -118,21 +132,18 @@
<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="CHG" oldref="48">Checks for the correct use of capitals at the start of words during spellcheck.</paragraph>
<paragraph role="heading" id="hd_id3166424" xml-lang="en-US" level="3" l10n="U" oldref="49">Check special regions</paragraph>
<paragraph role="paragraph" id="par_id3150345" xml-lang="en-US" l10n="CHG" oldref="50">Specifies that special regions, such as drawing text, are checked during spellcheck.<comment>UFI: doesn't work in versions up to OOo 2.4</comment></paragraph>
-<paragraph role="heading" id="hd_id3155510" xml-lang="en-US" level="3" l10n="U" oldref="51">Check in all languages</paragraph>
-<paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="CHG" oldref="52">Checks spelling against all installed language dictionaries. The "Language" font attribute is therefore not taken into account.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOSPELL_CHECK" id="bm_id5188694" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id3166435" localize="false"/><paragraph role="heading" id="hd_id3166429" xml-lang="en-US" level="3" l10n="U" oldref="21">Check spelling as you type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id3166435" localize="false"/>
+<paragraph role="heading" id="hd_id3166429" xml-lang="en-US" level="3" l10n="U" oldref="21">Check spelling as you type</paragraph>
<paragraph role="paragraph" id="par_id3155531" xml-lang="en-US" l10n="U" oldref="6"><variable id="automatisch"><ahelp hid=".uno:SpellOnline">Automatically checks spelling as you type, and underlines errors.</ahelp>
</variable></paragraph>
<section id="automatischweiter">
-<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment><paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
+<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment>
+<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
</section>
-<paragraph role="heading" id="hd_id3153912" xml-lang="en-US" level="3" l10n="U" oldref="7">Do not mark errors</paragraph>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US" l10n="CHG" oldref="8">Specifies that spelling errors will not be indicated with a red underline. This mode allows you to check the spelling "in the background" while typing or loading a text, but without the time-consuming red underlining. If you unmark the <emph>Do not mark errors</emph> box later, you will immediately see the red underlining.</paragraph>
-<paragraph role="heading" id="hd_id3149332" xml-lang="en-US" level="3" l10n="U" oldref="26">German spelling - old</paragraph>
-<paragraph role="paragraph" id="par_id3156017" xml-lang="en-US" l10n="CHG" oldref="29">Specifies that old German spelling rules are applied. If you don't check this box, $[officename] follows the new spelling rules for spellcheck and hyphenation.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_LNG_ED_NUM_PREBREAK_ED_PREBREAK" id="bm_id3148607" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/>
+<paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
<paragraph role="paragraph" id="par_id3150316" xml-lang="en-US" l10n="U" oldref="54">Specifies the minimum number of characters required for automatic hyphenation to be applied. <ahelp hid="HID_LNGDLG_NUM_PREBREAK" visibility="hidden"> Type the minimum number of characters that must come before or after the hyphen.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148823" xml-lang="en-US" level="3" l10n="U" oldref="11">Characters before line break</paragraph>
<paragraph role="paragraph" id="par_id3156029" xml-lang="en-US" l10n="CHG" oldref="12">Sets the minimum number of characters of the word to be hyphenated that must remain at the end of the line.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010500.xhp b/helpcontent2/source/text/shared/optionen/01010500.xhp
index 7f1dcb59ff..2370140d9a 100644
--- a/helpcontent2/source/text/shared/optionen/01010500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010500.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010500.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010500xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010500xml" indexer="include">
<title id="tit" xml-lang="en-US">Colors</title>
<filename>/text/shared/optionen/01010500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T15:39:01">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="farben">
@@ -53,7 +49,7 @@
<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_COLOR">Allows you to select a color from a color table, edit an existing color, or define new colors.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#color"/>
+<embed href="text/shared/00/00000406.xhp#color"/>
</section>
<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="3">Color table</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_COLOR:EDT_NAME" id="bm_id3156215" localize="false"/>
@@ -96,7 +92,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2" l10n="U" oldref="31"><link href="text/shared/optionen/01010501.xhp" name="Edit">Edit</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="33">Load Color List</paragraph>
<paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD">Accesses the <emph>Open</emph> dialog, which allows you to select a color palette</ahelp>.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index f0b924b8d9..725d62e527 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 01010800.xhp,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.22.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -50,8 +50,6 @@
<bookmark_value>settings; views</bookmark_value>
<bookmark_value>scaling; font sizes in user interface</bookmark_value>
<bookmark_value>font sizes; scaling on screen</bookmark_value>
-<bookmark_value>menus; inactive menu items</bookmark_value>
-<bookmark_value>commands; not visible</bookmark_value>
<bookmark_value>WYSIWYG in fonts lists</bookmark_value>
<bookmark_value>previews; fonts lists</bookmark_value>
<bookmark_value>font lists</bookmark_value>
diff --git a/helpcontent2/source/text/shared/optionen/01040600.xhp b/helpcontent2/source/text/shared/optionen/01040600.xhp
index 35b51b1716..b868a8ac6d 100644
--- a/helpcontent2/source/text/shared/optionen/01040600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040600.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01040600.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -85,8 +85,8 @@
<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SPACE">Specifies whether to represent every space in the text with a dot.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE" id="bm_id3148616" localize="false"/>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="35">Non-breaking spaces</paragraph>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Spacebar
-</caseinline><defaultinline>Ctrl+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Shift+Spacebar
+</caseinline><defaultinline>Ctrl+Shift+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB" id="bm_id3152578" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="37">Tabs</paragraph>
<paragraph role="paragraph" id="par_id3153574" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB">Specifies that tab stops are displayed as small arrows.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index e4890f0539..e4bd7d8df6 100755
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01041000.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01041000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01041000xml" indexer="include">
<title id="tit" xml-lang="en-US">Compatibility</title>
<filename>/text/shared/optionen/01041000.xhp</filename>
</topic>
@@ -54,57 +52,63 @@
<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
</bookmark>
<section id="compatibility">
-<bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#compatibility"/>
+<embed href="text/shared/00/00000406.xhp#compatibility"/>
</section>
<paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
<section id="printermetrics">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment>
+<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
<paragraph role="note" id="par_id3155768" xml-lang="en-US" l10n="U" oldref="49">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/><paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/>
+<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="U" oldref="18">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/><paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/>
+<paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document.</ahelp> The same applies for a page break.</paragraph>
<paragraph role="note" id="par_id3145789" xml-lang="en-US" l10n="U" oldref="20">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/><paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/>
+<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
<paragraph role="paragraph" id="par_id3152777" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break.</ahelp> If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph>
-<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by %PRODUCTNAME %PRODUCTVERSION, the new tab stop handling is used by default. In documents created by %PRODUCTNAME prior to version %PRODUCTVERSION, the previously used tab stop handling is applied.</paragraph>
+<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph>
<paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="3" l10n="NEW">Do not add leading (extra space) between lines of text<comment>UFI: spec external_leading</comment></paragraph>
<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">Specifies that additional leading (extra space) between lines of text is not added, even if the font in use contains the additional leading attribute.</paragraph>
-<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US" l10n="NEW">In text documents created by %PRODUCTNAME %PRODUCTVERSION, the additional leading is used by default. In documents created by %PRODUCTNAME prior to version %PRODUCTVERSION, the additional leading is not used.</paragraph>
+<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the additional leading is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the additional leading is not used.</paragraph>
<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 line spacing<comment>UFI: spec spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of text lines with proportional line spacing"</comment></paragraph>
<paragraph role="paragraph" id="par_idN10815" xml-lang="en-US" l10n="NEW">If the option is off, a new process for formatting text lines with proportional line spacing will be applied. If the option is on, the previous method of formatting of text lines with proportional line spacing will be applied.</paragraph>
-<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME %PRODUCTVERSION and Microsoft Word documents of recent versions, the new process is used. In %PRODUCTNAME prior to version %PRODUCTVERSION, the previous process is used.</paragraph>
+<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer and in Microsoft Word documents of recent versions, the new process is used. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the previous process is used.</paragraph>
<paragraph role="heading" id="par_idN1081B" xml-lang="en-US" level="3" l10n="NEW">Add paragraph and table spacing at bottom of table cells<comment>UFI: spec spec-formatting-table-cells</comment></paragraph>
<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">Specifies that the bottom spacing is added to a paragraph, even when it is the last paragraph in a table cell.</paragraph>
-<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US" l10n="NEW">If the option is off, table cells will be formatted as in %PRODUCTNAME prior to version %PRODUCTVERSION. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with %PRODUCTNAME %PRODUCTVERSION and for documents imported from Microsoft Word format.</paragraph>
+<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US" l10n="NEW">If the option is off, table cells will be formatted as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with %PRODUCTNAME %PRODUCTVERSION and for documents imported from Microsoft Word format.</paragraph>
<paragraph role="heading" id="par_idN1084C" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 object positioning<comment>UFI: spec spec-adjust-object-positioning</comment></paragraph>
<paragraph role="paragraph" id="par_idN10864" xml-lang="en-US" l10n="NEW">Specifies how to calculate the position of floating objects anchored to a character or paragraph with respect to the top and bottom paragraph spacing.</paragraph>
-<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US" l10n="NEW">If the option is on, the floating objects are positioned as in %PRODUCTNAME versions prior to %PRODUCTVERSION. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
+<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US" l10n="NEW">If the option is on, the floating objects are positioned as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
<paragraph role="paragraph" id="par_idN1086A" xml-lang="en-US" l10n="NEW">The option will be set to off for new documents. For Writer documents created by a version prior to %PRODUCTNAME %PRODUCTVERSION the option is on.</paragraph>
<paragraph role="heading" id="par_idN10821" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 text wrapping around objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></paragraph>
<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US" l10n="NEW">MS Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in MS Word.</paragraph>
-<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US" l10n="NEW">In MS Word and in %PRODUCTNAME %PRODUCTVERSION, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
-<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME prior to %PRODUCTVERSION, the opposite was true.</paragraph>
-<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, <emph>the former text wrapping will be applied.</emph>
-</paragraph>
+<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US" l10n="NEW">In MS Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
+<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US" l10n="NEW">In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true.</paragraph>
+<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, the former text wrapping will be applied. </paragraph>
<paragraph role="heading" id="par_idN1092A" xml-lang="en-US" level="3" l10n="NEW">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In %PRODUCTNAME prior to version %PRODUCTVERSION, an iterative process was used, while in %PRODUCTNAME %PRODUCTVERSION a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
-<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the %PRODUCTNAME iterative process of object positioning is used. If the option is on, the straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
+<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, an iterative process was used, while in current versions a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
+<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the old %PRODUCTNAME iterative process of object positioning is used. If the option is on, the new straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
<paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
<paragraph role="paragraph" id="par_id8599810" xml-lang="en-US" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>
<paragraph role="paragraph" id="par_id8012634" xml-lang="en-US" l10n="NEW">This setting is on by default for .odt text documents. It will be saved and loaded with the document in the .odt text document format. This setting cannot be saved in old .sxw text documents, so this setting is off for .sxw text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/><paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/>
+<paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
<paragraph role="paragraph" id="par_idN10848" xml-lang="en-US" l10n="NEW"><ahelp hid="879350288">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10977" xml-lang="en-US" l10n="NEW">The factory defaults are set as follows. Enabled are the following options, while all other options are disabled:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN1097D" xml-lang="en-US" l10n="NEW">Add spacing between paragraphs and tables (in current document)</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 7f8719f4bc..66fec37911 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01060100.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01060100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01060100xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/shared/optionen/01060100.xhp</filename>
</topic>
@@ -73,68 +71,95 @@
<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
<bookmark_value>outlines;outline symbols</bookmark_value>
</bookmark><comment>mw deleted "formulas;..." and copied "displaying; formulas..." to Calc guide formula_value.xhp and changed "sheets;.." into "sheet tabs;..."</comment><comment>MW made "outline..." a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/><paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
+<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3153988" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
+<embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
</section>
<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="2" l10n="U" oldref="28">Visual aids</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/>
+<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/><paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
+<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph>Tools - Options - %PRODUCTNAME</emph>
<emph>- Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/><paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
+<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/>
+<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/>
+<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/><paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
+<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="2" l10n="U" oldref="3">Display</paragraph>
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/>
+<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/>
+<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/><paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
+<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a note exists. The note will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/><paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
+<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit notes with the <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link> command. Notes that are permanently displayed can be edited by clicking the note box. Click the Navigator and under the <emph>Notes</emph> entry you can view all notes in the current document. By double clicking a note in Navigator, the cursor will jump to the corresponding cell containing the note.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/><paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
+<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the<emph> Value highlighting </emph>box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/><paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
+<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/><paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/>
+<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/><paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/>
+<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155444" xml-lang="en-US" level="2" l10n="U" oldref="16">Objects</paragraph>
<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/><paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/>
+<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
<paragraph role="paragraph" id="par_id3163549" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/>
+<paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/><paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/>
+<paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id0909200810585828" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM" id="bm_id0909200810584462" localize="false"/>
+<paragraph role="heading" id="hd_id0909200810585881" xml-lang="en-US" level="3" l10n="NEW">Synchronize sheets</paragraph>
+<paragraph role="paragraph" id="par_id0909200810585870" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="42">Window</paragraph>
<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/><paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/>
+<paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/><paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/>
+<paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3155578" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/><paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/>
+<paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/><paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/>
+<paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
</caseinline><defaultinline>Navigator</defaultinline></switchinline>. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/>
+<paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
<paragraph role="paragraph" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
</caseinline><defaultinline>outline</defaultinline></switchinline>, the <emph>Outline symbols</emph> option specifies whether to view the outline symbols at the border of the sheet.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01060400.xhp b/helpcontent2/source/text/shared/optionen/01060400.xhp
index 7aaa9aebef..e0f5cd87f6 100755
--- a/helpcontent2/source/text/shared/optionen/01060400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01060400.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01060400xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01060400xml" indexer="include">
<title id="tit" xml-lang="en-US">Sort Lists</title>
<filename>/text/shared/optionen/01060400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-14T14:36:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="sortierlisten">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SCPAGE_USERLISTS">All user-defined lists are displayed in the<emph> Sort Lists </emph>dialog. You can also define and edit your own lists. Only text can be used as sort lists, no numbers.</ahelp><comment>UFI: fix to #111848#</comment></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#exopso"/>
+<embed href="text/shared/00/00000406.xhp#exopso"/>
</section>
<switch select="appl">
<case select="CALC"><embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
@@ -77,6 +75,6 @@
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="2" l10n="U" oldref="11">Add/Modify</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD">Adds a new list into the <emph>Lists</emph> box.</ahelp> If you would like to edit this list in the <emph>Entries</emph> box, this button will change from <emph>Add</emph> to <emph>Modify</emph>, which enables you to include the newly modified list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 549a99d98e..35ca157bf2 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01070500.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01070500xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01070500xml" indexer="include">
<title id="tit" xml-lang="en-US">General</title>
<filename>/text/shared/optionen/01070500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-24T09:52:00">converted from old format - fpe
-dedr: fixed #i30842#</lastedited>
-</history>
</meta>
<body>
<section id="sonstiges">
@@ -59,7 +54,7 @@ dedr: fixed #i30842#</lastedited>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_MISC">Defines the general options for drawing or presentation documents.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
+<embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
</section>
<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
@@ -119,7 +114,7 @@ dedr: fixed #i30842#</lastedited>
<paragraph role="paragraph" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SD_COMBOBOX_TP_OPTIONS_MISC_CB_SCALE">Determines the drawing scale on the rulers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155177" xml-lang="en-US" level="2" l10n="U" oldref="36">Compatibility (document specific settings)</paragraph>
<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="44">The settings in this area are valid for the current document only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
+<embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST" id="bm_id3153788" localize="false"/>
<paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="38">Add spacing between paragraphs in the current document</paragraph>
<paragraph role="paragraph" id="par_id3145768" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST">Specifies that $[officename] Impress calculates the paragraph spacing exactly like Microsoft PowerPoint.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index dbc1401f6e..69f8c5eaa0 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130100.xhp,v $
- *
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textsharedoptionen01130100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01130100xml" indexer="include">
<title id="tit" xml-lang="en-US">VBA Properties</title>
<filename>/text/shared/optionen/01130100.xhp</filename>
</topic>
@@ -54,7 +52,7 @@
</bookmark>
<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="1" l10n="U" oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA code.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsofi"/>
@@ -80,7 +78,7 @@
<embed href="text/shared/optionen/01130100.xhp#codetext"/>
<bookmark xml-lang="en-US" branch="hid/809174020" id="bm_id0523200811460569" localize="false"/>
<paragraph role="heading" id="hd_id0523200811475727" xml-lang="en-US" level="3" l10n="NEW">Executable code</paragraph>
-<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/809174021" id="bm_id0523200811454459" localize="false"/>
<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="3" l10n="U" oldref="12">Save original Basic code</paragraph>
<embed href="text/shared/optionen/01130100.xhp#origtext"/>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
index fe4ba65da4..79dcf0c06b 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: macrosecurity_sl.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,22 +30,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionenmacrosecurity_slxhp" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionenmacrosecurity_slxhp" indexer="include">
<title id="tit" xml-lang="en-US">Security Level</title>
<filename>/text/shared/optionen/macrosecurity_sl.xhp</filename>
</topic>
-<history>
-<created date="2004-08-25T16:37:39">UFI: Macro Security first tab page</created>
-<lastedited date="2005-12-05T13:11:51">YJ: checked</lastedited>
-</history>
</meta>
<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1203039"><bookmark_value>security;security levels for macros</bookmark_value>
+<bookmark_value>macros;security levels</bookmark_value>
+<bookmark_value>levels;macro security</bookmark_value>
+</bookmark><comment>MW added 3 index entries</comment>
<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_sl"><link href="text/shared/optionen/macrosecurity_sl.xhp">Security Level</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Select the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> level from one of four options. The options differ according to the security level. Macros that are allowed to run on a higher security level are also allowed to run in all lower levels.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 2033cc6268..88d6249ab3 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.13.4.4 $
#
# This file is part of OpenOffice.org.
#