summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-11-11 09:28:39 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-11-11 09:28:39 +0100
commit742d8654e4e2c66da1c7274bab39dbcd7d0ede1a (patch)
tree66f270e0d86e3246d1aa34ec6f306ffa62be5be2
parent917b93ce25b18f06fc4e3c41f1b66b5dc497260c (diff)
parent113485813efba721e8e624e785bff201d266c271 (diff)
CWS-TOOLING: integrate CWS hcshared28
-rwxr-xr-xhelpcontent2/source/auxiliary/swriter.tree3
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/00000003.xhp248
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/01010210.xhp5
-rw-r--r--helpcontent2/source/text/sbasic/shared/01020300.xhp5
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03050500.xhp6
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03080301.xhp40
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03080302.xhp45
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03090201.xhp28
-rw-r--r--helpcontent2/source/text/sbasic/shared/03132400.xhp8
-rw-r--r--helpcontent2/source/text/scalc/01/02160000.xhp38
-rw-r--r--helpcontent2/source/text/scalc/01/03080000.xhp39
-rw-r--r--helpcontent2/source/text/scalc/01/04050000.xhp16
-rw-r--r--helpcontent2/source/text/scalc/01/05070000.xhp7
-rw-r--r--helpcontent2/source/text/scalc/01/12090100.xhp2
-rw-r--r--helpcontent2/source/text/scalc/02/06040000.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/borders.xhp10
-rw-r--r--helpcontent2/source/text/scalc/guide/calculate.xhp99
-rw-r--r--helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp10
-rw-r--r--helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp86
-rw-r--r--helpcontent2/source/text/scalc/guide/finding.xhp10
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/multioperation.xhp6
-rw-r--r--helpcontent2/source/text/scalc/guide/multitables.xhp22
-rw-r--r--helpcontent2/source/text/scalc/guide/rename_table.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/row_height.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/text_rotate.xhp10
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/value_with_name.xhp9
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000200.xhp123
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000202.xhp60
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000203.xhp62
-rw-r--r--helpcontent2/source/text/shared/00/00000204.xhp108
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000205.xhp64
-rw-r--r--helpcontent2/source/text/shared/00/00000208.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000212.xhp60
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000213.xhp84
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000214.xhp62
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp14
-rw-r--r--helpcontent2/source/text/shared/00/00040501.xhp24
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/01/01100600.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/02180000.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp20
-rw-r--r--helpcontent2/source/text/shared/01/06140500.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/digitalsignatures.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp10
-rw-r--r--helpcontent2/source/text/shared/02/10100000.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/02/colortoolbar.xhp6
-rw-r--r--helpcontent2/source/text/shared/autopi/01130000.xhp2
-rw-r--r--helpcontent2/source/text/shared/autopi/01170000.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170300.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp16
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp12
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp1
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_barformat.xhp18
-rwxr-xr-xhelpcontent2/source/text/shared/guide/copytable2application.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01030000.xhp8
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01090100.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160201.xhp9
-rw-r--r--helpcontent2/source/text/simpress/02/10020000.xhp11
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/individual.xhp7
-rwxr-xr-xhelpcontent2/source/text/simpress/main0200.xhp7
-rw-r--r--helpcontent2/source/text/smath/00/00000004.xhp26
-rw-r--r--helpcontent2/source/text/smath/01/02080000.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/02090000.xhp15
-rw-r--r--helpcontent2/source/text/smath/01/02100000.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/02110000.xhp20
-rw-r--r--helpcontent2/source/text/smath/01/03040000.xhp6
-rw-r--r--helpcontent2/source/text/smath/01/03050000.xhp6
-rw-r--r--helpcontent2/source/text/smath/01/03060000.xhp14
-rw-r--r--helpcontent2/source/text/smath/01/03070000.xhp22
-rw-r--r--helpcontent2/source/text/smath/01/03080000.xhp16
-rw-r--r--helpcontent2/source/text/smath/01/03090000.xhp15
-rw-r--r--helpcontent2/source/text/smath/01/03090100.xhp14
-rw-r--r--helpcontent2/source/text/smath/01/03090200.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/03090300.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/03090400.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/03090500.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/03090600.xhp12
-rw-r--r--helpcontent2/source/text/smath/01/03090700.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03090800.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/03091100.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091500.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091501.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091502.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091503.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091504.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091505.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091506.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091507.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091508.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/03091509.xhp17
-rw-r--r--helpcontent2/source/text/smath/01/05010000.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/05020000.xhp2
-rw-r--r--helpcontent2/source/text/smath/01/05030000.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/05040000.xhp12
-rw-r--r--helpcontent2/source/text/smath/01/05050000.xhp4
-rw-r--r--helpcontent2/source/text/smath/01/06010000.xhp8
-rw-r--r--helpcontent2/source/text/smath/01/06020000.xhp12
-rw-r--r--helpcontent2/source/text/smath/02/03010000.xhp10
-rwxr-xr-xhelpcontent2/source/text/smath/04/01020000.xhp6
-rwxr-xr-xhelpcontent2/source/text/smath/guide/keyboard.xhp10
-rw-r--r--helpcontent2/source/text/smath/guide/limits.xhp12
-rwxr-xr-xhelpcontent2/source/text/smath/main0103.xhp6
-rw-r--r--helpcontent2/source/text/smath/main0503.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/04070000.xhp12
-rw-r--r--helpcontent2/source/text/swriter/02/10020000.xhp7
-rwxr-xr-xhelpcontent2/source/text/swriter/04/01020000.xhp178
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/borders.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/finding.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp37
-rw-r--r--helpcontent2/source/text/swriter/guide/header_with_line.xhp17
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/indices_delete.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/indices_enter.xhp20
-rw-r--r--helpcontent2/source/text/swriter/guide/load_styles.xhp19
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/main.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/makefile.mk1
-rw-r--r--helpcontent2/source/text/swriter/guide/number_sequence.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/numbering_paras.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/pagebackground.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/pagestyles.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/section_edit.xhp20
-rw-r--r--helpcontent2/source/text/swriter/guide/select_language.xhp61
-rw-r--r--helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/subscript.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/table_insert.xhp17
-rwxr-xr-xhelpcontent2/source/text/swriter/main0204.xhp43
-rwxr-xr-xhelpcontent2/source/text/swriter/main0206.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/main0215.xhp8
-rw-r--r--helpcontent2/util/sbasic/makefile.mk8
-rw-r--r--helpcontent2/util/scalc/makefile.mk8
-rw-r--r--helpcontent2/util/schart/makefile.mk8
-rw-r--r--helpcontent2/util/sdatabase/makefile.mk8
-rw-r--r--helpcontent2/util/sdraw/makefile.mk8
-rw-r--r--helpcontent2/util/simpress/makefile.mk8
-rw-r--r--helpcontent2/util/smath/makefile.mk8
-rw-r--r--helpcontent2/util/swriter/makefile.mk9
143 files changed, 1306 insertions, 1515 deletions
diff --git a/helpcontent2/source/auxiliary/swriter.tree b/helpcontent2/source/auxiliary/swriter.tree
index 901258414d..b0435240f0 100755
--- a/helpcontent2/source/auxiliary/swriter.tree
+++ b/helpcontent2/source/auxiliary/swriter.tree
@@ -45,7 +45,7 @@
</node>
</node>
- <node id="0203" title="Creating Text Documents">
+ <node id="0203" title="Creating Text Documents">
<topic id="swriter/text/swriter/guide/text_nav_keyb.xhp">Navigating and Selecting With the Keyboard</topic>
<topic id="swriter/text/swriter/guide/text_direct_cursor.xhp">Using the Direct Cursor</topic>
</node>
@@ -119,6 +119,7 @@
<topic id="swriter/text/swriter/guide/template_create.xhp">Creating a Document Template</topic>
<topic id="swriter/text/swriter/guide/template_default.xhp">Changing the Default Template</topic>
</node>
+<topic id="swriter/text/swriter/guide/pageorientation.xhp">Landscape or Portrait Pages</topic>
<topic id="swriter/text/swriter/guide/text_capital.xhp">Changing the Case of Text</topic>
<topic id="swriter/text/swriter/guide/hidden_text.xhp">Hiding Text</topic>
<topic id="swriter/text/swriter/guide/header_pagestyles.xhp">Defining Different Headers and Footers</topic>
diff --git a/helpcontent2/source/text/sbasic/shared/00000003.xhp b/helpcontent2/source/text/sbasic/shared/00000003.xhp
index 32716ba271..26aea0e0ce 100755
--- a/helpcontent2/source/text/sbasic/shared/00000003.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000003.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared00000003xml" indexer="exclude" status="PUBLISH">
@@ -194,137 +194,251 @@
</section>
<section id="errorcode">
-<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="2" l10n="U" oldref="37"><variable id="errorcode">Error Codes
+<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="2" l10n="U" oldref="37"><variable id="errorcode">Error Codes
</variable></paragraph>
</section>
<section id="allerrors">
-<paragraph role="paragraph" id="par_id3155095" xml-lang="en-US" l10n="U" oldref="38"><variable id="err2">2 Unspecified syntax error
+<paragraph role="paragraph" id="par_id315509599" xml-lang="en-US" l10n="NEW"><variable id="err1">1 An exception occurred
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3155095" xml-lang="en-US" l10n="CHG" oldref="38"><variable id="err2">2 Syntax error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="39"><variable id="err3">3 Return without Gosub
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3153976" xml-lang="en-US" l10n="CHG" oldref="40"><variable id="err4">4 Incorrect entry; please retry
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150891" xml-lang="en-US" l10n="U" oldref="41"><variable id="err5">5 Invalid procedure call
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3159227" xml-lang="en-US" l10n="U" oldref="42"><variable id="err6">6 Overflow
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154649" xml-lang="en-US" l10n="CHG" oldref="43"><variable id="err7">7 Not enough memory
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150050" xml-lang="en-US" l10n="U" oldref="44"><variable id="err8">8 Array already dimensioned
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148900" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="err9">9 Index out of defined range
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3153806" xml-lang="en-US" l10n="U" oldref="46"><variable id="err10">10 Duplicate definition
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="47"><variable id="err11">11 Division by zero
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3153013" xml-lang="en-US" l10n="CHG" oldref="48"><variable id="err12">12 Variable not defined
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3155593" xml-lang="en-US" l10n="U" oldref="49"><variable id="err13">13 Data type mismatch
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3151197" xml-lang="en-US" l10n="U" oldref="50"><variable id="err14">14 Invalid parameter
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154710" xml-lang="en-US" l10n="CHG" oldref="51"><variable id="err18">18 Process interrupted by user
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147504" xml-lang="en-US" l10n="U" oldref="52"><variable id="err20">20 Resume without error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3145319" xml-lang="en-US" l10n="CHG" oldref="53"><variable id="err28">28 Not enough stack memory
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146110" xml-lang="en-US" l10n="CHG" oldref="54"><variable id="err35">35 Sub-procedure or function procedure not defined
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="CHG" oldref="55"><variable id="err48">48 Error loading DLL file
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146101" xml-lang="en-US" l10n="CHG" oldref="56"><variable id="err49">49 Wrong DLL call convention
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3153957" xml-lang="en-US" l10n="U" oldref="57"><variable id="err51">51 Internal error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154404" xml-lang="en-US" l10n="CHG" oldref="58"><variable id="err52">52 Invalid file name or file number
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3151338" xml-lang="en-US" l10n="U" oldref="59"><variable id="err53">53 File not found
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147298" xml-lang="en-US" l10n="U" oldref="60"><variable id="err54">54 Incorrect file mode
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148747" xml-lang="en-US" l10n="U" oldref="61"><variable id="err55">55 File already open
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3145233" xml-lang="en-US" l10n="U" oldref="62"><variable id="err57">57 Device I/O error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3156399" xml-lang="en-US" l10n="U" oldref="63"><variable id="err58">58 File already exists
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3149324" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="err59">59 Incorrect record length
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147409" xml-lang="en-US" l10n="CHG" oldref="65"><variable id="err61">61 Disk or hard drive full
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3149146" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="err62">62 Reading exceeds EOF
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150456" xml-lang="en-US" l10n="CHG" oldref="67"><variable id="err63">63 Incorrect record number
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="68"><variable id="err67">67 Too many files
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146818" xml-lang="en-US" l10n="U" oldref="69"><variable id="err68">68 Device not available
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3145225" xml-lang="en-US" l10n="CHG" oldref="70"><variable id="err70">70 Access denied
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150372" xml-lang="en-US" l10n="U" oldref="71"><variable id="err71">71 Disk not ready
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148894" xml-lang="en-US" l10n="CHG" oldref="72"><variable id="err73">73 Not implemented
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3152981" xml-lang="en-US" l10n="CHG" oldref="73"><variable id="err74">74 Renaming on different drives impossible
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="U" oldref="74"><variable id="err75">75 Path/file access error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="U" oldref="75"><variable id="err76">76 Path not found
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154678" xml-lang="en-US" l10n="U" oldref="76"><variable id="err91">91 Object variable not set
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3149890" xml-lang="en-US" l10n="CHG" oldref="77"><variable id="err93">93 Invalid string pattern
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3146942" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="err94">94 Use of zero not permitted
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469429" xml-lang="en-US" l10n="NEW"><variable id="err250">250 DDE Error
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469428" xml-lang="en-US" l10n="NEW"><variable id="err280">280 Awaiting response to DDE connection
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469427" xml-lang="en-US" l10n="NEW"><variable id="err281">281 No DDE channels available
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469426" xml-lang="en-US" l10n="NEW"><variable id="err282">282 No application responded to DDE connect initiation
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469425" xml-lang="en-US" l10n="NEW"><variable id="err283">283 Too many applications responded to DDE connect initiation
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469424" xml-lang="en-US" l10n="NEW"><variable id="err284">284 DDE channel locked
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469423" xml-lang="en-US" l10n="NEW"><variable id="err285">285 External application cannot execute DDE operation
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469422" xml-lang="en-US" l10n="NEW"><variable id="err286">286 Timeout while waiting for DDE response
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469421" xml-lang="en-US" l10n="NEW"><variable id="err287">287 user pressed ESCAPE during DDE operation
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469420" xml-lang="en-US" l10n="NEW"><variable id="err288">288 External application busy
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469419" xml-lang="en-US" l10n="NEW"><variable id="err289">289 DDE operation without data
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469418" xml-lang="en-US" l10n="NEW"><variable id="err290">290 Data are in wrong format
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469417" xml-lang="en-US" l10n="NEW"><variable id="err291">291 External application has been terminated
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469416" xml-lang="en-US" l10n="NEW"><variable id="err292">292 DDE connection interrupted or modified
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469415" xml-lang="en-US" l10n="NEW"><variable id="err293">293 DDE method invoked with no channel open
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id31469414" xml-lang="en-US" l10n="NEW"><variable id="err294">294 Invalid DDE link format
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="39"><variable id="err3">3 Return without Gosub
+<paragraph role="paragraph" id="par_id31469413" xml-lang="en-US" l10n="NEW"><variable id="err295">295 DDE message has been lost
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153976" xml-lang="en-US" l10n="U" oldref="40"><variable id="err4">4 Redo from start
+<paragraph role="paragraph" id="par_id31469412" xml-lang="en-US" l10n="NEW"><variable id="err296">296 Paste link already performed
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150891" xml-lang="en-US" l10n="U" oldref="41"><variable id="err5">5 Invalid procedure call
+<paragraph role="paragraph" id="par_id31469411" xml-lang="en-US" l10n="NEW"><variable id="err297">297 Link mode cannot be set due to invalid link topic
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159227" xml-lang="en-US" l10n="U" oldref="42"><variable id="err6">6 Overflow
+<paragraph role="paragraph" id="par_id31469410" xml-lang="en-US" l10n="NEW"><variable id="err298">298 DDE requires the DDEML.DLL file
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154649" xml-lang="en-US" l10n="U" oldref="43"><variable id="err7">7 Out of memory
+<paragraph role="paragraph" id="par_id3150028" xml-lang="en-US" l10n="CHG" oldref="79"><variable id="err323">323 Module cannot be loaded; invalid format
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150050" xml-lang="en-US" l10n="U" oldref="44"><variable id="err8">8 Array already dimensioned
+<paragraph role="paragraph" id="par_id3148434" xml-lang="en-US" l10n="U" oldref="80"><variable id="err341">341 Invalid object index
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148900" xml-lang="en-US" l10n="U" oldref="45"><variable id="err9">9 Subscript out of range
+<paragraph role="paragraph" id="par_id3143219" xml-lang="en-US" l10n="CHG" oldref="81"><variable id="err366">366 Object is not available
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153806" xml-lang="en-US" l10n="U" oldref="46"><variable id="err10">10 Duplicate definition
+<paragraph role="paragraph" id="par_id3144744" xml-lang="en-US" l10n="CHG" oldref="82"><variable id="err380">380 Incorrect property value
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="47"><variable id="err11">11 Division by zero
+<paragraph role="paragraph" id="par_id3147420" xml-lang="en-US" l10n="CHG" oldref="83"><variable id="err382">382 This property is read-only
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153013" xml-lang="en-US" l10n="U" oldref="48"><variable id="err12">12 Variable undefined
+<paragraph role="paragraph" id="par_id3147472" xml-lang="en-US" l10n="CHG" oldref="84"><variable id="err394">394 This property is write-only
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155593" xml-lang="en-US" l10n="U" oldref="49"><variable id="err13">13 Type mismatch
+<paragraph role="paragraph" id="par_id3148583" xml-lang="en-US" l10n="U" oldref="85"><variable id="err420">420 Invalid object reference
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151197" xml-lang="en-US" l10n="U" oldref="50"><variable id="err14">14 Invalid parameter
+<paragraph role="paragraph" id="par_id3153329" xml-lang="en-US" l10n="U" oldref="86"><variable id="err423">423 Property or method not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154710" xml-lang="en-US" l10n="U" oldref="51"><variable id="err18">18 User interrupt occurred
+<paragraph role="paragraph" id="par_id3148738" xml-lang="en-US" l10n="U" oldref="87"><variable id="err424">424 Object required
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147504" xml-lang="en-US" l10n="U" oldref="52"><variable id="err20">20 Resume without error
+<paragraph role="paragraph" id="par_id3159084" xml-lang="en-US" l10n="CHG" oldref="88"><variable id="err425">425 Invalid use of an object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145319" xml-lang="en-US" l10n="U" oldref="53"><variable id="err28">28 Out of stack space
+<paragraph role="paragraph" id="par_id3146806" xml-lang="en-US" l10n="CHG" oldref="89"><variable id="err430">430 OLE Automation is not supported by this object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146110" xml-lang="en-US" l10n="U" oldref="54"><variable id="err35">35 Sub or Function not defined
+<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US" l10n="CHG" oldref="90"><variable id="err438">438 This property or method is not supported by the object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="55"><variable id="err48">48 Error in loading DLL
+<paragraph role="paragraph" id="par_id3154374" xml-lang="en-US" l10n="U" oldref="91"><variable id="err440">440 OLE automation error
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146101" xml-lang="en-US" l10n="U" oldref="56"><variable id="err49">49 Bad DLL calling convention
+<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="CHG" oldref="92"><variable id="err445">445 This action is not supported by given object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153957" xml-lang="en-US" l10n="U" oldref="57"><variable id="err51">51 Internal error
+<paragraph role="paragraph" id="par_id3150282" xml-lang="en-US" l10n="CHG" oldref="93"><variable id="err446">446 Named arguments are not supported by given object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154404" xml-lang="en-US" l10n="U" oldref="58"><variable id="err52">52 Bad file name or number
+<paragraph role="paragraph" id="par_id3150142" xml-lang="en-US" l10n="CHG" oldref="94"><variable id="err447">447 The current locale setting is not supported by the given object
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151338" xml-lang="en-US" l10n="U" oldref="59"><variable id="err53">53 File not found
+<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="95"><variable id="err448">448 Named argument not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147298" xml-lang="en-US" l10n="U" oldref="60"><variable id="err54">54 Bad file mode
+<paragraph role="paragraph" id="par_id3145145" xml-lang="en-US" l10n="CHG" oldref="96"><variable id="err449">449 Argument is not optional
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148747" xml-lang="en-US" l10n="U" oldref="61"><variable id="err55">55 File already open
+<paragraph role="paragraph" id="par_id3154399" xml-lang="en-US" l10n="CHG" oldref="97"><variable id="err450">450 Invalid number of arguments
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145233" xml-lang="en-US" l10n="U" oldref="62"><variable id="err57">57 Device I/O error
+<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="CHG" oldref="98"><variable id="err451">451 Object is not a list
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156399" xml-lang="en-US" l10n="U" oldref="63"><variable id="err58">58 File already exists
+<paragraph role="paragraph" id="par_id3149507" xml-lang="en-US" l10n="CHG" oldref="99"><variable id="err452">452 Invalid ordinal number
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149324" xml-lang="en-US" l10n="U" oldref="64"><variable id="err59">59 Bad record length
+<paragraph role="paragraph" id="par_id3154566" xml-lang="en-US" l10n="U" oldref="100"><variable id="err453">453 Specified DLL function not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="65"><variable id="err61">61 Disk full
+<paragraph role="paragraph" id="par_id3145595" xml-lang="en-US" l10n="U" oldref="101"><variable id="err460">460 Invalid clipboard format
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149146" xml-lang="en-US" l10n="U" oldref="66"><variable id="err62">62 Input past end of file
+<paragraph role="paragraph" id="par_id31455951" xml-lang="en-US" l10n="NEW"><variable id="err951">951 Unexpected symbol:
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150456" xml-lang="en-US" l10n="U" oldref="67"><variable id="err63">63 Bad record number
+<paragraph role="paragraph" id="par_id31455952" xml-lang="en-US" l10n="NEW"><variable id="err952">952 Expected:
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="68"><variable id="err67">67 Too many files
+<paragraph role="paragraph" id="par_id31455953" xml-lang="en-US" l10n="NEW"><variable id="err953">953 Symbol expected
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146818" xml-lang="en-US" l10n="U" oldref="69"><variable id="err68">68 Device not available
+<paragraph role="paragraph" id="par_id31455954" xml-lang="en-US" l10n="NEW"><variable id="err954">954 Variable expected
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145225" xml-lang="en-US" l10n="U" oldref="70"><variable id="err70">70 Permission denied
+<paragraph role="paragraph" id="par_id31455955" xml-lang="en-US" l10n="NEW"><variable id="err955">955 Label expected
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150372" xml-lang="en-US" l10n="U" oldref="71"><variable id="err71">71 Disk not ready
+<paragraph role="paragraph" id="par_id31455956" xml-lang="en-US" l10n="NEW"><variable id="err956">956 Value cannot be applied
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148894" xml-lang="en-US" l10n="U" oldref="72"><variable id="err73">73 Feature not implemented
+<paragraph role="paragraph" id="par_id31455957" xml-lang="en-US" l10n="NEW"><variable id="err957">957 Variable already defined
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152981" xml-lang="en-US" l10n="U" oldref="73"><variable id="err74">74 No rename with different drive
+<paragraph role="paragraph" id="par_id31455958" xml-lang="en-US" l10n="NEW"><variable id="err958">958 Sub procedure or function procedure already defined
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="U" oldref="74"><variable id="err75">75 Path/file access error
+<paragraph role="paragraph" id="par_id31455959" xml-lang="en-US" l10n="NEW"><variable id="err959">959 Label already defined
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="U" oldref="75"><variable id="err76">76 Path not found
+<paragraph role="paragraph" id="par_id31455960" xml-lang="en-US" l10n="NEW"><variable id="err960">960 Variable not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154678" xml-lang="en-US" l10n="U" oldref="76"><variable id="err91">91 Object variable not set
+<paragraph role="paragraph" id="par_id31455961" xml-lang="en-US" l10n="NEW"><variable id="err961">961 Array or procedure not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149890" xml-lang="en-US" l10n="U" oldref="77"><variable id="err93">93 Invalid pattern string
+<paragraph role="paragraph" id="par_id31455962" xml-lang="en-US" l10n="NEW"><variable id="err962">962 Procedure not found
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="78"><variable id="err94">94 Invalid use of Null
+<paragraph role="paragraph" id="par_id31455963" xml-lang="en-US" l10n="NEW"><variable id="err963">963 Label undefined
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="79"><variable id="err323">323 Can't load module
+<paragraph role="paragraph" id="par_id31455964" xml-lang="en-US" l10n="NEW"><variable id="err964">964 Unknown data type
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148434" xml-lang="en-US" l10n="U" oldref="80"><variable id="err341">341 Invalid object index
+<paragraph role="paragraph" id="par_id31455965" xml-lang="en-US" l10n="NEW"><variable id="err965">965 Exit expected
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3143219" xml-lang="en-US" l10n="U" oldref="81"><variable id="err366">366 No active view or document
+<paragraph role="paragraph" id="par_id31455966" xml-lang="en-US" l10n="NEW"><variable id="err966">966 Statement block still open: missing
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3144744" xml-lang="en-US" l10n="U" oldref="82"><variable id="err380">380 Bad property value
+<paragraph role="paragraph" id="par_id31455967" xml-lang="en-US" l10n="NEW"><variable id="err967">967 Parentheses do not match
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147420" xml-lang="en-US" l10n="U" oldref="83"><variable id="err382">382 Property is read only
+<paragraph role="paragraph" id="par_id31455968" xml-lang="en-US" l10n="NEW"><variable id="err968">968 Symbol already defined differently
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147472" xml-lang="en-US" l10n="U" oldref="84"><variable id="err394">394 Property is write only
+<paragraph role="paragraph" id="par_id31455969" xml-lang="en-US" l10n="NEW"><variable id="err969">969 Parameters do not correspond to procedure
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148583" xml-lang="en-US" l10n="U" oldref="85"><variable id="err420">420 Invalid object reference
+<paragraph role="paragraph" id="par_id31455970" xml-lang="en-US" l10n="NEW"><variable id="err970">970 Invalid character in number
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153329" xml-lang="en-US" l10n="U" oldref="86"><variable id="err423">423 Property or method not found
+<paragraph role="paragraph" id="par_id31455971" xml-lang="en-US" l10n="NEW"><variable id="err971">971 Array must be dimensioned
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148738" xml-lang="en-US" l10n="U" oldref="87"><variable id="err424">424 Object required
+<paragraph role="paragraph" id="par_id31455972" xml-lang="en-US" l10n="NEW"><variable id="err972">972 Else/Endif without If
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159084" xml-lang="en-US" l10n="U" oldref="88"><variable id="err425">425 Invalid use of object
+<paragraph role="paragraph" id="par_id31455973" xml-lang="en-US" l10n="NEW"><variable id="err973">973 not allowed within a procedure
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146806" xml-lang="en-US" l10n="U" oldref="89"><variable id="err430">430 Class does not support OLE
+<paragraph role="paragraph" id="par_id31455974" xml-lang="en-US" l10n="NEW"><variable id="err974">974 not allowed outside a procedure
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US" l10n="U" oldref="90"><variable id="err438">438 Object doesn't support method
+<paragraph role="paragraph" id="par_id31455975" xml-lang="en-US" l10n="NEW"><variable id="err975">975 Dimension specifications do not match
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154374" xml-lang="en-US" l10n="U" oldref="91"><variable id="err440">440 OLE automation error
+<paragraph role="paragraph" id="par_id31455976" xml-lang="en-US" l10n="NEW"><variable id="err976">976 Unknown option:
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="U" oldref="92"><variable id="err445">445 Object doesn't support this action
+<paragraph role="paragraph" id="par_id31455977" xml-lang="en-US" l10n="NEW"><variable id="err977">977 Constant redefined
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150282" xml-lang="en-US" l10n="U" oldref="93"><variable id="err446">446 Object doesn't support named args
+<paragraph role="paragraph" id="par_id31455978" xml-lang="en-US" l10n="NEW"><variable id="err978">978 Program too large
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150142" xml-lang="en-US" l10n="U" oldref="94"><variable id="err447">447 Object doesn't support current locale setting
+<paragraph role="paragraph" id="par_id31455979" xml-lang="en-US" l10n="NEW"><variable id="err979">979 Strings or arrays not permitted
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="95"><variable id="err448">448 Named argument not found
+<paragraph role="paragraph" id="par_id31455980" xml-lang="en-US" l10n="NEW"><variable id="err1000">1000 Object does not have this property
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145145" xml-lang="en-US" l10n="U" oldref="96"><variable id="err449">449 Argument not optional
+<paragraph role="paragraph" id="par_id31455981" xml-lang="en-US" l10n="NEW"><variable id="err1001">1001 Object does not have this method
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154399" xml-lang="en-US" l10n="U" oldref="97"><variable id="err450">450 Wrong number of arguments
+<paragraph role="paragraph" id="par_id31455982" xml-lang="en-US" l10n="NEW"><variable id="err1002">1002 Required argument lacking
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="98"><variable id="err451">451 Object not a collection
+<paragraph role="paragraph" id="par_id31455983" xml-lang="en-US" l10n="NEW"><variable id="err1003">1003 Invalid number of arguments
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149507" xml-lang="en-US" l10n="U" oldref="99"><variable id="err452">452 Invalid ordinal
+<paragraph role="paragraph" id="par_id31455984" xml-lang="en-US" l10n="NEW"><variable id="err1004">1004 Error executing a method
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154566" xml-lang="en-US" l10n="U" oldref="100"><variable id="err453">453 Specified DLL function not found
+<paragraph role="paragraph" id="par_id31455985" xml-lang="en-US" l10n="NEW"><variable id="err1005">1005 Unable to set property
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145595" xml-lang="en-US" l10n="U" oldref="101"><variable id="err460">460 Invalid clipboard format
+<paragraph role="paragraph" id="par_id31455986" xml-lang="en-US" l10n="NEW"><variable id="err1006">1006 Unable to determine property
</variable></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/sbasic/shared/01010210.xhp b/helpcontent2/source/text/sbasic/shared/01010210.xhp
index fddc3d2f46..96c74a2b07 100755
--- a/helpcontent2/source/text/sbasic/shared/01010210.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01010210.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,6 +49,9 @@
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="14">This section provides the fundamentals for working with $[officename] Basic.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3147560" xml-lang="en-US" l10n="U" oldref="2">$[officename] Basic code is based on subroutines and functions that are specified between <emph>sub...end sub</emph> and <emph>function...end function</emph> sections. Each Sub or Function can call other Subs and Functions. If you take care to write generic code for a Sub or Function, you can probably re-use it in other programs. See also <link href="text/sbasic/shared/01020300.xhp" name="Procedures and Functions">Procedures and Functions</link>.</paragraph>
+
+<paragraph role="note" id="par_id314756320" xml-lang="en-US" l10n="NEW">Some restrictions apply for the names of your public variables, subs, and functions. You must not use the same name as one of the modules of the same library.</paragraph>
+
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="3">What is a Sub?</paragraph>
<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="4">
<emph>Sub</emph> is the short form of <emph>subroutine</emph>, that is used to handle a certain task within a program. Subs are used to split a task into individual procedures. Splitting a program into procedures and sub-procedures enhances readability and reduces the error-proneness. A sub possibly takes some arguments as parameters but does not return any values back to the calling sub or function, for example:</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/01020300.xhp b/helpcontent2/source/text/sbasic/shared/01020300.xhp
index 1fdab31905..e244cd4f98 100644
--- a/helpcontent2/source/text/sbasic/shared/01020300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020300.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -58,6 +58,9 @@
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="2">The following describes the basic use of procedures and functions in $[officename] Basic.</paragraph>
</section>
<paragraph role="note" id="par_id3151215" xml-lang="en-US" l10n="U" oldref="56">When you create a new module, $[officename] Basic automatically inserts a SUB called "Main". This default name has nothing to do with the order or the starting point of a $[officename] Basic project. You can also safely rename this SUB.</paragraph>
+
+<paragraph role="note" id="par_id314756320" xml-lang="en-US" l10n="NEW">Some restrictions apply for the names of your public variables, subs, and functions. You must not use the same name as one of the modules of the same library.</paragraph>
+
<paragraph role="paragraph" id="par_id3154124" xml-lang="en-US" l10n="U" oldref="3">Procedures (SUBS) and functions (FUNCTIONS) help you maintaining a structured overview by separating a program into logical pieces.</paragraph>
<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="CHG" oldref="4">One benefit of procedures and functions is that, once you have developed a program code containing task components, you can use this code in another project.</paragraph>
<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="2" l10n="U" oldref="26">Passing Variables to Procedures (SUB) and Functions (FUNCTION)</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03050500.xhp b/helpcontent2/source/text/sbasic/shared/03050500.xhp
index 9655b6c27e..bfe33b087a 100755
--- a/helpcontent2/source/text/sbasic/shared/03050500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050500.xhp
@@ -34,10 +34,6 @@
<title id="tit" xml-lang="en-US">On Error GoTo ... Resume Statement [Runtime]</title>
<filename>/text/sbasic/shared/03050500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T14:11:12">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="onerrorgotoresume">
@@ -56,7 +52,7 @@
<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="9"><emph>Local:</emph> "On error" is global in scope, and remains active until canceled by another "On error" statement. "On Local error" is local to the routine which invokes it. Local error handling overrides any previous global setting. When the invoking routine exits, the local error handling is canceled automatically, and any previous global setting is restored.</paragraph>
-<paragraph role="paragraph" id="par_id3148619" xml-lang="en-US" l10n="U" oldref="10">The On Error GoTo statement is used to react to errors that occur in a macro. The statement must be inserted at the start of a procedure (in a local error-handling routine) or at the start of a module.</paragraph>
+<paragraph role="paragraph" id="par_id3148619" xml-lang="en-US" l10n="CGH" oldref="10">The On Error GoTo statement is used to react to errors that occur in a macro.<comment>ufi: see i112231: The statement must be inserted at the start of a procedure (in a local error-handling routine) or at the start of a module.</comment></paragraph>
<paragraph role="heading" id="hd_id3146985" xml-lang="en-US" level="2" l10n="U" oldref="11">Example:</paragraph>
<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="42">Sub ExampleReset</paragraph>
<paragraph role="paragraph" id="par_id3163712" xml-lang="en-US" l10n="U" oldref="43">On Error Goto ErrorHandler</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03080301.xhp b/helpcontent2/source/text/sbasic/shared/03080301.xhp
index dbccfb655b..22f62b069f 100755
--- a/helpcontent2/source/text/sbasic/shared/03080301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080301.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared03080301xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Randomize Statement [Runtime]</title>
<filename>/text/sbasic/shared/03080301.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T14:07:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="randomize">
@@ -49,24 +45,24 @@
<paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="4">Randomize [Number]</paragraph>
<paragraph role="heading" id="hd_id3152456" xml-lang="en-US" level="2" l10n="U" oldref="5">Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="6">
-<emph>Number:</emph> Any integer value that initializes the random-number generator. If Number is omitted, the generator uses the current value of the system timer.</paragraph>
+<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="6">
+<emph>Number:</emph> Any integer value that initializes the random-number generator.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph role="heading" id="hd_id3149655" xml-lang="en-US" level="2" l10n="U" oldref="7">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="8">Sub ExampleRandomize</paragraph>
-<paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="U" oldref="9">Dim iVar As Integer, sText As String</paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="10">Dim iSpectral(10) As Integer</paragraph>
-<paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="12">Randomize 2^14-1</paragraph>
-<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="13">For iCount = 1 To 1000</paragraph>
-<paragraph role="paragraph" id="par_id3147288" xml-lang="en-US" l10n="U" oldref="14">iVar = Int((10 * Rnd) ) REM Range from 0 to 9</paragraph>
-<paragraph role="paragraph" id="par_id3155132" xml-lang="en-US" l10n="U" oldref="15">iSpectral(iVar) = iSpectral(iVar) +1</paragraph>
-<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="U" oldref="16">Next iCount</paragraph>
-<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="18">sText = " | "</paragraph>
-<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US" l10n="U" oldref="19">For iCount = 0 To 9</paragraph>
-<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="20">sText = sText &amp; iSpectral(iCount) &amp; " | "</paragraph>
-<paragraph role="paragraph" id="par_id3146921" xml-lang="en-US" l10n="U" oldref="21">Next iCount</paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="22">MsgBox sText,0,"Spectral Distribution"</paragraph>
-<paragraph role="paragraph" id="par_id3152941" xml-lang="en-US" l10n="U" oldref="23">end sub</paragraph>
+<paragraph role="code" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="8">Sub ExampleRandomize</paragraph>
+<paragraph role="code" id="par_id3147229" xml-lang="en-US" l10n="U" oldref="9">Dim iVar As Integer, sText As String</paragraph>
+<paragraph role="code" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="10">Dim iSpectral(10) As Integer</paragraph>
+<paragraph role="code" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="12">Randomize 2^14-1</paragraph>
+<paragraph role="code" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="13">For iCount = 1 To 1000</paragraph>
+<paragraph role="code" id="par_id3147288" xml-lang="en-US" l10n="U" oldref="14">iVar = Int((10 * Rnd) ) REM Range from 0 to 9</paragraph>
+<paragraph role="code" id="par_id3155132" xml-lang="en-US" l10n="U" oldref="15">iSpectral(iVar) = iSpectral(iVar) +1</paragraph>
+<paragraph role="code" id="par_id3153143" xml-lang="en-US" l10n="U" oldref="16">Next iCount</paragraph>
+<paragraph role="code" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="18">sText = " | "</paragraph>
+<paragraph role="code" id="par_id3151114" xml-lang="en-US" l10n="U" oldref="19">For iCount = 0 To 9</paragraph>
+<paragraph role="code" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="20">sText = sText &amp; iSpectral(iCount) &amp; " | "</paragraph>
+<paragraph role="code" id="par_id3146921" xml-lang="en-US" l10n="U" oldref="21">Next iCount</paragraph>
+<paragraph role="code" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="22">MsgBox sText,0,"Spectral Distribution"</paragraph>
+<paragraph role="code" id="par_id3152941" xml-lang="en-US" l10n="U" oldref="23">end sub</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/03080302.xhp b/helpcontent2/source/text/sbasic/shared/03080302.xhp
index 9a983886d2..92f33def84 100755
--- a/helpcontent2/source/text/sbasic/shared/03080302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080302.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared03080302xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Rnd Function [Runtime]</title>
<filename>/text/sbasic/shared/03080302.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T14:16:16">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="rnd">
@@ -52,33 +48,26 @@
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="6">Double</paragraph>
<paragraph role="heading" id="hd_id3154909" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph>
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Expression:</emph> Any numeric expression that defines how to generate random numbers.</paragraph>
-<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="9">
-<emph>Less than zero:</emph> Always returns the same random number.</paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="10">
-<emph>Greater than zero:</emph> Returns the next random number in the sequence.</paragraph>
-<paragraph role="paragraph" id="par_id3148648" xml-lang="en-US" l10n="U" oldref="11">
-<emph>Zero:</emph> Returns the random number that was last generated.</paragraph>
+<emph>Expression:</emph> Any numeric expression.</paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="12">
<emph>Omitted:</emph> Returns the next random number in the sequence.</paragraph>
-<paragraph role="paragraph" id="par_id3153091" xml-lang="en-US" l10n="U" oldref="13">If the same number is passed for each successive call to the Rnd function, the same random-number sequence is generated. This is because the Expression parameter is used as a starting point for the next number.</paragraph>
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="14">The <emph>Rnd</emph> function only returns values ranging from 0 to 1. To generate random integers in a given range, use the formula in the following example:</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph role="heading" id="hd_id3151118" xml-lang="en-US" level="2" l10n="U" oldref="15">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="16">Sub ExampleRandomSelect</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="17">Dim iVar As Integer</paragraph>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="18">iVar = Int((15 * Rnd) -2)</paragraph>
-<paragraph role="paragraph" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="19">Select Case iVar</paragraph>
-<paragraph role="paragraph" id="par_id3154097" xml-lang="en-US" l10n="U" oldref="20">Case 1 To 5</paragraph>
-<paragraph role="paragraph" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="21">Print "Number from 1 to 5"</paragraph>
-<paragraph role="paragraph" id="par_id3155418" xml-lang="en-US" l10n="U" oldref="22">Case 6, 7, 8</paragraph>
-<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="23">Print "Number from 6 to 8"</paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="24">Case Is &gt; 8 And iVar &lt; 11</paragraph>
-<paragraph role="paragraph" id="par_id3151074" xml-lang="en-US" l10n="U" oldref="25">Print "Greater than 8"</paragraph>
-<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="U" oldref="26">Case Else</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="27">Print "Outside range 1 to 10"</paragraph>
-<paragraph role="paragraph" id="par_id3150328" xml-lang="en-US" l10n="U" oldref="28">End Select</paragraph>
-<paragraph role="paragraph" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="29">end sub</paragraph>
+<paragraph role="code" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="16">Sub ExampleRandomSelect</paragraph>
+<paragraph role="code" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="17">Dim iVar As Integer</paragraph>
+<paragraph role="code" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="18">iVar = Int((15 * Rnd) -2)</paragraph>
+<paragraph role="code" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="19">Select Case iVar</paragraph>
+<paragraph role="code" id="par_id3154097" xml-lang="en-US" l10n="U" oldref="20">Case 1 To 5</paragraph>
+<paragraph role="code" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="21">Print "Number from 1 to 5"</paragraph>
+<paragraph role="code" id="par_id3155418" xml-lang="en-US" l10n="U" oldref="22">Case 6, 7, 8</paragraph>
+<paragraph role="code" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="23">Print "Number from 6 to 8"</paragraph>
+<paragraph role="code" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="24">Case Is &gt; 8 And iVar &lt; 11</paragraph>
+<paragraph role="code" id="par_id3151074" xml-lang="en-US" l10n="U" oldref="25">Print "Greater than 8"</paragraph>
+<paragraph role="code" id="par_id3154016" xml-lang="en-US" l10n="U" oldref="26">Case Else</paragraph>
+<paragraph role="code" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="27">Print "Outside range 1 to 10"</paragraph>
+<paragraph role="code" id="par_id3150328" xml-lang="en-US" l10n="U" oldref="28">End Select</paragraph>
+<paragraph role="code" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="29">end sub</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/03090201.xhp b/helpcontent2/source/text/sbasic/shared/03090201.xhp
index 14f2bae5e8..e3a08323c7 100755
--- a/helpcontent2/source/text/sbasic/shared/03090201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090201.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared03090201xml" indexer="include" status="PUBLISH">
@@ -91,17 +91,17 @@
<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="45">statements</paragraph>
<paragraph role="paragraph" id="par_id3153159" xml-lang="en-US" l10n="U" oldref="46">Loop...</paragraph>
<paragraph role="heading" id="hd_id3147396" xml-lang="en-US" level="2" l10n="U" oldref="47">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="49">Sub ExampleDoLoop</paragraph>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="50">Dim sFile As String</paragraph>
-<paragraph role="paragraph" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="51">Dim sPath As String</paragraph>
-<paragraph role="paragraph" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="52">sPath = "c:\"</paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="53">sFile = Dir$( sPath ,22)</paragraph>
-<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="54">If sFile &lt;&gt; "" Then</paragraph>
-<paragraph role="paragraph" id="par_id3156333" xml-lang="en-US" l10n="U" oldref="55">Do</paragraph>
-<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="56">MsgBox sFile</paragraph>
-<paragraph role="paragraph" id="par_id3150327" xml-lang="en-US" l10n="U" oldref="57">sFile = Dir$</paragraph>
-<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="58">Loop Until sFile = ""</paragraph>
-<paragraph role="paragraph" id="par_id3153765" xml-lang="en-US" l10n="U" oldref="59">End If</paragraph>
-<paragraph role="paragraph" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="60">End Sub</paragraph>
+<paragraph role="code" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="49">Sub ExampleDoLoop</paragraph>
+<paragraph role="code" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="50">Dim sFile As String</paragraph>
+<paragraph role="code" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="51">Dim sPath As String</paragraph>
+<paragraph role="code" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="52">sPath = "c:\"</paragraph>
+<paragraph role="code" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="53">sFile = Dir$( sPath ,22)</paragraph>
+<paragraph role="code" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="54">If sFile &lt;&gt; "" Then</paragraph>
+<paragraph role="code" id="par_id3156333" xml-lang="en-US" l10n="U" oldref="55">Do</paragraph>
+<paragraph role="code" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="56">MsgBox sFile</paragraph>
+<paragraph role="code" id="par_id3150327" xml-lang="en-US" l10n="U" oldref="57">sFile = Dir$</paragraph>
+<paragraph role="code" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="58">Loop Until sFile = ""</paragraph>
+<paragraph role="code" id="par_id3153765" xml-lang="en-US" l10n="U" oldref="59">End If</paragraph>
+<paragraph role="code" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="60">End Sub</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/03132400.xhp b/helpcontent2/source/text/sbasic/shared/03132400.xhp
index b16ccbdd94..c60501d2f8 100644
--- a/helpcontent2/source/text/sbasic/shared/03132400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132400.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared03132400xhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">CreateObject Function [Runtime]</title>
<filename>/text/sbasic/shared/03132400.xhp</filename>
</topic>
-<history>
-<created date="2004-10-27T14:19:46">CreateObject</created>
-<lastedited date="2006-10-27T12:41:06">yj: checked</lastedited>
-</history>
</meta>
<body>
<section id="createobject">
diff --git a/helpcontent2/source/text/scalc/01/02160000.xhp b/helpcontent2/source/text/scalc/01/02160000.xhp
index 88727ef63a..4bf43a8150 100644
--- a/helpcontent2/source/text/scalc/01/02160000.xhp
+++ b/helpcontent2/source/text/scalc/01/02160000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,9 +40,9 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>cells; deleting cells</bookmark_value>
<bookmark_value>columns; deleting</bookmark_value>
<bookmark_value>rows; deleting</bookmark_value>
@@ -50,48 +50,40 @@
<bookmark_value>deleting;cells/rows/columns</bookmark_value>
</bookmark>
<comment>MW made one "deleting;" entry out of 3</comment>
-
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteCell" id="bm_id512529" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/.uno:DeleteCell" id="bm_id3151115" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U" oldref="1">Delete Cells</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154490" role="paragraph" l10n="U" oldref="2"><variable id="zellenloeschentext"><ahelp hid=".uno:DeleteCell">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3154490" role="paragraph" l10n="U" oldref="2"><variable id="zellenloeschentext"><ahelp hid=".uno:DeleteCell">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</ahelp>
</variable> Note that the selected delete option is stored and reloaded when the dialog is next called.</paragraph>
<section id="howtoget">
-
+
<embed href="text/scalc/00/00000402.xhp#bzelo"/>
-
+
</section>
<paragraph xml-lang="en-US" id="hd_id3149121" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
<paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" oldref="4">This area contains options for specifying how sheets are displayed after deleting cells.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP" id="bm_id3154755" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155767" role="heading" level="3" l10n="U" oldref="5">Shift cells up</paragraph>
<paragraph xml-lang="en-US" id="par_id3153714" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSUP">Fills the space produced by the deleted cells with the cells underneath it.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT" id="bm_id3147346" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="3" l10n="U" oldref="7">Shift cells left</paragraph>
<paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSLEFT">Fills the resulting space by the cells to the right of the deleted cells.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS" id="bm_id3149566" localize="false"/>
-
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteRows" id="bm_id167872" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:DeleteRows" id="bm_id3149565" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146918" role="heading" level="3" l10n="U" oldref="9">Delete entire row(s)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148487" role="paragraph" l10n="U" oldref="10"><ahelp hid=".uno:DeleteRows">After selecting at least one cell, deletes the entire row from the sheet.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS" id="bm_id3150342" localize="false"/>
-
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteColumns" id="bm_id8964231" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:DeleteColumns" id="bm_id3159240" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155114" role="heading" level="3" l10n="U" oldref="11">Delete entire column(s)</paragraph>
<paragraph xml-lang="en-US" id="par_id3150086" role="paragraph" l10n="U" oldref="12"><ahelp hid=".uno:DeleteColumns">After selecting at least one cell, deletes the entire column from the sheet.</ahelp></paragraph>
<section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3166424" role="paragraph" l10n="C"><link href="text/scalc/01/02150000.xhp" name="Deleting Cells">Deleting Cells</link></paragraph>
-
+
+ <paragraph xml-lang="en-US" id="par_id3166424" role="paragraph" l10n="CHG"><link href="text/scalc/01/02150000.xhp" name="Deleting Contents">Deleting Contents</link></paragraph>
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/03080000.xhp b/helpcontent2/source/text/scalc/01/03080000.xhp
index 087df79217..2135bc6b92 100644
--- a/helpcontent2/source/text/scalc/01/03080000.xhp
+++ b/helpcontent2/source/text/scalc/01/03080000.xhp
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
+<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -26,35 +24,30 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-<helpdocument version="1.0">
+ ************************************************************************ -->
+
<meta>
<topic id="textscalc0103080000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Value Highlighting</title>
-<filename>/text/scalc/01/03080000.xhp</filename>
+<title xml-lang="en-US" id="tit">Value Highlighting</title>
+<filename>file:///cws/so-cwsserv01/hcshared27/DEV300/ooo/helpcontent2/source/text/scalc/01/03080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-12T12:45:45">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="wertehervorheben">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3151384"><bookmark_value>spreadsheets; value highlighting</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3151384">
+<bookmark_value>spreadsheets; value highlighting</bookmark_value>
<bookmark_value>values;highlighting</bookmark_value>
<bookmark_value>highlighting; values in sheets</bookmark_value>
+<bookmark_value>colors;values</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewValueHighlighting" id="bm_id6436040" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ViewValueHighlighting" id="bm_id3145068" localize="false"/>
-<paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="1" l10n="C"><link href="text/scalc/01/03080000.xhp" name="Value Highlighting">Value Highlighting</link></paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ViewValueHighlighting">Displays cell contents in different colors, depending on type.</ahelp></paragraph>
+<paragraph id="hd_id3151384" role="heading" xml-lang="en-US" level="1"><link href="text/scalc/01/03080000.xhp" name="Value Highlighting">Value Highlighting</link></paragraph>
+<paragraph id="par_id3154366" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:ViewValueHighlighting">Displays cell contents in different colors, depending on type.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="5">To remove the highlighting, unmark the menu entry.</paragraph>
-<section id="howtoget">
- <embed href="text/scalc/00/00000403.xhp#awehe"/>
+<paragraph id="par_id3125863" role="paragraph" xml-lang="en-US">To remove the highlighting, unmark the menu entry.</paragraph>
+<section id="howtoget"><embed href="text/scalc/00/00000403.xhp#awehe"/>
</section>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</paragraph>
-<paragraph role="warning" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="3">If this function is active, colors that you define in the document will not be displayed. When you deactivate the function, the user-defined colors are displayed again.</paragraph>
+<paragraph id="par_id3145785" role="paragraph" xml-lang="en-US">Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</paragraph>
+<paragraph id="par_id3153188" role="warning" xml-lang="en-US">If this function is active, colors that you define in the document will not be displayed. When you deactivate the function, the user-defined colors are displayed again.</paragraph>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04050000.xhp b/helpcontent2/source/text/scalc/01/04050000.xhp
index 81c454e5e6..94627a9d0a 100644
--- a/helpcontent2/source/text/scalc/01/04050000.xhp
+++ b/helpcontent2/source/text/scalc/01/04050000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalc0104050000xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert Sheet</title>
@@ -44,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Insert" id="bm_id1669896" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Insert" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Sheet</paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelleeinfuegentext"><ahelp hid=".uno:Insert">Defines the options to be used to insert a new sheet.</ahelp> You can create a new sheet, or insert an existing sheet from a file.
+<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelleeinfuegentext"><ahelp hid=".uno:Insert">Defines the options to be used to insert a new sheet.</ahelp> You can create a new sheet, or insert an existing sheet from a file.
</variable></paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000404.xhp#eitab"/>
@@ -57,13 +57,13 @@
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND" id="bm_id3147434" localize="false"/>
<paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="23">After current sheet</paragraph>
<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND">Inserts a new sheet directly after the current sheet.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="25">Create</paragraph>
+<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="CHG" oldref="25">Sheet</paragraph>
<paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="26">Specifies whether a new sheet or an existing sheet is inserted into the document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW" id="bm_id3145750" localize="false"/>
-<paragraph role="heading" id="hd_id3147350" xml-lang="en-US" level="2" l10n="U" oldref="3">Create</paragraph>
+<paragraph role="heading" id="hd_id3147350" xml-lang="en-US" level="2" l10n="CHG" oldref="3">New sheet</paragraph>
<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW">Creates a new sheet. Enter a sheet name in the <emph>Name</emph> field. Allowed characters are letters, numbers, spaces, and the underline character.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT" id="bm_id3153157" localize="false"/>
-<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="27">No. of Sheets</paragraph>
+<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="CHG" oldref="27">No. of sheets</paragraph>
<paragraph role="paragraph" id="par_id3148457" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT">Specifies the number of sheets to be created.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME" id="bm_id3154510" localize="false"/>
<paragraph role="heading" id="hd_id3149379" xml-lang="en-US" level="3" l10n="U" oldref="7">Name</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05070000.xhp b/helpcontent2/source/text/scalc/01/05070000.xhp
index 9f82558d62..85f0d291a0 100644
--- a/helpcontent2/source/text/scalc/01/05070000.xhp
+++ b/helpcontent2/source/text/scalc/01/05070000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,9 +38,6 @@
</history>
</meta>
<body>
-
-
- <bookmark xml-lang="en-US" branch="hid/.uno:PageFormatDialog" id="bm_id2129266" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:PageFormatDialog" xml-lang="en-US" id="bm_id3153561"/><paragraph role="heading" level="1" id="hd_id3157910" l10n="U" xml-lang="en-US" oldref="1">Page Style</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3156023" xml-lang="en-US" oldref="2"><variable id="seitetext"><ahelp hid=".uno:PageFormatDialog" visibility="visible">Opens a dialog where you can define the appearance of all pages in your document.</ahelp></variable></paragraph>
<section id="howtoget">
@@ -53,6 +50,6 @@
<embed href="text/shared/01/05040300.xhp#kopfzeile"/>
<embed href="text/shared/01/05040400.xhp#fusszeile"/>
<embed href="text/scalc/01/05070500.xhp#tabelle"/>
- <embed href="text/shared/00/00000001.xhp#zurueck"/>
+ <embed href="text/shared/00/00000001.xhp#zurueck2"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12090100.xhp b/helpcontent2/source/text/scalc/01/12090100.xhp
index 9d7a90b2e7..0d3718bd67 100644
--- a/helpcontent2/source/text/scalc/01/12090100.xhp
+++ b/helpcontent2/source/text/scalc/01/12090100.xhp
@@ -60,7 +60,7 @@
<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_DATABASE">Uses a table or query in a database that is registered in $[officename] as the data source for the DataPilot table.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL" id="bm_id3153876" localize="false"/>
<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="3" l10n="U" oldref="11">External source/interface</paragraph>
-<paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_EXTERNAL">Opens the <emph>External Source </emph>dialog where you can select the <link href="text/shared/00/00000005.xhp" name="OLAP">OLAP</link> data source for the DataPilot table.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid=".">Opens the <emph>External Source</emph> dialog where you can select the OLAP data source for the DataPilot table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10670" xml-lang="en-US" l10n="NEW"><link href="text/scalc/01/12090102.xhp" name="DataPilot dialog">DataPilot dialog</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp
index 270a52c51b..a6b4cd96b0 100644
--- a/helpcontent2/source/text/scalc/02/06040000.xhp
+++ b/helpcontent2/source/text/scalc/02/06040000.xhp
@@ -34,10 +34,6 @@
<title id="tit" xml-lang="en-US">Function</title>
<filename>/text/scalc/02/06040000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-10T11:09:26">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="funktion">
@@ -48,7 +44,7 @@
<paragraph role="heading" id="hd_id3150084" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/02/06040000.xhp" name="Function">Function</link></paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_INSWIN_FUNC">Adds a formula to the current cell. Click this icon, and then enter the formula in the <emph>Input line</emph>.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="3">This icon is only available when the <emph>Input line</emph> box is hidden.</paragraph>
+<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="CHG" oldref="3">This icon is only available when the <emph>Input line</emph> box is not active.</paragraph>
<section id="syfunktion">
<table id="tbl_id3154684">
<tablerow>
diff --git a/helpcontent2/source/text/scalc/guide/borders.xhp b/helpcontent2/source/text/scalc/guide/borders.xhp
index f1b32ec60c..160840f2b5 100755
--- a/helpcontent2/source/text/scalc/guide/borders.xhp
+++ b/helpcontent2/source/text/scalc/guide/borders.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidebordersxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">User Defined Borders in Cells </title>
- <filename>text/scalc/guide/borders.xhp</filename>
+ <filename>/text/scalc/guide/borders.xhp</filename>
</topic>
</meta>
<body>
diff --git a/helpcontent2/source/text/scalc/guide/calculate.xhp b/helpcontent2/source/text/scalc/guide/calculate.xhp
index c764a0b755..564da5d59f 100644
--- a/helpcontent2/source/text/scalc/guide/calculate.xhp
+++ b/helpcontent2/source/text/scalc/guide/calculate.xhp
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--
-***********************************************************************
+<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
+<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,55 +24,47 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************
- -->
-
-
+ ************************************************************************ -->
+
<meta>
- <topic id="textscalcguidecalculatexml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Calculating in Spreadsheets</title>
- <filename>/text/scalc/guide/calculate.xhp</filename>
- </topic>
- </meta>
- <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150791"><bookmark_value>spreadsheets; calculating</bookmark_value>
- <bookmark_value>calculating; spreadsheets</bookmark_value>
- <bookmark_value>formulas; calculating</bookmark_value>
+<topic id="textscalcguidecalculatexml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">Calculating in Spreadsheets</title>
+<filename>text/scalc/guide/calculate.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150791">
+<bookmark_value>spreadsheets; calculating</bookmark_value>
+<bookmark_value>calculating; spreadsheets</bookmark_value>
+<bookmark_value>formulas; calculating</bookmark_value>
</bookmark><comment>mw changed "formulas;..." entry</comment>
-<paragraph xml-lang="en-US" id="hd_id3150791" role="heading" level="1" l10n="U"
- oldref="25"><variable id="calculate"><link href="text/scalc/guide/calculate.xhp" name="Calculating in Spreadsheets">Calculating in Spreadsheets</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146120" role="paragraph" l10n="CHG" oldref="6">The following is an example of a calculation in $[officename] Calc.</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153951" role="listitem" l10n="CHG" oldref="7">Click in a cell, and type a number</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10656" role="listitem" l10n="NEW">Press <item type="keycode">Enter</item>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1065D" role="listitem" l10n="NEW">The cursor moves down to the next cell.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155064" role="listitem" l10n="CHG" oldref="9">Enter another number.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN1066F" role="listitem" l10n="NEW">Press the <item type="keycode">Tab</item> key.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10676" role="listitem" l10n="NEW">The cursor moves to the right into the next cell.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154253" role="listitem" l10n="CHG" oldref="10">Type in a formula, for example, <item type="literal">=A3 * A4 / 100.</item>
-</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN1068B" role="listitem" l10n="NEW"> Press <item type="keycode">Enter</item>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147343" role="listitem" l10n="U" oldref="20">The result of the formula appears in the cell. If you want, you can edit the formula in the input line of the Formula bar.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155378" role="listitem" l10n="U" oldref="12">When you edit a formula, the new result is calculated automatically.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
- <embed href="text/scalc/guide/calc_date.xhp#calc_date"/>
- <embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
- <embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/>
- <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
- </section>
- </body>
+<paragraph id="hd_id3150791" role="heading" xml-lang="en-US" level="1"><variable id="calculate"><link href="text/scalc/guide/calculate.xhp" name="Calculating in Spreadsheets">Calculating in Spreadsheets</link></variable></paragraph>
+<paragraph id="par_id3146120" role="paragraph" xml-lang="en-US">The following is an example of a calculation in $[officename] Calc.</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph id="par_id3153951" role="listitem" xml-lang="en-US">Click in a cell, and type a number</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_idN10656" role="listitem" xml-lang="en-US">Press Enter.</paragraph>
+<paragraph id="par_idN1065D" role="listitem" xml-lang="en-US">The cursor moves down to the next cell.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id3155064" role="listitem" xml-lang="en-US">Enter another number.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_idN1066F" role="listitem" xml-lang="en-US">Press the Tab key.</paragraph>
+<paragraph id="par_idN10676" role="listitem" xml-lang="en-US">The cursor moves to the right into the next cell.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id3154253" role="listitem" xml-lang="en-US">Type in a formula, for example, <item type="literal">=A3 * A4 / 100.</item></paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_idN1068B" role="listitem" xml-lang="en-US"> Press Enter.</paragraph>
+<paragraph id="par_id3147343" role="listitem" xml-lang="en-US">The result of the formula appears in the cell. If you want, you can edit the formula in the input line of the Formula bar.</paragraph>
+<paragraph id="par_id3155378" role="listitem" xml-lang="en-US">When you edit a formula, the new result is calculated automatically.</paragraph>
+</listitem>
+</list>
+<section id="relatedtopics"><embed href="text/scalc/guide/calc_date.xhp#calc_date"/><embed href="text/scalc/guide/calc_series.xhp#calc_series"/><embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/><embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+</section>
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
index 3e5ac91aa7..20082ed7dd 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidedatapilot_edittablexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Editing DataPilot Tables</title>
@@ -50,6 +50,8 @@
<paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="U" oldref="29">To remove a button from the table, just drag it out of the DataPilot table. Release the mouse button when the mouse pointer positioned within the sheet has become a 'not allowed' icon. The button is deleted.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="40">To edit the DataPilot table, click a cell inside the DataPilot table and open the context menu. In the context menu you find the command <emph>Start</emph>, which displays the <emph>DataPilot</emph> dialog for the current DataPilot table.</paragraph>
<paragraph xml-lang="en-US" id="par_id2666096" role="paragraph" l10n="NEW">In the DataPilot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id266609688" role="paragraph" l10n="NEW">You can assign custom display names to fields, field members, subtotals (with some restrictions), and grand totals inside DataPilot tables. A custom display name is assigned to an item by overwriting the original name with another name.</paragraph>
+
<section id="relatedtopics">
<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
<embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
index 65d2663b99..87e7e3ab5c 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--
-***********************************************************************
+<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
+<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,33 +24,54 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************
- -->
-
-
+ ************************************************************************ -->
+
<meta>
- <topic id="textscalcguidedatapilot_filtertablexml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Filtering DataPilot Tables</title>
- <filename>/text/scalc/guide/datapilot_filtertable.xhp</filename>
- </topic>
- </meta>
- <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150792"><bookmark_value>DataPilot function; filtering tables</bookmark_value>
- <bookmark_value>filtering;DataPilot tables</bookmark_value>
-</bookmark><comment>mw deleted "filters;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="1" l10n="U"
- oldref="35"><variable id="datapilot_filtertable"><link href="text/scalc/guide/datapilot_filtertable.xhp" name="Filtering DataPilot Tables">Filtering DataPilot Tables</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="36">You can use filters to remove unwanted data from a DataPilot table.</paragraph><comment>UFI: removed help id</comment>
-<paragraph xml-lang="en-US" id="par_id3150441" role="paragraph" l10n="CHG" oldref="37">Click the <emph>Filter</emph> button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the DataPilot table and select the <emph>Filter</emph> command. The <link href="text/scalc/01/12090103.xhp" name="Filter"><emph>Filter</emph></link> dialog appears. Here you can filter the DataPilot table.</paragraph>
- <section id="relatedtopics">
- <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
- <embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
- <embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
- <embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
- <embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
- <embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
- <embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
- </section>
- </body>
+<topic id="textscalcguidedatapilot_filtertablexml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">Filtering DataPilot Tables</title>
+<filename>/text/scalc/guide/datapilot_filtertable.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150792">
+<bookmark_value>DataPilot function; filtering tables</bookmark_value>
+<bookmark_value>filtering;DataPilot tables</bookmark_value>
+</bookmark>
+<paragraph id="hd_id3150792" role="heading" xml-lang="en-US" level="1"><variable id="datapilot_filtertable"><link href="text/scalc/guide/datapilot_filtertable.xhp" name="Filtering DataPilot Tables">Filtering DataPilot Tables</link></variable></paragraph>
+<paragraph id="par_id3153192" role="paragraph" xml-lang="en-US">You can use filters to remove unwanted data from a DataPilot table.</paragraph>
+<paragraph id="par_id3150441" role="paragraph" xml-lang="en-US">Click the <emph>Filter</emph> button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the DataPilot table and select the <emph>Filter</emph> command. The <link href="text/scalc/01/12090103.xhp" name="Filter"><emph>Filter</emph></link> dialog appears. Here you can filter the DataPilot table.</paragraph>
+<paragraph id="par_id315044199" role="paragraph" xml-lang="en-US">You can also click the arrow on a button in the DataPilot table to show a pop-up window. In this pop-up window, you can edit the visibility settings of the associated field.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph id="par_id0720201001344485" role="paragraph" xml-lang="en-US">The pop-up window displays a list of field members associated with that field. A check box is placed to the left of each field member name. When a field has an alternative display name that differs from its original name, that name is displayed in the list.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344449" role="paragraph" xml-lang="en-US">Enable or disable a checkbox to show or hide the associated field member in the DataPilot table.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344493" role="paragraph" xml-lang="en-US">Enable or disable the <emph>All</emph> checkbox to show all or none of the field members.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344431" role="paragraph" xml-lang="en-US">Select a field member in the pop-up window and click the <item type="menuitem">Show only the current item</item> button to show only the selected field member. All other field members are hidden in the DataPilot table.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344484" role="paragraph" xml-lang="en-US">Select a field member in the pop-up window and click the <item type="menuitem">Hide only the current item</item> button to hide only the selected field member. All other field members are shown in the DataPilot table.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344578" role="paragraph" xml-lang="en-US">Commands enable you to sort the field members in ascending order, descending order, or using a custom sort list.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344584" role="paragraph" xml-lang="en-US">To edit the custom sort lists, open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences
+</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344811" role="paragraph" xml-lang="en-US">The arrow to open the pop-up window is normally black. When the field contains one or more hidden field members, the arrow is blue and displays a tiny square at its lower-right corner.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id0720201001344884" role="paragraph" xml-lang="en-US">You can also open the pop-up window by positioning the cell cursor at the button and pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D.</paragraph>
+</listitem></list>
+<section id="relatedtopics"><embed href="text/scalc/guide/datapilot.xhp#datapilot"/><embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/><embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/><embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/><embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/><embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/><embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
+</section>
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/finding.xhp b/helpcontent2/source/text/scalc/guide/finding.xhp
index d3bafa15c0..6b23d1a583 100644
--- a/helpcontent2/source/text/scalc/guide/finding.xhp
+++ b/helpcontent2/source/text/scalc/guide/finding.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidefindingxhp" indexer="include">
<title id="tit" xml-lang="en-US">Finding and Replacing in Calc</title>
-<filename>text/scalc/guide/finding.xhp</filename>
+<filename>/text/scalc/guide/finding.xhp</filename>
</topic>
</meta>
<body>
diff --git a/helpcontent2/source/text/scalc/guide/multioperation.xhp b/helpcontent2/source/text/scalc/guide/multioperation.xhp
index 3c821540ae..6a0b5cfff8 100755
--- a/helpcontent2/source/text/scalc/guide/multioperation.xhp
+++ b/helpcontent2/source/text/scalc/guide/multioperation.xhp
@@ -49,7 +49,7 @@
</variable></paragraph>
<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="U" oldref="1">Multiple Operations in Columns or Rows</paragraph>
<paragraph role="paragraph" id="par_id4123966" xml-lang="en-US" l10n="NEW">The <item type="menuitem">Data - Multiple Operations</item> command provides a planning tool for "what if" questions. In your spreadsheet, you enter a formula to calculate a result from values that are stored in other cells. Then, you set up a cell range where you enter some fixed values, and the Multiple Operations command will calculate the results depending on the formula.</paragraph>
-<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Formula</emph> field, enter the cell reference to the formula that applies to the data range. In the <emph>Column input cell/Row input cell</emph> field, enter the cell reference to the corresponding cell that is part of the formula. This can be explained best by examples:</paragraph>
+<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Formulas</emph> field, enter the cell reference to the formula that applies to the data range. In the <emph>Column input cell/Row input cell</emph> field, enter the cell reference to the corresponding cell that is part of the formula. This can be explained best by examples:</paragraph>
<paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="3" l10n="U" oldref="7">Examples</paragraph>
<paragraph role="paragraph" id="par_id3153189" xml-lang="en-US" l10n="U" oldref="8">You produce toys which you sell for $10 each. Each toy costs $2 to make, in addition to which you have fixed costs of $10,000 per year. How much profit will you make in a year if you sell a particular number of toys?</paragraph>
<paragraph role="paragraph" id="par_id6478774" xml-lang="en-US" l10n="NEW">
@@ -105,7 +105,7 @@
</list>
<paragraph role="heading" id="hd_id3146139" xml-lang="en-US" level="2" l10n="U" oldref="3">Multiple Operations Across Rows and Columns</paragraph>
<paragraph role="paragraph" id="par_id3148584" xml-lang="en-US" l10n="CHG" oldref="4">
-<item type="productname">%PRODUCTNAME</item> allows you to carry out joint multiple operations for columns and rows in so-called cross-tables. The formula cell has to refer to both the data range arranged in rows and the one arranged in columns. Select the range defined by both data ranges and call the multiple operation dialog. Enter the reference to the formula in the <emph>Formula</emph> field. The <emph>Row input cell</emph> and the <emph>Column input cell</emph> fields are used to enter the reference to the corresponding cells of the formula.</paragraph>
+<item type="productname">%PRODUCTNAME</item> allows you to carry out joint multiple operations for columns and rows in so-called cross-tables. The formula cell has to refer to both the data range arranged in rows and the one arranged in columns. Select the range defined by both data ranges and call the multiple operation dialog. Enter the reference to the formula in the <emph>Formulas</emph> field. The <emph>Row input cell</emph> and the <emph>Column input cell</emph> fields are used to enter the reference to the corresponding cells of the formula.</paragraph>
<paragraph role="heading" id="hd_id3149949" xml-lang="en-US" level="3" l10n="U" oldref="57">Calculating with Two Variables</paragraph>
<paragraph role="paragraph" id="par_id3154808" xml-lang="en-US" l10n="U" oldref="58">Consider columns A and B of the sample table above. You now want to vary not just the quantity produced annually, but also the selling price, and you are interested in the profit in each case.</paragraph>
<paragraph role="paragraph" id="par_id3149731" xml-lang="en-US" l10n="CHG" oldref="59">Expand the table shown above. D2 thru D11 contain the numbers 500, 1000 and so on, up to 5000. In E1 through H1 enter the numbers 8, 10, 15 and 20.</paragraph>
@@ -117,7 +117,7 @@
<paragraph role="listitem" id="par_id3153620" xml-lang="en-US" l10n="U" oldref="96">Choose <emph>Data - Multiple Operations</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149981" xml-lang="en-US" l10n="U" oldref="97">With the cursor in the <emph>Formulas </emph>field, click cell B5.</paragraph>
+<paragraph role="listitem" id="par_id3149981" xml-lang="en-US" l10n="U" oldref="97">With the cursor in the <emph>Formulas</emph> field, click cell B5.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="CHG" oldref="98">Set the cursor in the <emph>Row input cell</emph> field and click cell B1. This means that B1, the selling price, is the horizontally entered variable (with the values 8, 10, 15 and 20).</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/multitables.xhp b/helpcontent2/source/text/scalc/guide/multitables.xhp
index 420f432c60..927ced0d9d 100644
--- a/helpcontent2/source/text/scalc/guide/multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/multitables.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidemultitablesxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Applying Multiple Sheets</title>
@@ -55,23 +55,33 @@
<paragraph xml-lang="en-US" id="par_id3154731" role="paragraph" l10n="CHG" oldref="4">Choose <item type="menuitem">Insert - Sheet</item> to insert a new sheet or an existing sheet from another file.</paragraph>
</listitem>
</list>
+
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_EVENTS" id="bm_id906582498" localize="false"/><comment>Sheet Events</comment>
+<paragraph xml-lang="en-US" id="par_id05092009140203598" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog box where you can assign macros to sheet events.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_MENU_SET_TAB_BG_COLOR" id="bm_id906582434" localize="false"/><comment>Tab Color</comment>
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_SET_TAB_BG_COLOR" id="bm_id9016345434" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id05092009140203523" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a window where you can assign a color to the sheet tab.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/.uno:TableSelectAll" id="bm_id9065824" localize="false"/>
<paragraph xml-lang="en-US" id="par_id050920091402035" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select all sheets in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:TableDeselectAll" id="bm_id9065825" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0509200914020391" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to deselect all sheets in the document, except the current sheet.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3154491" role="heading" level="2" l10n="U"
oldref="11">Selecting Multiple Sheets</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl </defaultinline></switchinline>you can select multiple sheets.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="CHG">You can use Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down to select multiple sheets using the keyboard.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2" l10n="U"
oldref="12">Undoing a Selection</paragraph>
- <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. The sheet that is currently visible cannot be removed from the selection.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="2" l10n="CHG"
oldref="15">Calculating Across Multiple Sheets</paragraph>
<paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="CHG" oldref="16">You can refer to a range of sheets in a formula by specifying the first and last sheet of the range, for example, <item type="literal">=SUM(Sheet1.A1:Sheet3.A1) </item>sums up all A1 cells on Sheet1 through Sheet3.</paragraph>
+
+
<section id="relatedtopics">
<embed href="text/scalc/guide/multi_tables.xhp#multi_tables"/>
<embed href="text/scalc/guide/edit_multitables.xhp#edit_multitables"/>
diff --git a/helpcontent2/source/text/scalc/guide/rename_table.xhp b/helpcontent2/source/text/scalc/guide/rename_table.xhp
index f43a5d288f..b80c07a946 100644
--- a/helpcontent2/source/text/scalc/guide/rename_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/rename_table.xhp
@@ -51,7 +51,7 @@
<paragraph xml-lang="en-US" id="par_id3155131" role="listitem" l10n="U" oldref="12">Click the name of the sheet that you want to change.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3146976" role="listitem" l10n="U" oldref="13">Open the context menu and choose the <emph>Rename</emph> command. A dialog box appears where you can enter a new name.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146976" role="listitem" l10n="U" oldref="13">Open the context menu and choose the <emph>Rename Sheet</emph> command. A dialog box appears where you can enter a new name.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="15">Enter a new name for the sheet and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/row_height.xhp b/helpcontent2/source/text/scalc/guide/row_height.xhp
index 6b658b9403..f5a8a9a0e6 100644
--- a/helpcontent2/source/text/scalc/guide/row_height.xhp
+++ b/helpcontent2/source/text/scalc/guide/row_height.xhp
@@ -70,7 +70,7 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3166432" xml-lang="en-US" l10n="U" oldref="9">Start the context menu on the header at the left-hand side.</paragraph>
-<paragraph role="listitem" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="10">You will see the commands <emph>Height</emph> and <emph>Optimal row height</emph>. Choosing either opens a dialog.</paragraph>
+<paragraph role="listitem" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="10">You will see the commands <emph>Row Height</emph> and <emph>Optimal row height</emph>. Choosing either opens a dialog.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/text_rotate.xhp b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
index 65f5fc35bc..634bf62801 100755
--- a/helpcontent2/source/text/scalc/guide/text_rotate.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidetext_rotatexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Rotating Text</title>
@@ -55,7 +55,7 @@
<paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="U" oldref="4">Click the <emph>Alignment</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147426" role="listitem" l10n="U" oldref="5">In the <emph>Text direction</emph> area use the mouse to select in the preview wheel the direction in which the text is to be rotated. Click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147426" role="listitem" l10n="CHG" oldref="5">In the <emph>Text orientation</emph> area use the mouse to select in the preview wheel the direction in which the text is to be rotated. Click <emph>OK</emph>.</paragraph>
</listitem>
</list><comment>removed a wrong para, i104207</comment>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/value_with_name.xhp b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
index cbc431b0f4..5cb9169e04 100755
--- a/helpcontent2/source/text/scalc/guide/value_with_name.xhp
+++ b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidevalue_with_namexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Naming Cells</title>
@@ -69,6 +69,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id328989" role="paragraph" l10n="NEW">Names must not be the same as cell references. For example, the name A1 is invalid because A1 is a cell reference to the top left cell.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id32898987" role="paragraph" l10n="NEW">Names must not start with the letter R followed by a number. See the ADDRESS function for more information.</paragraph>
<paragraph xml-lang="en-US" id="par_id4769737" role="paragraph" l10n="NEW">Names for cell ranges must not include blanks. Blanks are allowed within names for single cells, sheets and documents.</paragraph>
<paragraph xml-lang="en-US" id="hd_id1226233" role="heading" level="2" l10n="NEW">Naming cells and formulas</paragraph>
<paragraph xml-lang="en-US" id="par_id5489364" role="paragraph" l10n="NEW">A good way of making the references to cells and cell ranges in formulas legible is to give the ranges names. For example, you can name the range A1:B2 <emph>Start</emph>. You can then write a formula such as "=SUM(Start)". Even after you insert or delete rows or columns, $[officename] still correctly assigns the ranges identified by name. Range names must not contain any spaces.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index 789e8a457c..287341b8dd 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -56,13 +56,13 @@
</bookmark>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">About Import and Export Filters</paragraph>
<paragraph role="paragraph" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="2">In $[officename], apart from its own <link href="text/shared/00/00000021.xhp" name="XML formats">XML formats</link> you can also open and save many foreign XML formats.</paragraph>
-<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
+<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
</caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="3" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">
</caseinline><caseinline select="DRAW">
@@ -82,7 +82,6 @@
</caseinline><defaultinline>It is also possible to import and export <link href="text/shared/00/00000005.xhp#rtf" name="RTF">RTF</link> files. This file format can be used to exchange formatted texts across various applications and platforms. In this way, many formats read by most programs will be transferred without a problem. The clipboard uses RTF format when you insert part of a spreadsheet from $[officename] Calc through <link href="text/shared/00/00000005.xhp" name="DDE">DDE</link> into $[officename] Writer.</defaultinline></switchinline></paragraph>
<paragraph role="tip" id="par_id3151378" xml-lang="en-US" l10n="U" oldref="237">The filter <emph>Text Encoded</emph> helps you open and save text documents with another encoding font. The filter opens a dialog that enables you to select character set, default fonts, language and paragraph break.</paragraph>
<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Importing and Exporting in HTML Format </paragraph>
-<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="12">When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.<comment>still true? this para is very old.</comment></paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
@@ -101,7 +100,7 @@
</list>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="CHG" oldref="14">If MS Internet Explorer or $[officename] Writer are set as the export option, the sizes of the control field and their internal margins are exported as styles (print formats). CSS1 size properties are based on "width" and "height" values. The "Margin" property is used to set equal margins on all sides of the page. To allow different margins, the "Margin-Left", "Margin-Right", "Margin-Top" and "Margin-Bottom" properties are used.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="CHG" oldref="15">The distances of graphics and Plug-Ins to the content can be set individually for export to $[officename] Writer and MS Internet Explorer. If the top/bottom or right/left margin is set differently, the distances are exported in a "STYLE" option for the corresponding tag as CSS1 size properties "Margin-Top", "Margin-Bottom", "Margin-Left" and "Margin-Right".</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
@@ -184,7 +183,7 @@
<paragraph role="paragraph" id="par_id3144441" xml-lang="en-US" l10n="U" oldref="106">When you import an EPS file, a preview of the graphic is displayed in the document. If a preview is not available, a placeholder corresponding to the size of the graphic is displayed in the document. Under Unix and Microsoft Windows you can print the imported file by using a PostScript printer. <switchinline select="sys"><caseinline select="UNIX">
</caseinline><defaultinline>If a different printer is used the preview will be printed.</defaultinline></switchinline> When exporting EPS graphics, a preview is created and has the TIFF or EPSI format. If an EPS graphic together with other graphics is exported in the EPS format then this file will be embedded unchanged in the new file.</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="222">Multipage-TIFFs are allowed when graphics are imported or exported in TIFF format. The graphics are retrieved as a set of individual pictures in a single file, for example, the individual pages of a fax.</paragraph>
-<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="109">Some $[officename] Draw and $[officename] Impress options can be accessed through <emph>File - Export</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="CHG" oldref="109">Some $[officename] Draw and $[officename] Impress options can be accessed through <emph>File - Export</emph>. See <link href="text/shared/00/00000200.xhp" name="Graphics Export Options">Graphics Export Options</link> for more information.</paragraph>
<paragraph role="heading" id="hd_id3153213" xml-lang="en-US" level="3" l10n="U" oldref="228">PostScript</paragraph>
<paragraph role="paragraph" id="par_id3156444" xml-lang="en-US" l10n="U" oldref="229">To export a document or graphic in PostScript format:</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/00/00000200.xhp b/helpcontent2/source/text/shared/00/00000200.xhp
new file mode 100755
index 0000000000..4079f9f663
--- /dev/null
+++ b/helpcontent2/source/text/shared/00/00000200.xhp
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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="textshared0000000200xml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">Graphics Export Options</title>
+<filename>/text/shared/00/00000200.xhp</filename>
+</topic>
+</meta>
+<body>
+
+<paragraph role="heading" level="1" id="hd_id3150127" l10n="NEW" xml-lang="en-US">Graphics Export Options</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3160463" xml-lang="en-US"><ahelp hid="." visibility="visible">Defines graphics export options.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#exportgraphic"/>
+</section>
+<paragraph role="paragraph" id="par_id1" l10n="NEW" xml-lang="en-US">When you export graphical elements to a file, you can select the file type. For most supported file types a dialog opens where you can setup export options.</paragraph>
+<paragraph role="paragraph" id="par_id2" l10n="NEW" xml-lang="en-US">The following file types do not show an options dialog: PWP, RAS, SVG, TIFF, XPM.</paragraph>
+<paragraph role="paragraph" id="par_id3" l10n="NEW" xml-lang="en-US">The other file types show options dialogs where you can set the width and height of the exported image.</paragraph>
+<paragraph role="paragraph" id="par_id4" l10n="NEW" xml-lang="en-US">Depending on the file type, you can specify some more options. Press Shift+F1 and hover over the control to see an extended help text.</paragraph>
+
+<comment>Common controls</comment>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT:LB_SIZEX" id="bm_id31523978" localize="false"/>
+<paragraph l10n="NEW" role="paragraph" id="par_id388" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies the measurement units.</ahelp></paragraph>
+<bookmark branch="hid/svtools:MetricField:DLG_EXPORT:MF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="NEW" xml-lang="en-US">Width</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3154561" xml-lang="en-US"><ahelp hid="." visibility="visible">Specifies the width.</ahelp></paragraph>
+<bookmark branch="hid/svtools:MetricField:DLG_EXPORT:MF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="NEW" xml-lang="en-US">Height</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3147226" xml-lang="en-US"><ahelp hid="." visibility="visible">Specifies the height.</ahelp></paragraph>
+
+<comment>Resolution controls</comment>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT:NF_RESOLUTION" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT:LB_RESOLUTION" id="bm_id3153778" localize="false"/>
+<paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="NEW">Resolution</paragraph>
+<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the image resolution. Select the measurement units from the list box.</ahelp></paragraph>
+
+<paragraph role="heading" id="hd_id3143534" xml-lang="en-US" level="3" l10n="NEW">More options</paragraph>
+<comment>JPEG controls</comment>
+<paragraph role="paragraph" id="par_id10" l10n="NEW" xml-lang="en-US">For JPEG files you can set the color depth and the quality.</paragraph>
+
+<bookmark branch="hid/svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH" xml-lang="en-US" id="bm_id3134024841"/>
+<paragraph l10n="NEW" role="paragraph" id="par_id435923952" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the color depth from 8 bit grayscale or 24 bit true color.</ahelp></paragraph>
+
+<bookmark branch="hid/svtools:NumericField:DLG_EXPORT:NF_COMPRESSION" xml-lang="en-US" id="bm_id315974841"/><comment>Unfortunately, the compression and quality sliders now share the same Help ID. Was UX on vacation?</comment>
+<paragraph l10n="NEW" role="paragraph" id="par_id355152952" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the compression and quality for the export. Choose from a low quality with minimal file size, up to a high quality and big file size. A high compression means a low quality, a low compression means a high quality.</ahelp></paragraph>
+
+<comment>BMP controls</comment>
+<paragraph role="paragraph" id="par_id11" l10n="NEW" xml-lang="en-US">For BMP files you can set the compression and the RLE encoding.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING" id="bm_id3154372" localize="false"/>
+<paragraph role="paragraph" id="par_id312346798" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies RLE (Run Length Encoding) to the BMP graphics.</ahelp></paragraph>
+
+<comment>PBM PGM PPM controls</comment>
+<paragraph role="paragraph" id="par_id12" l10n="NEW" xml-lang="en-US">For PBM, PGM, and PPM files you can set the encoding.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_BINARY" id="bm_id702536" localize="false"/>
+<paragraph role="paragraph" id="par_id344441" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Exports the file in binary format. The resulting file is smaller than a text file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_TEXT" id="bm_id5302591" localize="false"/>
+<paragraph role="paragraph" id="par_id3555783" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Exports the file in ASCII text format. The resulting file is larger than a binary file.</ahelp></paragraph>
+
+<comment>PNG controls</comment>
+<paragraph role="paragraph" id="par_id13" l10n="NEW" xml-lang="en-US">For PNG files you can set the compression and the interlaced mode.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_INTERLACED" id="bm_id5866924" localize="false"/>
+<paragraph role="paragraph" id="par_id35674840" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
+
+<comment>GIF controls</comment>
+<paragraph role="paragraph" id="par_id14" l10n="NEW" xml-lang="en-US">For GIF files you can set the transparency and the interlaced mode.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY" id="bm_id676692504" localize="false"/>
+<paragraph role="paragraph" id="par_id31456456938" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
+
+<comment>EPS controls</comment>
+<paragraph role="paragraph" id="par_id15" l10n="NEW" xml-lang="en-US">For EPS files you can set the preview, the color format, the compression, and the version.</paragraph>
+<paragraph role="paragraph" id="par_id3147779948" xml-lang="en-US" l10n="NEW"><switchinline select="sys">
+<caseinline select="WIN">You must print an EPS file with a PostScript printer. Other printers will only print the embedded preview.</caseinline></switchinline></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF" id="bm_id993153884" localize="false"/>
+<paragraph role="paragraph" id="par_id993155271" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI" id="bm_id993155069" localize="false"/>
+<paragraph role="paragraph" id="par_id993144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file. This format only contains printable characters from the 7-bit ASCII code.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1" id="bm_id993150040" localize="false"/>
+<paragraph role="paragraph" id="par_id993150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="." visibility="hidden">Compression is not available at this level. Select the Level 1 option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2" id="bm_id993149640" localize="false"/>
+<paragraph role="paragraph" id="par_id993159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="." visibility="hidden">Select the Level 2 option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1" id="bm_id319953049" localize="false"/>
+<paragraph role="paragraph" id="par_id319947250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="." visibility="hidden">Exports the file in color.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2" id="bm_id399153346" localize="false"/>
+<paragraph role="paragraph" id="par_id993147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="." visibility="hidden">Exports the file in grayscale tones.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW" id="bm_id315799863" localize="false"/>
+<paragraph role="paragraph" id="par_id399153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE" id="bm_id319947653" localize="false"/>
+<paragraph role="paragraph" id="par_id319952780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Specifies that you do not wish to use compression.</ahelp></paragraph>
+
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="NEW">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000202.xhp b/helpcontent2/source/text/shared/00/00000202.xhp
deleted file mode 100755
index 1014fe03e3..0000000000
--- a/helpcontent2/source/text/shared/00/00000202.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000202xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">JPEG Options</title>
-<filename>/text/shared/00/00000202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149741" xml-lang="en-US" oldref="2"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" visibility="visible">Defines the settings for the import/export of files in JPEG format.</ahelp></paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#jpegspeichern"/>
-</section>
- <paragraph role="heading" level="2" id="hd_id3154689" l10n="U" xml-lang="en-US" oldref="3">Quality</paragraph>
- <paragraph role="paragraph" id="par_id3149877" l10n="U" xml-lang="en-US" oldref="4">Specifies the desired graphic quality.</paragraph>
- <bookmark branch="hid/svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3152952" xml-lang="en-US" oldref="6"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" visibility="visible">Sets the quality for the import/export. The value 1 denotes minimum quality and minimal file size, 100 denotes maximum quality and file size.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3150431" l10n="U" xml-lang="en-US" oldref="7">Color resolution</paragraph>
- <paragraph role="paragraph" id="par_id3155599" l10n="U" xml-lang="en-US" oldref="8">Specifies the desired color resolution.</paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3146938" xml-lang="en-US" oldref="10"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" visibility="visible">Specifies whether to export or import a graphic object in a grayscale.</ahelp></paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149525" xml-lang="en-US" oldref="12"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" visibility="visible">Specifies whether to retain the original colors of the JPEG file when importing or exporting.</ahelp></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153539" xml-lang="en-US" oldref="13">For more details about filters, see <link href="text/shared/00/00000020.xhp" name="Information about Import/Export Filters">Information about Import/Export Filters</link></paragraph>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000203.xhp b/helpcontent2/source/text/shared/00/00000203.xhp
deleted file mode 100755
index bfe46acab4..0000000000
--- a/helpcontent2/source/text/shared/00/00000203.xhp
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000203xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">SVM/WMF/PICT/MET Options</title>
-<filename>/text/shared/00/00000203.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3160463" xml-lang="en-US" oldref="9"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" visibility="visible">Defines the settings for SVM/WMF/PICT/MET export options.</ahelp></paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#svmspeichern"/>
-</section>
- <paragraph role="heading" level="2" id="hd_id3143206" l10n="U" xml-lang="en-US" oldref="2">Mode</paragraph>
- <paragraph role="paragraph" id="par_id3154400" l10n="U" xml-lang="en-US" oldref="10">Specifies the mode for file export.</paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3145356" xml-lang="en-US" oldref="11"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" visibility="visible">Retains the original size.</ahelp></paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3148983" xml-lang="en-US" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" visibility="visible">Specifies whether to modify size.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3156183" l10n="U" xml-lang="en-US" oldref="5">Size</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3149525" l10n="U" oldref="13">Defines the width and height. This is only active if the <emph>Size</emph> option has been selected.</paragraph>
- <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154561" xml-lang="en-US" oldref="14"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" visibility="visible">Specifies the width.</ahelp></paragraph>
- <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147226" xml-lang="en-US" oldref="15"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" visibility="visible">Specifies the height.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="U" oldref="8">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000204.xhp b/helpcontent2/source/text/shared/00/00000204.xhp
deleted file mode 100644
index a7ca9ba42d..0000000000
--- a/helpcontent2/source/text/shared/00/00000204.xhp
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000204xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">BMP Options</title>
-<filename>/text/shared/00/00000204.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T12:49:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
-<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">BMP Options</paragraph>
-<paragraph role="paragraph" id="par_id3149662" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX">Defines the import/export settings for files in BMP format.</ahelp></paragraph>
-<embed href="text/shared/00/00000401.xhp#bmpexport"/>
-<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="2" l10n="U" oldref="2">Color Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3151253" xml-lang="en-US" l10n="U" oldref="11">Specifies the color resolution of the BMP file to be exported.</paragraph>
-<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="22">The <emph>Color Resolution</emph> command also appears on the context menu of a BMP graphic that has been loaded in <item type="productname">%PRODUCTNAME</item> Draw.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS" id="bm_id3153070" localize="false"/>
-<paragraph role="heading" id="hd_id3149200" xml-lang="en-US" level="3" l10n="U" oldref="18">Color Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3150402" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">In the <emph>Color Resolution</emph> list you will find the following color resolution variants:</ahelp></paragraph>
-<paragraph role="heading" id="par_id3150379" xml-lang="en-US" level="4" l10n="U" oldref="37">Original</paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">Retains the original color resolution.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitThreshold" id="bm_id3113193" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitThreshold" id="bm_id3146067" localize="false"/>
-<paragraph role="heading" id="par_id3151299" xml-lang="en-US" level="4" l10n="U" oldref="23">1-Bit Threshold</paragraph>
-<paragraph role="paragraph" id="par_id3148998" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:ConvertTo1BitThreshold">Converts the object to black and white. All brightness levels below the middle value become black, while all above the middle value become white.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitMatrix" id="bm_id1956773" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitMatrix" id="bm_id3153668" localize="false"/>
-<paragraph role="heading" id="par_id3146938" xml-lang="en-US" level="4" l10n="U" oldref="25">1 Bit Dithered</paragraph>
-<paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid=".uno:ConvertTo1BitMatrix">Allows the object to be converted to a grid of black and white dots.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitGrays" id="bm_id4234587" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitGrays" id="bm_id3147285" localize="false"/>
-<paragraph role="heading" id="par_id3154497" xml-lang="en-US" level="4" l10n="U" oldref="27">4-Bit Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:ConvertTo4BitGrays">Allows the object to be converted to a palette of 16 gray scale tones corresponding to the brightness of the original.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitColors" id="bm_id3377324" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitColors" id="bm_id3152372" localize="false"/>
-<paragraph role="heading" id="par_id3146109" xml-lang="en-US" level="4" l10n="U" oldref="29"> 4-Bit Color Palette </paragraph>
-<paragraph role="paragraph" id="par_id3157991" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:ConvertTo4BitColors">Allows the object to be converted to a palette of 16 colors that match the original colors as closely as possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitGrays" id="bm_id1763441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitGrays" id="bm_id3147557" localize="false"/>
-<paragraph role="heading" id="par_id3147226" xml-lang="en-US" level="4" l10n="U" oldref="31">8-Bit Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:ConvertTo8BitGrays">Allows the object to be converted to a palette of 256 gray scale tones corresponding to the brightness of the original.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitColors" id="bm_id3787923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitColors" id="bm_id3153527" localize="false"/>
-<paragraph role="heading" id="par_id3145211" xml-lang="en-US" level="4" l10n="U" oldref="33">8-Bit Color Palette</paragraph>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:ConvertTo8BitColors">Allows the object to be converted to a palette of 256 colors that match the original colors as closely as possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id7877625" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id3154823" localize="false"/>
-<paragraph role="heading" id="par_id3155338" xml-lang="en-US" level="4" l10n="U" oldref="35">24-Bit True Colors</paragraph>
-<paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:ConvertToTrueColor">Allows the object to be converted to a palette of approximately 16 million colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE" id="bm_id3145072" localize="false"/>
-<paragraph role="heading" id="par_id3145313" xml-lang="en-US" level="4" l10n="U" oldref="20">RLE Encoding</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE">Applies RLE (Run Length Encoding) to the BMP graphics</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
-<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="12">Determines the type of export mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
-<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="4">Original</paragraph>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX">Retains the original mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX" id="bm_id3153698" localize="false"/>
-<paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="U" oldref="5">Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX">Allows you to define the resolution for an image. Select the desired DPI from the <emph>Resolution</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
-<paragraph role="heading" id="hd_id3152910" xml-lang="en-US" level="3" l10n="U" oldref="6">Size</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX">Allows you modify the image size by a given measurement.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
-<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
-<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX">Specifies the image width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="8">Height</paragraph>
-<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX">Specifies the image height.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="9">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000205.xhp b/helpcontent2/source/text/shared/00/00000205.xhp
deleted file mode 100755
index b7bac24c75..0000000000
--- a/helpcontent2/source/text/shared/00/00000205.xhp
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000205xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">GIF Options</title>
-<filename>/text/shared/00/00000205.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T10:55:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145759"><bookmark_value>transparency; saving</bookmark_value>
-<bookmark_value>GIF format</bookmark_value>
-</bookmark>
-<!-- removed HID VCL:MODALDIALOG:DLG_EXPORT_GIF -->
-<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">GIF Options</paragraph>
-<paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="VCL:MODALDIALOG:DLG_EXPORT_GIF">In the<emph> GIF Options </emph>dialog, you can select the settings for the export of files in GIF format.</ahelp></paragraph>
-<embed href="text/shared/00/00000401.xhp#gifexport"/>
-<paragraph role="heading" id="hd_id3149877" xml-lang="en-US" level="2" l10n="U" oldref="2">Mode</paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED -->
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id9410382" localize="false"/>
-<paragraph role="heading" id="hd_id3153272" xml-lang="en-US" level="3" l10n="U" oldref="3">Interlaced</paragraph>
-<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED">Specifies whether to use interlaced mode for saving the GIF image.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="2" l10n="U" oldref="8">Drawing objects</paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT -->
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
-<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="3" l10n="U" oldref="10">Save transparency</paragraph>
-<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US" l10n="U" oldref="4">For more information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000208.xhp b/helpcontent2/source/text/shared/00/00000208.xhp
index f4171df4ec..fe47971b17 100644
--- a/helpcontent2/source/text/shared/00/00000208.xhp
+++ b/helpcontent2/source/text/shared/00/00000208.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,6 +53,14 @@
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="45">Import</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET">Specifies the character set to be used in the imported file.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG" id="bm_id315593499" localize="false"/><paragraph role="heading" id="hd_id315478899" xml-lang="en-US" level="3" l10n="NEW">Language</paragraph>
+<paragraph role="paragraph" id="par_id314949588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Determines how the number strings are imported.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id314949587" xml-lang="en-US" l10n="NEW">If Language is set to Default (for CSV import) or Automatic (for HTML import), Calc will use the globally set language. If Language is set to a specific language, that language will be used when importing numbers.</paragraph>
+<paragraph role="paragraph" id="par_id314949586" xml-lang="en-US" l10n="NEW">When importing an HTML document, the Language selection can conflict with the global HTML option <link href="text/shared/optionen/01030500.xhp" name="Use">Use 'English (USA)' locale for numbers</link>. The global HTML option is effective only when the Automatic language option is selected. If you select a specific language in the HTML Import Options dialog, the global HTML option is ignored.</paragraph>
+
+
<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW">Specifies the row where you want to start the import.</ahelp> The rows are visible in the preview window at the bottom of the dialog.</paragraph>
<paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Separator Options</paragraph>
@@ -76,6 +84,23 @@
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE">Combines consecutive delimiters and removes blank data fields.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP">Select a character to delimit text data. You can can also enter a character in the text box.</ahelp></paragraph>
+
+
+
+<paragraph role="heading" id="hd_id315538811" xml-lang="en-US" level="2" l10n="NEW">Other options</paragraph>
+<paragraph role="paragraph" id="par_id315366511" xml-lang="en-US" l10n="NEW">Sets some other import options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_QUOTED_AS_TEXT" id="bm_id315790911" localize="false"/>
+<paragraph role="heading" id="hd_id314847411" xml-lang="en-US" level="3" l10n="NEW">Quoted fields as text</paragraph>
+<paragraph role="paragraph" id="par_id314995711" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, fields or cells whose values are quoted in their entirety (the first and last characters of the value equal the text delimiter) are imported as text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_DETECT_SPECIAL_NUMBER" id="bm_id315790922" localize="false"/>
+<paragraph role="heading" id="hd_id314847422" xml-lang="en-US" level="3" l10n="NEW">Detect special numbers</paragraph>
+<paragraph role="paragraph" id="par_id314995722" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, Calc will automatically detect all number formats, including special number formats such as dates, time, and scientific notation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id314995723" xml-lang="en-US" l10n="NEW">The selected language influences how such special numbers are detected, since different languages and regions many have different conventions for such special numbers.</paragraph>
+<paragraph role="paragraph" id="par_id314995724" xml-lang="en-US" l10n="NEW">When this option is disabled, Calc will detect and convert only decimal numbers. The rest, including numbers formatted in scientific notation, will be imported as text. A decimal number string can have digits 0-9, thousands separators, and a decimal separator. Thousands separators and decimal separators may vary with the selected language and region.</paragraph>
+
+
+
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000212.xhp b/helpcontent2/source/text/shared/00/00000212.xhp
deleted file mode 100755
index 4c5fc36826..0000000000
--- a/helpcontent2/source/text/shared/00/00000212.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">PNG options</title>
-<filename>/text/shared/00/00000212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T10:51:34">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3146060" xml-lang="en-US" level="1" l10n="U" oldref="1">PNG options</paragraph>
-<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="2">Specifies the compression rate and the interlaced mode for saving the image as a <link href="text/shared/00/00000005.xhp#png" name="PNG">PNG</link> file.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#pngspeichern"/>
-</section>
-<paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="2" l10n="U" oldref="7">Mode</paragraph>
-<!-- removed HID VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION -->
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
-<paragraph role="heading" id="hd_id3150672" xml-lang="en-US" level="3" l10n="U" oldref="3">Compression 0..9</paragraph>
-<paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION">Specifies the compression setting from 0 (no compression) to 9 (maximum compression). The calculation time increases with the compression value, while the resulting file is smaller in bytes.</ahelp></paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED -->
-<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id5851924" localize="false"/>
-<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="3" l10n="U" oldref="5">Interlaced</paragraph>
-<paragraph role="paragraph" id="par_id3154840" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000213.xhp b/helpcontent2/source/text/shared/00/00000213.xhp
deleted file mode 100755
index 4eef472d89..0000000000
--- a/helpcontent2/source/text/shared/00/00000213.xhp
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000213xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">EPS Export Options</title>
-<filename>/text/shared/00/00000213.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-17T14:58:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3149976" xml-lang="en-US" level="1" l10n="U" oldref="1">EPS Export Options</paragraph>
-<paragraph role="paragraph" id="par_id3156045" xml-lang="en-US" l10n="U" oldref="2">Defines several export options for EPS files.</paragraph>
-<paragraph role="paragraph" id="par_id3149948" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys">
-<caseinline select="WIN">You must print an EPS file with a PostScript printer. Other printers will only print the embedded preview.
-</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#epsexport"/>
-</section>
-<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="3">Preview</paragraph>
-<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Specifies options for embedded preview for the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
-<paragraph role="heading" id="hd_id3145348" xml-lang="en-US" level="3" l10n="U" oldref="5">Image preview (TIFF)</paragraph>
-<paragraph role="paragraph" id="par_id3155271" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
-<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="3" l10n="U" oldref="29">Interchange (EPSI)</paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file.</ahelp> This format only contains printable characters from the 7-bit ASCII code.</paragraph>
-<paragraph role="heading" id="hd_id3159224" xml-lang="en-US" level="2" l10n="U" oldref="9">Version</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="10">Determines the PostScript level for exporting the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
-<paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="3" l10n="U" oldref="11">Level 1</paragraph>
-<paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1">Compression is not available at this level. Select the<emph> Level 1 </emph>option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
-<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="3" l10n="U" oldref="13">Level 2</paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2">Select the<emph> Level 2 </emph>option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147261" xml-lang="en-US" level="2" l10n="U" oldref="15">Color format</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="16">The <emph>Color format</emph> option gives you the choice between exporting in color or in grayscale.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="3" l10n="U" oldref="17">Color</paragraph>
-<paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR">Exports the file in color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="19">Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE">Exports the file in grayscale tones.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="21">Compression</paragraph>
-<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="22">Specifies whether the data is exported with compression.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
-<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="23">LZW encoding</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm invented by Abraham Lempel, Jacob Ziv, and Terry Welch. If you choose to activate this, select the<emph> LZW encoding </emph>option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
-<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="25">None</paragraph>
-<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE">Specifies that you do not wish to use compression.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000214.xhp b/helpcontent2/source/text/shared/00/00000214.xhp
deleted file mode 100755
index 570cde3d5f..0000000000
--- a/helpcontent2/source/text/shared/00/00000214.xhp
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textshared0000000214xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">PBM/PPM/PGM Options</title>
-<filename>/text/shared/00/00000214.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T11:01:02">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3156116" xml-lang="en-US" level="1" l10n="U" oldref="1">PBM/PPM/PGM Options</paragraph>
-<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="2">Select the file format for the file to be exported. This dialog appears when exporting in the <emph>Portable Bitmap (PBM)</emph>, <emph>Portable Pixelmap (PPM)</emph> and <emph>Portable Graymap (PGM)</emph> format.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#pbmppmpgm"/>
-</section>
-<paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="3">File format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW" id="bm_id9971617" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW" id="bm_id9391460" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW" id="bm_id702536" localize="false"/>
-<paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="3" l10n="U" oldref="5">Binary</paragraph>
-<paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Exports the file in binary format. The resulting file is smaller than a (ASCII) text file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII" id="bm_id3917661" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII" id="bm_id1909543" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII" id="bm_id5302591" localize="false"/>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
-<paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid=".">Exports the file in the ASCII text format. This file type is larger than a binary.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 54f65d415c..215a3c45d0 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -247,14 +247,6 @@
</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>
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically
-</variable></paragraph>
<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard
@@ -269,11 +261,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens
+<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="NEW"><variable id="exportgraphic">Choose <emph>File - Export</emph>, select a graphics file type, dialog opens automatically
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154901" xml-lang="en-US" l10n="U" oldref="58"><variable id="saveall">Choose <emph>File - Save All</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 6e26a5989c..3e5793730b 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,35 +29,31 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0000040501xml" indexer="exclude" status="PUBLISH">
<title id="tit" xml-lang="en-US">Format Menu</title>
<filename>/text/shared/00/00040501.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-19T12:25:31">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<paragraph role="paragraph" id="par_id3150156" xml-lang="en-US" l10n="CHG" oldref="94"><variable id="aupitab">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field.
+<paragraph role="paragraph" id="par_id3150156" xml-lang="en-US" l10n="CHG" oldref="94"><variable id="aupitab">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154408" xml-lang="en-US" l10n="CHG" oldref="119"><variable id="aupitab1">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. No database connection in current form is allowed.
+<paragraph role="paragraph" id="par_id3154408" xml-lang="en-US" l10n="CHG" oldref="119"><variable id="aupitab1">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. No database connection in current form is allowed.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="120"><variable id="aupitab2">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. Database connection must exist.
+<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="120"><variable id="aupitab2">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. Database connection must exist.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="CHG" oldref="95"><variable id="aupikomli">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form.
+<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="CHG" oldref="95"><variable id="aupikomli">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148825" xml-lang="en-US" l10n="CHG" oldref="121"><variable id="aupikomli1">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 1.
+<paragraph role="paragraph" id="par_id3148825" xml-lang="en-US" l10n="CHG" oldref="121"><variable id="aupikomli1">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 1.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="CHG" oldref="122"><variable id="aupikomli2">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 2.
+<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="CHG" oldref="122"><variable id="aupikomli2">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 2.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="123"><variable id="aupikomli3a">Open Form Controls toolbar, click <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
+<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="123"><variable id="aupikomli3a">Open Form Controls toolbar, click <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="CHG" oldref="124"><variable id="aupikomli3b">Open Form Controls toolbar, click <emph>Combo Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
+<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="CHG" oldref="124"><variable id="aupikomli3b">Open Form Controls toolbar, click <emph>Combo Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
</variable></paragraph>
<section id="kontroll">
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="CHG" oldref="2">Open <emph>Toolbox</emph> bar in Basic dialog editor, click</paragraph>
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index 098d531d6e..9c8aef8002 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -55,17 +55,11 @@ XHPFILES = \
00000020.xhp \
00000021.xhp \
00000099.xhp \
- 00000202.xhp \
- 00000203.xhp \
- 00000204.xhp \
- 00000205.xhp \
+ 00000200.xhp \
00000206.xhp \
00000207.xhp \
00000208.xhp \
00000210.xhp \
- 00000212.xhp \
- 00000213.xhp \
- 00000214.xhp \
00000215.xhp \
00000401.xhp \
00000402.xhp \
diff --git a/helpcontent2/source/text/shared/01/01100600.xhp b/helpcontent2/source/text/shared/01/01100600.xhp
index 5e05bd2909..f9b55e439d 100644
--- a/helpcontent2/source/text/shared/01/01100600.xhp
+++ b/helpcontent2/source/text/shared/01/01100600.xhp
@@ -56,22 +56,27 @@
<comment>
<paragraph role="heading" id="hd_id31499" xml-lang="en-US" level="2" l10n="NEW">File encryption</paragraph>
<paragraph role="paragraph" id="hd_id31499A" xml-lang="en-US" l10n="NEW">The password to open the current document can be set in the Properties dialog on the Security tab page. You can also set a password to open the document when you save the document. Check the Save with password option on the Save As dialog, and enter the password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN" id="bm_id31540239" localize="false"/>
<paragraph role="heading" id="par_idN106AA1" xml-lang="en-US" level="3" l10n="NEW">Enter password to open</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502B" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN" id="bm_id092822204190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA2" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100E" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options</paragraph>
<paragraph role="paragraph" id="hd_id31499F" xml-lang="en-US" l10n="NEW">The password to edit the current document can be set in the Properties dialog on the Security tab page. Currently this option is evaluated for documents in some Microsoft file formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY" id="bm_id3151240239" localize="false"/>
<paragraph role="heading" id="par_idN106AA3" xml-lang="en-US" level="3" l10n="NEW">Enter password to allow editing</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502H" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id0923337190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA4" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100J" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY" id="bm_id09553676" localize="false"/>
</comment>
<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY" id="bm_id8295846" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 71dadfdd8b..c68e45bfdd 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">List of Regular Expressions</title>
@@ -337,6 +337,11 @@
</table>
<paragraph xml-lang="en-US" id="hd_id5311441" role="heading" level="2" l10n="NEW">Examples</paragraph>
+
+<paragraph xml-lang="en-US" id="par_id956834773" role="paragraph" l10n="NEW">e([:digit:])? -- finds 'e' followed by zero or one digit. Note that currently all named character classes like [:digit:] must be enclosed in parentheses.<comment>issue 64368 and 113035</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id952368773" role="paragraph" l10n="NEW">^([:digit:])$ -- finds lines or cells with exactly one digit.</paragraph>
+
+
<paragraph xml-lang="en-US" id="par_id9568773" role="paragraph" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
<paragraph xml-lang="en-US" id="hd_id71413" role="heading" level="3" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id2924283" role="code" l10n="NEW">^[:digit:]{3}$</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index ec7439049a..a984a1ada5 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -60,6 +60,15 @@
<paragraph xml-lang="en-US" id="par_id3143270" role="note" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10646" role="paragraph" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+
+<switch select="sys">
+<case select="WIN">
+<paragraph xml-lang="en-US" id="par_idN1099856" role="warning" 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 xml-lang="en-US" id="hd_id3155503" role="heading" level="2" l10n="U" oldref="3">Source file</paragraph>
<paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155449" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 180c4128b3..13d020487f 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
@@ -60,13 +60,13 @@
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
oldref="20">Optimal</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
oldref="22">Fit width and height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
@@ -75,6 +75,7 @@
<paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
@@ -91,6 +92,8 @@
<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
+
<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index a0bc05f9d8..a712322b4b 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0104160500xml" indexer="include" status="PUBLISH">
@@ -46,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id9760166" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id3153136" localize="false"/>
<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Floating Frame</paragraph>
-<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".uno:InsertObjectFloatingFra">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file. Floating frames are not supported by Netscape Navigator 4.x.</ahelp>
+<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index ac9959af27..b953e4c145 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105340300xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
@@ -50,7 +50,7 @@
<embed href="text/shared/00/00040503.xhp#fozelaus"/>
</section>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
-<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="54">Horizontal</paragraph>
+<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="2" l10n="U" oldref="54">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="57">Aligns numbers to the right, and text to the left.</paragraph>
@@ -78,10 +78,10 @@
<paragraph role="heading" id="par_idN1079C" xml-lang="en-US" level="3" l10n="NEW">Filled</paragraph>
<paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
-<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="3" l10n="U" oldref="41">Indent</paragraph>
+<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="41">Indent</paragraph>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
-<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="66">Vertical</paragraph>
+<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="66">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Aligns the cell contents to the bottom of the cell.</ahelp></paragraph><comment>UFI: removed two help ids</comment>
@@ -105,7 +105,7 @@
</variable></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00000004.xhp#syvertikalmitte"/>
-<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="U" oldref="51">Text Direction</paragraph>
+<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="CHG" oldref="51">Text orientation</paragraph>
<paragraph role="paragraph" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:AlignVCenter">Sets the text orientation of the cell contents.</ahelp></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/scalc/guide/text_rotate.xhp#text_rotate"/>
@@ -114,7 +114,7 @@
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
-<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="U" oldref="45">Angle</paragraph>
+<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="CHG" oldref="45">Degrees</paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
<paragraph role="heading" id="hd_id3150497" xml-lang="en-US" level="3" l10n="U" oldref="75">Reference edge</paragraph>
@@ -140,7 +140,7 @@
<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="U" oldref="43">Text flow</paragraph>
+<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="CHG" oldref="43">Properties</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
<paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp
index 3de74ac52f..4d80ae6b95 100644
--- a/helpcontent2/source/text/shared/01/06140500.xhp
+++ b/helpcontent2/source/text/shared/01/06140500.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -55,10 +55,15 @@
<paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVX_MACRO_LB_EVENT" id="bm_id1800286" localize="false"/><paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid="40000">The big list box lists the events and the assigned macros. After you selected the location in the <emph>Save In</emph> list box, select an event in the big list box. Then click <emph>Assign Macro</emph>.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN" id="bm_id755672891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/>
+<paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN">Opens the <link href="text/shared/01/06130000.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE" id="bm_id9109164341" localize="false"/>
+<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE">Deletes the macro assignment for the selected event.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/05060700.xhp" name="List of events">List of events</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index 9b4ff2c6f0..5d98da224d 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Digital Signatures</title>
@@ -56,9 +56,9 @@
<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
<paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
- </image> indicates a valid digital signature, while the Exclamation mark icon
+ </image> indicates a valid digital signature, while the Exclamation mark icon
<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
</image> indicates an invalid digital signature.</paragraph>
<paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
@@ -66,7 +66,7 @@
<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
<paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Sign Document</paragraph>
<paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 9fb107b460..d45a6806fd 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -46,6 +46,7 @@
<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/SC_HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
+
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
oldref="65">Password</paragraph>
@@ -53,12 +54,17 @@
<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/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
+
<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
oldref="66">Confirm</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
oldref="68">Undoing password protection</paragraph>
<paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE" id="bm_id09233676" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id31323250502" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to show or hide the file sharing password options.</ahelp></paragraph>
+
+
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 345add3b07..9eac0c77ee 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -58,7 +58,7 @@
</section>
<paragraph xml-lang="en-US" id="hd_id746482" role="heading" 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 xml-lang="en-US" id="hd_id3148520" role="heading" level="2" l10n="CHG"
- oldref="2">Pages</paragraph>
+ oldref="2">Range</paragraph>
<paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL" id="bm_id1033967" localize="false"/>
@@ -67,7 +67,7 @@
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE" id="bm_id2618793" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter:Edit:RID_PDF_TAB_GENER:ED_PAGES" id="bm_id2676778" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="U" oldref="6">Range</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="CHG" oldref="6">Pages</paragraph>
<paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION -->
@@ -121,13 +121,17 @@
<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
<paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" 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 xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+ <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" 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_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES" id="bm_id3992267" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
<paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES -->
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
<paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" 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_EMBEDSTANDARDFONTS" id="bm_id50656619" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3954548" role="heading" level="2" l10n="NEW">Embed standard fonts</paragraph>
+<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
<paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">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>
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index e0f1bd7cf9..c2a7edc0f4 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0210100000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Close</title>
+<title id="tit" xml-lang="en-US">Close Window</title>
<filename>/text/shared/02/10100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-18T16:14:34">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schliessen">
<bookmark xml-lang="en-US" branch="hid/.uno: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 <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>
+<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 Window">Close Window</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 Window</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/colortoolbar.xhp b/helpcontent2/source/text/shared/02/colortoolbar.xhp
index 848abad730..f8607e3ce3 100755
--- a/helpcontent2/source/text/shared/02/colortoolbar.xhp
+++ b/helpcontent2/source/text/shared/02/colortoolbar.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared02colortoolbarxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Color</title>
-<filename>text/shared/02/colortoolbar.xhp</filename>
+<filename>/text/shared/02/colortoolbar.xhp</filename>
</topic>
<history>
<created date="2005-07-19T14:02:35">Color toolbar from Picture bar</created>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 6331b326ca..e7e0b4e325 100644
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -48,7 +48,7 @@
<section id="howtoget">
<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 older versions, 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_id3150775" xml-lang="en-US" l10n="CHG" oldref="3">The wizard converts binary documents and templates from older versions, 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>
<embed href="text/shared/autopi/01130100.xhp#seite1"/>
<embed href="text/shared/autopi/01130200.xhp#seite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 62e7a7dff3..7a303915a7 100644
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -54,8 +54,8 @@
<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>
-<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>
+<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Seamonkey / 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 Seamonkey 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>
<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>
diff --git a/helpcontent2/source/text/shared/autopi/01170300.xhp b/helpcontent2/source/text/shared/autopi/01170300.xhp
index 1a4020031d..bf5677dfec 100755
--- a/helpcontent2/source/text/shared/autopi/01170300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170300.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,22 +27,18 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01170300xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Select Table</title>
<filename>/text/shared/autopi/01170300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-21T15:39:49">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="tabauswahl">
<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/autopi/01170300.xhp" name="Select Table">Select Table</link></paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies a table from the Mozilla / Netscape 6.x address book source that is used as the address book in $[officename].</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Specifies a table from the Seamonkey / Netscape address book source that is used as the address book in $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#addressimport3"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 01ad9af773..94a4cb08cd 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -49,7 +49,7 @@
<paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" 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_AS_BEFORE_CORRELATION_NAME" id="bm_id6617777328" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
<paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
@@ -93,8 +93,16 @@
<paragraph xml-lang="en-US" id="par_id3837397" role="paragraph" 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 xml-lang="en-US" id="hd_id0909200811170166" role="heading" level="2" l10n="NEW">Ignore currency field information</paragraph>
<paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph" 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>
-<!-- removed HID 39067 -->
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ESCAPE_DATETIME" id="bm_id4743451355" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2" l10n="NEW">Use ODBC conformant date/time literals</paragraph>
- <paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Check to use ODBC conformant date/time literals.</ahelp></paragraph>
- </body>
+<paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="CHG"><ahelp hid=".">Use date/time literals that conform to ODBC standard.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PRIMARY_KEY_SUPPORT" id="bm_id47434523231355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id04092009442139524" role="heading" level="2" l10n="NEW">Supports primary keys</paragraph>
+<paragraph xml-lang="en-US" id="par_id04096620092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Enable to overrule Base's heuristics used to detect whether the database supports primary keys.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id66841631" role="paragraph" l10n="NEW">When connecting to a database using a generic API like ODBC, JDBC, or ADO, Base currently applies heuristics to determine whether this database supports primary keys. None of those APIs has dedicated support to retrieve this information.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841632" role="paragraph" l10n="NEW">The heuristics sometimes fails. This tri-state check box by default is set to the undetermined state, which means "apply the heuristics". If the check box is enabled, primary key support is assumed. If the check box is disabled, no primary key support is assumed.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841633" role="paragraph" l10n="NEW">Note that if this option is just for overruling the heuristics. If you enable the check box for a database which actually does not support primary keys, you will see some errors.</paragraph>
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index ebb3976810..74143f558d 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Wizard</title>
@@ -52,14 +52,14 @@
<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="ordered">
+<list type="unordered">
<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="ordered">
+<list type="unordered">
<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>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 604e7083fa..598b98e938 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Selection</title>
@@ -66,7 +66,7 @@
<bookmark xml-lang="en-US" branch="hid/DBACCESS_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="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Seamonkey 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>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index a154988d03..75e98c6bd6 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -39,6 +39,7 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
+<bookmark_value>Oracle Report Builder</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index cdf29addb4..bdc5f5746e 100755
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,15 +40,15 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>charts; bars with textures</bookmark_value>
<bookmark_value>textures;on chart bars</bookmark_value>
<bookmark_value>inserting;textures on chart bars</bookmark_value>
</bookmark>
<comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="1"><variable id="chart_barformat"><link href="text/shared/guide/chart_barformat.xhp" name="Adding Texture to Chart Bars">Adding Texture to Chart Bars</link>
+ <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="1"><variable id="chart_barformat"><link href="text/shared/guide/chart_barformat.xhp" name="Adding Texture to Chart Bars">Adding Texture to Chart Bars</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3156136" role="paragraph" l10n="U" oldref="3">You can add texture to the bars in a graph or chart (instead of the default colors) via bitmap graphics:</paragraph>
<list type="ordered">
@@ -56,8 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3153748" role="listitem" l10n="U" oldref="4">Enter edit mode by double-clicking on the chart.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149182" role="listitem" l10n="CHG" oldref="5">Double-click on any bar of the bar series you want to edit. All bars of this series are now selected.</paragraph>
- <paragraph xml-lang="en-US" id="par_id720847" role="listitem" l10n="NEW">If you want to edit only one bar, double-click again on that bar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149182" role="listitem" l10n="CHG" oldref="5">Click on any bar of the bar series you want to edit. All bars of this series are now selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id720847" role="listitem" l10n="CHG">If you want to edit only one bar, click again on that bar.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3147275" role="listitem" l10n="U" oldref="6">In the context menu choose <emph>Object Properties</emph>. Then choose the <emph>Area</emph> tab.</paragraph>
@@ -67,11 +67,11 @@
</listitem>
</list>
<section id="relatedtopics">
-
+
<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
<embed href="text/shared/guide/chart_title.xhp#chart_title"/>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 53c48ed5ba..7a1715a469 100755
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidecopytable2applicationxml" indexer="include" status="PUBLISH">
@@ -59,10 +59,10 @@
<paragraph role="listitem" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="11">To copy a cell range into a text document, select the cell range in the sheet and then use either the clipboard or drag-and-drop to insert the cells into the text document. You will then find an OLE object in the text document, which you can edit further.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="12">If you drag cells to the normal view of a presentation document, the cells will be inserted there as an OLE object. If you drag cells into the outline view, each cell will form a line of the outline view. If you just drag the cells you will move the cells. The cells will only be copied if you press the Shift key when dragging.</paragraph>
+<paragraph role="listitem" id="par_id3146957" xml-lang="en-US" l10n="CHG" oldref="12">If you drag cells to the normal view of a presentation document, the cells will be inserted there as an OLE object. If you drag cells into the outline view, each cell will form a line of the outline view.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="13">When you copy a cell range from $[officename] Calc to the clipboard, the drawing objects, OLE objects and charts within this range are also copied. They are also copied when you start a drag-and-drop action. However, the objects will be inserted only if you drop them within the same document.</paragraph>
+<paragraph role="listitem" id="par_id3148538" xml-lang="en-US" l10n="CHG" oldref="13">When you copy a cell range from $[officename] Calc to the clipboard, the drawing objects, OLE objects and charts within this range are also copied.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="14">If you insert a cell range with an enclosed chart, the chart will keep its link to the source cell range only if you copied the chart and the source cell range together.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index f57b9f4824..b4a4b91431 100755
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -52,12 +52,8 @@
<case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
</case>
</switch>
-<switch select="sys">
-<case select="MAC">
-</case>
-<default><embed href="text/shared/optionen/01020300.xhp#email"/>
-</default>
-</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index e734f5ed4b..9bc9fa77bb 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -36,10 +36,6 @@
<title id="tit" xml-lang="en-US">HTML compatibility</title>
<filename>/text/shared/optionen/01030500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:59:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="html">
@@ -100,7 +96,7 @@
<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -->
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="28">Print layout</paragraph>
-<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename] as well as Netscape Navigator from 4.0 and above and by MS Internet Explorer from 4.0 and above.</paragraph>
+<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid=".">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename], Netscape Navigator, and MS Internet Explorer.</paragraph>
<paragraph role="note" id="par_id3156276" xml-lang="en-US" l10n="U" oldref="41">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated.</paragraph>
<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF -->
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 57af9486b8..0a864a28e2 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Calculate</title>
@@ -56,7 +56,7 @@
</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Defines the calculation settings for spreadsheets.</ahelp> Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#exopbe"/>
@@ -217,7 +217,7 @@
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX" id="bm_id3154419" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
oldref="58">Enable regular expressions in formulas</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+ <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
</caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
@@ -225,5 +225,11 @@
<paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
<emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
- </body>
+
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC" id="bm_id315342901" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id315442901" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id315634199" role="heading" level="2" l10n="NEW">Limit decimals for general number format</paragraph>
+<paragraph xml-lang="en-US" id="par_id315343818" role="paragraph" l10n="NEW"><ahelp hid=".">You can specify the maximum number of decimal places that are shown by default for cells with General number format. If not enabled, cells with General number format show as many decimal places as the column width allows.</ahelp></paragraph>
+
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index 57567c6a35..8a851d271e 100644
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -75,7 +75,13 @@
<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
<paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM">Reduces or enlarges the size of the printed formula by a specified enlargement factor.</ahelp> Type the desired enlargement factor directly in the <emph>Scaling</emph> control, or set the value using the arrow buttons.</paragraph>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="19">Other options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Ignore ~ and ' at the end of the line</paragraph>
<paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING">Specifies that these space wildcards will be removed if they are at the end of a line.</ahelp> In earlier versions of $[officename], adding such characters at the end of a line prevented the right edge of the formula from being cut off during printing.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/tobeannounced" id="bm_id34459152" localize="false"/><paragraph role="heading" id="hd_id31567808" xml-lang="en-US" level="3" l10n="NEW">Embed only used symbols (smaller file size)</paragraph>
+<paragraph role="paragraph" id="par_id3789203" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves only those symbols which each formula that are used in that formula.</ahelp> In earlier versions of $[officename], all symbols were saved with each formula.</paragraph>
+
+
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp
index 7dc925d156..963fe57b6d 100755
--- a/helpcontent2/source/text/shared/optionen/01160201.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160201.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,17 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01160201xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Database Link</title>
<filename>/text/shared/optionen/01160201.xhp</filename>
</topic>
-<history>
-<created date="2004-07-29T11:07:57">UFI: Create/Edit Database Link dialog</created>
-<lastedited date="2005-05-12T10:38:24">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Database Link</paragraph>
+<comment>should be New Database Link or Edit Database Link, respective to the button that was clicked</comment>
<paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">Creates or edits an entry in the <link href="text/shared/optionen/01160200.xhp">Databases</link> tab page.</paragraph>
<paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="2" l10n="NEW">Database file</paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter the path and the file name of the database file. The name of the file must end with the *.odb extension.</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/10020000.xhp b/helpcontent2/source/text/simpress/02/10020000.xhp
index e3630930da..0348e1887a 100644
--- a/helpcontent2/source/text/simpress/02/10020000.xhp
+++ b/helpcontent2/source/text/simpress/02/10020000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0210020000xml" indexer="include" status="PUBLISH">
@@ -101,10 +101,9 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id435879" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id3155931" localize="false"/>
<paragraph role="heading" id="hd_id3145167" xml-lang="en-US" level="2" l10n="U" oldref="12">Zoom Out</paragraph>
-<paragraph role="paragraph" id="par_id3153734" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:ZoomIn">Displays the slide at half its current size.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153734" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".">Displays the slide at half its current size.</ahelp></paragraph>
<table id="tbl_id3149882">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -138,7 +137,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPrevious" id="bm_id7891597" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPrevious" id="bm_id3149450" localize="false"/>
<paragraph role="heading" id="hd_id3150964" xml-lang="en-US" level="2" l10n="U" oldref="19">Previous Zoom</paragraph>
-<paragraph role="paragraph" id="par_id3152926" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:ZoomPrevious">Returns the display of the slide to the previous zoom factor you applied.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3152926" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:ZoomPrevious">Returns the display of the slide to the previous zoom factor you applied.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Comma(,).</paragraph>
<table id="tbl_id3151186">
<tablerow>
@@ -156,7 +155,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomNext" id="bm_id3385016" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomNext" id="bm_id3149291" localize="false"/>
<paragraph role="heading" id="hd_id3153151" xml-lang="en-US" level="2" l10n="U" oldref="22">Next Zoom</paragraph>
-<paragraph role="paragraph" id="par_id3143228" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:ZoomNext">Undoes the action of the <emph>Previous Zoom </emph>command.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3143228" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:ZoomNext">Undoes the action of the <emph>Previous Zoom </emph>command.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Period(.).</paragraph>
<table id="tbl_id3151168">
<tablerow>
diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 9b68a790ab..796c02053e 100755
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpressguideindividualxml" indexer="include" status="PUBLISH">
@@ -91,9 +91,10 @@
</list>
<paragraph role="warning" id="par_id3155372" xml-lang="en-US" l10n="U" oldref="68">Do not select this option if you want to run a custom slide show.</paragraph>
<paragraph role="heading" id="hd_id3153922" xml-lang="en-US" level="3" l10n="U" oldref="69">To hide a slide:</paragraph>
+<paragraph role="paragraph" id="par_id883150344" xml-lang="en-US" l10n="NEW">To hide the current slide, click the Hide Slide action button.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3156261" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>View - Slide Sorter</emph>, and then select the slide(s) that you want to hide.</paragraph>
+<paragraph role="listitem" id="par_id3156261" xml-lang="en-US" l10n="CHG" oldref="57">To hide several slides, choose <emph>View - Slide Sorter</emph>, and then select the slide(s) that you want to hide.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3083278" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Slide Show - Show/Hide Slide</emph>.</paragraph>
diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp
index 7f35cd873a..0cae0f12a3 100755
--- a/helpcontent2/source/text/simpress/main0200.xhp
+++ b/helpcontent2/source/text/simpress/main0200.xhp
@@ -36,10 +36,6 @@
<title id="tit" xml-lang="en-US">Toolbars</title>
<filename>/text/simpress/main0200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-18T10:15:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="symbolleisten">
@@ -69,6 +65,9 @@
<section id="Section6">
<embed href="text/simpress/main0204.xhp#objektleistedia"/>
</section>
+<section id="SectionSW6">
+<embed href="text/swriter/main0204.xhp#objektleistetabellen"/>
+</section>
<section id="Section7">
<embed href="text/simpress/main0203.xhp#objektleistetext"/>
</section>
diff --git a/helpcontent2/source/text/smath/00/00000004.xhp b/helpcontent2/source/text/smath/00/00000004.xhp
index d15d1ea55a..e291246b26 100644
--- a/helpcontent2/source/text/smath/00/00000004.xhp
+++ b/helpcontent2/source/text/smath/00/00000004.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
</topic>
</meta>
<body>
-<paragraph role="heading" id="hd_id3152598" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function...
+<paragraph role="heading" id="hd_id3152598" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function...
</variable></paragraph>
<section id="babnma">
<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Edit - Next Marker</emph>
@@ -156,12 +156,12 @@
</section>
<paragraph role="paragraph" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="83"><variable id="neuzeichnen">Choose <emph>View - AutoUpdate Display</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="69"><variable id="astopa">Choose <emph>View - Formula Elements</emph>
+<paragraph role="paragraph" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="69"><variable id="astopa">Choose <emph>View - Elements</emph>
</variable></paragraph>
<section id="astuop">
<paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="CHG" oldref="70">Open the context menu in the Commands window - choose <emph>Unary/Binary Operators</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3154106" xml-lang="en-US" l10n="U" oldref="71">Choose <emph>View - Formula Elements -</emph> symbol in the Formula Elements window:</paragraph>
+<paragraph role="paragraph" id="par_id3154106" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3154602">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -178,7 +178,7 @@
<section id="astbio">
<paragraph role="paragraph" id="par_id3150360" xml-lang="en-US" l10n="U" oldref="73">Open the context menu in the Commands window - choose <emph>Relations</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="74">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="74">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3152962">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -195,7 +195,7 @@
<section id="astopop">
<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="37">Open the context menu in the Commands window - choose <emph>Operators</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149342" xml-lang="en-US" l10n="U" oldref="76">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3149342" xml-lang="en-US" l10n="U" oldref="76">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3154188">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -212,7 +212,7 @@
<section id="astofu">
<paragraph role="paragraph" id="par_id3149297" xml-lang="en-US" l10n="U" oldref="40">Open the context menu in the Commands window - choose <emph>Functions</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="77">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="77">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3149490">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -229,7 +229,7 @@
<section id="astofm">
<paragraph role="paragraph" id="par_id3147092" xml-lang="en-US" l10n="U" oldref="43">Open the context menu in the Commands window - choose <emph>Brackets</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3154908">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -246,7 +246,7 @@
<section id="astatb">
<paragraph role="paragraph" id="par_id3153510" xml-lang="en-US" l10n="U" oldref="46">Open the context menu in the Commands window - choose <emph>Attributes</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3147076">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -263,7 +263,7 @@
<section id="astasr">
<paragraph role="paragraph" id="par_id3154114" xml-lang="en-US" l10n="U" oldref="49">Open the context menu in the Commands window - choose <emph>Formats</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3150581" xml-lang="en-US" l10n="U" oldref="80">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3150581" xml-lang="en-US" l10n="U" oldref="80">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3156276">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -280,7 +280,7 @@
<section id="astfab">
<paragraph role="paragraph" id="par_id3149008" xml-lang="en-US" l10n="U" oldref="52">Open the context menu in the Commands window - choose <emph>Set Operations</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147313" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147313" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3156377">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -319,7 +319,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148448" xml-lang="en-US" l10n="U" oldref="62">Symbols</paragraph>
+<paragraph role="paragraph" id="par_id3148448" xml-lang="en-US" l10n="CHG" oldref="62">Catalog</paragraph>
</tablecell>
</tablerow>
</table>
@@ -334,7 +334,7 @@
<section id="sonst">
<paragraph role="paragraph" id="par_id3153291" xml-lang="en-US" l10n="U" oldref="90">Open the context menu in the Commands window - choose <emph>Others</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="91">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
+<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="91">Choose <emph>View - Elements</emph> - in the Elements window, click</paragraph>
<table id="tbl_id3153988">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/smath/01/02080000.xhp b/helpcontent2/source/text/smath/01/02080000.xhp
index a17fa68362..9662a07f56 100644
--- a/helpcontent2/source/text/smath/01/02080000.xhp
+++ b/helpcontent2/source/text/smath/01/02080000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0102080000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Next Marker</title>
<filename>/text/smath/01/02080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-02T09:47:11">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="naechstermarker">
diff --git a/helpcontent2/source/text/smath/01/02090000.xhp b/helpcontent2/source/text/smath/01/02090000.xhp
index 1ae9edb17f..8892362621 100644
--- a/helpcontent2/source/text/smath/01/02090000.xhp
+++ b/helpcontent2/source/text/smath/01/02090000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -33,16 +33,13 @@
<title xml-lang="en-US" id="tit">Previous Marker</title>
<filename>/text/smath/01/02090000.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="vorherigermarker">
- <bookmark branch="index" xml-lang="en-US" id="bm_id3153770"><bookmark_value>markers; previous</bookmark_value><bookmark_value>placeholders; previous marker</bookmark_value></bookmark><bookmark branch="hid/.uno:PrevMark" xml-lang="en-US" id="bm_id3154322"/><paragraph id="hd_id3153770" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/smath/01/02090000.xhp" name="Previous Marker">Previous Marker</link></paragraph>
+<section id="vorherigermarker">
+<bookmark branch="index" xml-lang="en-US" id="bm_id3153770"><bookmark_value>markers; previous</bookmark_value><bookmark_value>placeholders; previous marker</bookmark_value></bookmark>
+
+<bookmark branch="hid/.uno:PrevMark" xml-lang="en-US" id="bm_id34242422"/>
+ <paragraph id="hd_id3153770" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/smath/01/02090000.xhp" name="Previous Marker">Previous Marker</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145252" xml-lang="en-US" oldref="2"><ahelp hid="SID_PREVMARK" visibility="visible">Moves the cursor to the previous marker (to the left).</ahelp></paragraph>
</section>
<paragraph xml-lang="en-US" role="note" id="par_id3148488" l10n="U" oldref="3">"Markers" are placeholders. They take the form of &lt;?&gt; in the <emph>Commands</emph> window.</paragraph>
diff --git a/helpcontent2/source/text/smath/01/02100000.xhp b/helpcontent2/source/text/smath/01/02100000.xhp
index f7b4c9428d..6479fd7487 100644
--- a/helpcontent2/source/text/smath/01/02100000.xhp
+++ b/helpcontent2/source/text/smath/01/02100000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0102100000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Next Error</title>
<filename>/text/smath/01/02100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-02T08:41:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="naechsterfehler">
diff --git a/helpcontent2/source/text/smath/01/02110000.xhp b/helpcontent2/source/text/smath/01/02110000.xhp
index 450e8d3cc3..36a19d0201 100644
--- a/helpcontent2/source/text/smath/01/02110000.xhp
+++ b/helpcontent2/source/text/smath/01/02110000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,19 +32,15 @@
<title xml-lang="en-US" id="tit">Previous Error</title>
<filename>/text/smath/01/02110000.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="vorherigerfehler">
- <bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>error search; previous error</bookmark_value></bookmark><bookmark branch="hid/.uno:PrevError" xml-lang="en-US" id="bm_id3153144"/><paragraph id="hd_id3147434" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/smath/01/02110000.xhp" name="Previous Error">Previous Error</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3145799" xml-lang="en-US" oldref="2"><ahelp hid="SID_PREVERR" visibility="visible">Moves the cursor to the previous error (moving left).</ahelp></paragraph>
- </section>
- <section id="howtoget">
+<section id="vorherigerfehler">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>error search; previous error</bookmark_value></bookmark>
+<bookmark branch="hid/.uno:PrevError" xml-lang="en-US" id="bm_id3866654"/>
+<paragraph id="hd_id3147434" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/smath/01/02110000.xhp" name="Previous Error">Previous Error</link></paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3145799" xml-lang="en-US" oldref="2"><ahelp hid="SID_PREVERR" visibility="visible">Moves the cursor to the previous error (moving left).</ahelp></paragraph>
+</section>
+<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#babvhf"/>
</section>
</body>
diff --git a/helpcontent2/source/text/smath/01/03040000.xhp b/helpcontent2/source/text/smath/01/03040000.xhp
index ccee7425b8..9e98647cfa 100644
--- a/helpcontent2/source/text/smath/01/03040000.xhp
+++ b/helpcontent2/source/text/smath/01/03040000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103040000xml" indexer="include" status="PUBLISH">
@@ -46,7 +46,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id3153190" localize="false"/>
<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03040000.xhp" name="Zoom In">Zoom In</link></paragraph>
-<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_ZOOMIN">Increases the display scale of the formula by 25%.</ahelp> The zoom scale is displayed on the status bar. You can also change the scale in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the status bar. The workspace context menu contains zoom options as well.</paragraph>
+<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Increases the display scale of the formula by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link>. The context menu in the work area also contains zoom commands.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astvgr"/>
diff --git a/helpcontent2/source/text/smath/01/03050000.xhp b/helpcontent2/source/text/smath/01/03050000.xhp
index 4e2f67d0c3..422f3df2aa 100644
--- a/helpcontent2/source/text/smath/01/03050000.xhp
+++ b/helpcontent2/source/text/smath/01/03050000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103050000xml" indexer="include" status="PUBLISH">
@@ -48,7 +48,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomOut" id="bm_id3154704" localize="false"/>
<paragraph role="heading" id="hd_id3147338" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03050000.xhp" name="Zoom Out">Zoom Out</link></paragraph>
-<paragraph role="paragraph" id="par_id3150249" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_ZOOMOUT">Decreases the display scale of formulas by 25%.</ahelp> The zoom scale is displayed on the status bar. You can also change the scale in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the status bar. The workspace context menu also has zoom options.</paragraph>
+<paragraph role="paragraph" id="par_id3150249" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Decreases the display scale of formulas by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link>. The context menu in the work area also contains zoom commands.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astvkl"/>
diff --git a/helpcontent2/source/text/smath/01/03060000.xhp b/helpcontent2/source/text/smath/01/03060000.xhp
index 9d2a4d0797..73a595d318 100644
--- a/helpcontent2/source/text/smath/01/03060000.xhp
+++ b/helpcontent2/source/text/smath/01/03060000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103060000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Display All</title>
<filename>/text/smath/01/03060000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-02T09:50:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="allesanzeigen">
@@ -45,9 +41,9 @@
<bookmark_value>maximum formula size</bookmark_value>
<bookmark_value>formulas; maximum size</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:Adjust" id="bm_id3145789" localize="false"/>
-<paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03060000.xhp" name="Display All">Display All</link></paragraph>
-<paragraph role="paragraph" id="par_id3148571" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_ADJUST">Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area. <emph>Show All</emph> is equivalent to the <emph>Entire Formula</emph> icon on the toolbar.</ahelp> The current scale is displayed on the status bar. A selection of available scale options is accessible through the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link>. The context menu in the work area also contains the scale options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Adjust" id="bm_id311789" localize="false"/>
+<paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/smath/01/03060000.xhp" name="Show All">Show All / Display All</link></paragraph>
+<paragraph role="paragraph" id="par_id3148571" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link>. The context menu in the work area also contains zoom commands. The name of the icon is "Show All", the name of the context menu command is "Display All". The zoom commands and icons are only available in Math documents, not for embedded Math objects.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astazg"/>
diff --git a/helpcontent2/source/text/smath/01/03070000.xhp b/helpcontent2/source/text/smath/01/03070000.xhp
index 07e68091e3..d9134e1807 100644
--- a/helpcontent2/source/text/smath/01/03070000.xhp
+++ b/helpcontent2/source/text/smath/01/03070000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,27 +27,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Refreshing</title>
+<title id="tit" xml-lang="en-US">Update</title>
<filename>/text/smath/01/03070000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-02T10:19:42">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="aktualisieren">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153768"><bookmark_value>refreshing formula view</bookmark_value>
-<bookmark_value>formula view; refreshing</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153768"><bookmark_value>updating formula view</bookmark_value>
+<bookmark_value>formula view; updating</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:Draw" id="bm_id3152598" localize="false"/>
-<paragraph role="heading" id="hd_id3153768" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03070000.xhp" name="Refreshing">Refreshing</link></paragraph>
-<paragraph role="paragraph" id="par_id3153729" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_DRAW">This command refreshes the formula in the document window.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="3">Changes in the <emph>Commands</emph> window are automatically refreshed if <emph>Refresh View Automatically</emph> is activated.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Draw" id="bm_id3188888" localize="false"/>
+<paragraph role="heading" id="hd_id3153768" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/smath/01/03070000.xhp" name="Update">Update</link></paragraph>
+<paragraph role="paragraph" id="par_id3153729" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SID_DRAW">This command updates the formula in the document window.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145253" xml-lang="en-US" l10n="CHG" oldref="3">Changes in the <emph>Commands</emph> window are automatically updated if <emph>AutoUpdate Display</emph> is activated.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astakt"/>
diff --git a/helpcontent2/source/text/smath/01/03080000.xhp b/helpcontent2/source/text/smath/01/03080000.xhp
index 513d6e056c..e60cbe4e77 100644
--- a/helpcontent2/source/text/smath/01/03080000.xhp
+++ b/helpcontent2/source/text/smath/01/03080000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103080000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoRefresh Display</title>
+<title id="tit" xml-lang="en-US">AutoUpdate Display</title>
<filename>/text/smath/01/03080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-27T15:29:30">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="neuzeichnen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154702"><bookmark_value>changes; accepting automatically</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:RedrawAutomatic" id="bm_id3148488" localize="false"/>
-<paragraph role="heading" id="hd_id3154702" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03080000.xhp" name="AutoRefresh Display">AutoRefresh Display</link></paragraph>
-<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_AUTO_REDRAW">Choose this command to automatically refresh a modified formula. If you do not select this option, the formula will only be refreshed after you choose <emph>View - Refresh</emph> and press F9.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:RedrawAutomatic" id="bm_id344433388" localize="false"/>
+<paragraph role="heading" id="hd_id3154702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/smath/01/03080000.xhp" name="AutoUpdate Display">AutoUpdate Display</link></paragraph>
+<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Automatically updates a modified formula. If you do not select this option, the formula will only be updated after you choose <emph>View - Update</emph> or press F9.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#neuzeichnen"/>
diff --git a/helpcontent2/source/text/smath/01/03090000.xhp b/helpcontent2/source/text/smath/01/03090000.xhp
index 98ec5be90a..55c422af9e 100644
--- a/helpcontent2/source/text/smath/01/03090000.xhp
+++ b/helpcontent2/source/text/smath/01/03090000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,11 +29,11 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsmath0103090000xml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Formula Elements</title>
+ <title xml-lang="en-US" id="tit">Elements</title>
<filename>/text/smath/01/03090000.xhp</filename>
</topic>
</meta>
@@ -41,9 +41,10 @@
<section id="auswahl">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155963"><bookmark_value>selection options in formulas</bookmark_value>
<bookmark_value>formulas; selections</bookmark_value>
+ <bookmark_value>elements;in Math</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolBox" id="bm_id3145789" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3155963" role="heading" level="1" l10n="U" oldref="1"><variable id="func_win"><link href="text/smath/01/03090000.xhp" name="Formula Elements">Formula Elements</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolBox" id="bm_id3777779" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155963" role="heading" level="1" l10n="U" oldref="1"><variable id="func_win"><link href="text/smath/01/03090000.xhp" name="Elements">Elements</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><ahelp hid="SID_TOOLBOX">This is a list of operators, functions, symbols and format options that can be inserted into the formula.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/smath/01/03090100.xhp b/helpcontent2/source/text/smath/01/03090100.xhp
index 75b981a5d6..e3a89efaf6 100644
--- a/helpcontent2/source/text/smath/01/03090100.xhp
+++ b/helpcontent2/source/text/smath/01/03090100.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090100xml" indexer="include" status="PUBLISH">
@@ -70,12 +70,12 @@ dedr: fixed #i30769#</lastedited>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_UNBINOPS_TBX" id="bm_id3150200" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_UNBINOPS_CAT" id="bm_id3149499" localize="false"/>
<paragraph role="heading" id="hd_id3150342" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090100.xhp" name="Unary/Binary Operators">Unary/Binary Operators</link></paragraph>
-<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_UNBINOPS_CAT">You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Formula Elements window displays the individual operators.</ahelp> The <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Formula Elements window, use the context menu or type it directly in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_UNBINOPS_CAT">You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Elements window displays the individual operators.</ahelp> The <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Elements window, use the context menu or type it directly in the <emph>Commands</emph> window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astuop"/>
</section>
-<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the unary and binary operators. The symbol next to the operator indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the unary and binary operators. The symbol next to the operator indicates that it can be accessed through the Elements window (choose <emph>View - Elements</emph>) or through the context menu of the Commands window.</paragraph>
<paragraph role="heading" id="hd_id3147405" xml-lang="en-US" level="3" l10n="U" oldref="4">Unary and Binary Operators</paragraph>
<table id="tbl_id3150392" class="topalign">
<tablerow>
@@ -317,8 +317,8 @@ dedr: fixed #i30769#</lastedited>
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3150464" xml-lang="en-US" l10n="U" oldref="27">You can also insert user-defined unary operators by typing <emph>uoper</emph> in the <emph>Commands</emph> window, followed by the syntax for the character. This function is useful for incorporating special characters into a formula. For example, the command <emph>uoper %theta x</emph> produces a small Greek letter theta (a component of the <emph>$[officename] Math</emph> character set). You can also insert characters not in the $[officename] character set by choosing <emph>Tools - Symbols - Catalog - Edit</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3154725" xml-lang="en-US" l10n="U" oldref="31"> You can also insert user-defined binary commands by typing <emph>boper</emph> into the <emph>Commands</emph> window. For example, the command <emph>y boper %theta x</emph> produces the small Greek letter theta preceded by a <emph>y</emph> and followed by an <emph>x</emph>. You can also insert characters not in the $[officename] character set by choosing <emph>Tools - Symbols - Catalog - Edit</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3150464" xml-lang="en-US" l10n="CHG" oldref="27">You can also insert user-defined unary operators by typing <emph>uoper</emph> in the <emph>Commands</emph> window, followed by the syntax for the character. This function is useful for incorporating special characters into a formula. For example, the command <emph>uoper %theta x</emph> produces a small Greek letter theta (a component of the <emph>$[officename] Math</emph> character set). You can also insert characters not in the $[officename] character set by choosing <emph>Tools - Catalog - Edit</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154725" xml-lang="en-US" l10n="CHG" oldref="31"> You can also insert user-defined binary commands by typing <emph>boper</emph> into the <emph>Commands</emph> window. For example, the command <emph>y boper %theta x</emph> produces the small Greek letter theta preceded by a <emph>y</emph> and followed by an <emph>x</emph>. You can also insert characters not in the $[officename] character set by choosing <emph>Tools - Catalog - Edit</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150906" xml-lang="en-US" l10n="U" oldref="32">By typing <emph>&lt;?&gt;oplus&lt;?&gt;</emph> in the <emph>Commands</emph> window, you insert a <emph>circled plus operator</emph> in your document.</paragraph>
<paragraph role="paragraph" id="par_id3151197" xml-lang="en-US" l10n="U" oldref="33">Type <emph>&lt;?&gt;ominus&lt;?&gt;</emph> in the <emph>Commands</emph> window to insert a <emph>circled minus operator</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3155082" xml-lang="en-US" l10n="U" oldref="34">Type <emph>&lt;?&gt;odot&lt;?&gt;</emph> in the <emph>Commands</emph> window to insert a <emph>circled dot operator</emph> in the formula.</paragraph>
@@ -328,7 +328,7 @@ dedr: fixed #i30769#</lastedited>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_XWIDEBSLASHY" id="bm_id3150035" localize="false"/>
<paragraph role="paragraph" id="par_id3150024" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_SMA_XWIDEBSLASHY">Type <emph>a widebslash b</emph> in the <emph>Commands</emph> window to produce two characters with a slash (from upper left to lower right) between them.</ahelp> The characters are set such that everything to the left of the slash is down, and everything to the right is up. This command is also available in the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="paragraph" id="par_id3149376" xml-lang="en-US" l10n="U" oldref="36">Type <emph>sub</emph> or <emph>sup</emph> in the Commands window to add indexes and powers to the characters in your formula; for example, a sub 2.</paragraph>
-<paragraph role="tip" id="par_id3155383" xml-lang="en-US" l10n="CHG" oldref="41">If you want to use a colon ':' as division sign, choose <emph>Tools - Symbols - Catalog</emph> or click the <emph>Catalog</emph> icon on the Tools bar. Click the <emph>Edit</emph> button in the dialog that appears, then select the <emph>Special</emph> symbol set. Enter a meaningful name next to <emph>Symbol</emph>, for example, "divide" and then click the colon in the set of symbols. Click <emph>Add</emph> and then <emph>OK</emph>. Click <emph>OK</emph> to close the <emph>Symbols</emph> dialog,too. Now you can use the new symbol, in this case the colon, by entering its name in the Commands window, for example, <emph>a %divide b = c</emph>.</paragraph>
+<paragraph role="tip" id="par_id3155383" xml-lang="en-US" l10n="CHG" oldref="41">If you want to use a colon ':' as division sign, choose <emph>Tools - Catalog</emph> or click the <emph>Catalog</emph> icon on the Tools bar. Click the <emph>Edit</emph> button in the dialog that appears, then select the <emph>Special</emph> symbol set. Enter a meaningful name next to <emph>Symbol</emph>, for example, "divide" and then click the colon in the set of symbols. Click <emph>Add</emph> and then <emph>OK</emph>. Click <emph>OK</emph> to close the <emph>Symbols</emph> dialog,too. Now you can use the new symbol, in this case the colon, by entering its name in the Commands window, for example, <emph>a %divide b = c</emph>.</paragraph>
<paragraph role="warning" id="par_id3147398" xml-lang="en-US" l10n="U" oldref="37">When entering information manually in the Commands window, please note that a number of operators require spaces between the elements for the correct structure. This is especially true if you are using values instead of placeholders in your operators, for example, to construct a division 4 div 3 or a div b.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/smath/01/03090200.xhp b/helpcontent2/source/text/smath/01/03090200.xhp
index 33978716eb..f06432dd94 100644
--- a/helpcontent2/source/text/smath/01/03090200.xhp
+++ b/helpcontent2/source/text/smath/01/03090200.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090200xml" indexer="include" status="PUBLISH">
@@ -77,12 +77,12 @@
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_RELATIONS_TBX" id="bm_id3145204" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_RELATIONS_CAT" id="bm_id3145207" localize="false"/>
<paragraph role="heading" id="hd_id3156316" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090200.xhp" name="Relations">Relations</link></paragraph>
-<paragraph role="paragraph" id="par_id3153152" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_RELATIONS_CAT">You can choose among various relations to structure your <emph>$[officename] Math</emph> formula. The relation functions are displayed in the lower part of the Formula Elements window.</ahelp> The list is also in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All relations that are not contained in the Formula Elements window or in the context menu can be typed manually in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3153152" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_RELATIONS_CAT">You can choose among various relations to structure your <emph>$[officename] Math</emph> formula. The relation functions are displayed in the lower part of the Elements window.</ahelp> The list is also in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All relations that are not contained in the Elements window or in the context menu can be typed manually in the Commands window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astbio"/>
</section>
-<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the relations. The symbol next to the name of the relation indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the relations. The symbol next to the name of the relation indicates that it can be accessed through the Elements window (choose <emph>View - Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="heading" id="hd_id3148827" xml-lang="en-US" level="3" l10n="U" oldref="4">Relations:</paragraph>
<table id="tbl_id3145414">
<tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090300.xhp b/helpcontent2/source/text/smath/01/03090300.xhp
index 6c454b3a7d..ebbd0e99ff 100644
--- a/helpcontent2/source/text/smath/01/03090300.xhp
+++ b/helpcontent2/source/text/smath/01/03090300.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090300xml" indexer="include" status="PUBLISH">
@@ -57,12 +57,12 @@
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_OPERATORS_TBX" id="bm_id3153623" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_OPERATORS_CAT" id="bm_id3153626" localize="false"/>
<paragraph role="heading" id="hd_id3153150" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090300.xhp" name="Operators">Operators</link></paragraph>
-<paragraph role="paragraph" id="par_id3149755" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SMA_OPERATORS_CAT">You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Formula Elements window.</ahelp> They are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Formula Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3149755" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SMA_OPERATORS_CAT">You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Elements window.</ahelp> They are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astopop"/>
</section>
-<paragraph role="paragraph" id="par_id3153576" xml-lang="en-US" l10n="U" oldref="36">The following is a list of the available operators. An icon next to the operator name indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3153576" xml-lang="en-US" l10n="U" oldref="36">The following is a list of the available operators. An icon next to the operator name indicates that it can be accessed through the Elements window (choose <emph>View - Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="3" l10n="U" oldref="37">Operator Functions</paragraph>
<table id="tbl_id3154282">
<tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090400.xhp b/helpcontent2/source/text/smath/01/03090400.xhp
index 2228d44e5e..63a9d1a8d4 100644
--- a/helpcontent2/source/text/smath/01/03090400.xhp
+++ b/helpcontent2/source/text/smath/01/03090400.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090400xml" indexer="include" status="PUBLISH">
@@ -74,12 +74,12 @@
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_FUNCTIONS_TBX" id="bm_id3150571" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_FUNCTIONS_CAT" id="bm_id3149024" localize="false"/>
<paragraph role="heading" id="hd_id3150932" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090400.xhp" name="Functions">Functions</link></paragraph>
-<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FUNCTIONS_CAT">Choose a function in the lower part of the window.</ahelp> These functions are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Formula Elements window need to be typed manually in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FUNCTIONS_CAT">Choose a function in the lower part of the window.</ahelp> These functions are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Elements window need to be typed manually in the Commands window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astofu"/>
</section>
-<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="3">The following is a list of all functions that appear in the <emph>Formula Elements</emph> window. The icon next to the function indicates that it can be accessed through the Formula Elements window (menu View - Formula Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="3">The following is a list of all functions that appear in the <emph>Elements</emph> window. The icon next to the function indicates that it can be accessed through the Elements window (menu View - Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="heading" id="hd_id3156319" xml-lang="en-US" level="3" l10n="U" oldref="4">List of functions</paragraph>
<table id="tbl_id3145209">
<tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090500.xhp b/helpcontent2/source/text/smath/01/03090500.xhp
index 7e30ff34cc..a4274191cb 100644
--- a/helpcontent2/source/text/smath/01/03090500.xhp
+++ b/helpcontent2/source/text/smath/01/03090500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090500xml" indexer="include" status="PUBLISH">
@@ -76,12 +76,12 @@ dedr: reviewed</lastedited>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_BRACKETS_TBX" id="bm_id3149294" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_BRACKETS_CAT" id="bm_id3149751" localize="false"/>
<paragraph role="heading" id="hd_id3153153" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090500.xhp" name="Brackets">Brackets</link></paragraph>
-<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_BRACKETS_CAT">You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Formula Elements window.</ahelp> These brackets are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Formula Elements window or in the context menu can be typed manually in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_BRACKETS_CAT">You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Elements window.</ahelp> These brackets are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Elements window or in the context menu can be typed manually in the <emph>Commands</emph> window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astofm"/>
</section>
-<paragraph role="paragraph" id="par_id3154264" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available bracket types. The icon next to the bracket type indicates that it can be accessed through the Formula Elements window (menu View - Formula Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3154264" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available bracket types. The icon next to the bracket type indicates that it can be accessed through the Elements window (menu View - Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="heading" id="hd_id3154277" xml-lang="en-US" level="3" l10n="U" oldref="4">Bracket types</paragraph>
<table id="tbl_id3150710">
<tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090600.xhp b/helpcontent2/source/text/smath/01/03090600.xhp
index 889ce5bcb5..c5e008e40f 100644
--- a/helpcontent2/source/text/smath/01/03090600.xhp
+++ b/helpcontent2/source/text/smath/01/03090600.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsmath0103090600xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Attributes</title>
@@ -74,12 +74,12 @@
<paragraph xml-lang="en-US" id="hd_id3154011" role="heading" level="1" l10n="U" oldref="1"><variable id="attributes"><link href="text/smath/01/03090600.xhp" name="Attributes">Attributes</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3145802" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SMA_ATTRIBUTES_CAT">You can choose from various attributes for <emph>%PRODUCTNAME</emph>
- <emph>Math</emph> formulas. Some attributes are displayed in the lower part of the Formula Elements window.</ahelp> These attributes are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Formula Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
+ <emph>Math</emph> formulas. Some attributes are displayed in the lower part of the Elements window.</ahelp> These attributes are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astatb"/>
</section>
- <paragraph xml-lang="en-US" id="par_id3155962" role="paragraph" l10n="U" oldref="3">The following is a complete list of all attributes available in <item type="productname">%PRODUCTNAME</item> Math. The symbol next to the attribute indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155962" role="paragraph" l10n="U" oldref="3">The following is a complete list of all attributes available in <item type="productname">%PRODUCTNAME</item> Math. The symbol next to the attribute indicates that it can be accessed through the Elements window (choose <emph>View - Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149604" role="note" l10n="U" oldref="4">In describing the following attribute functions, the letter "a" in the icon refers to the placeholder that you would like to assign to the respective attribute. You can substitute this character with any other character that you choose.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154650" role="heading" level="3" l10n="U" oldref="5">Attribute Functions</paragraph>
<table id="tbl_id3153810">
diff --git a/helpcontent2/source/text/smath/01/03090700.xhp b/helpcontent2/source/text/smath/01/03090700.xhp
index d8cf948b10..07a2521370 100644
--- a/helpcontent2/source/text/smath/01/03090700.xhp
+++ b/helpcontent2/source/text/smath/01/03090700.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astasr"/>
</section>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available formatting options in $[officename] Math. The icon next to the formatting option indicates that it can be accessed through the Formula Elements window (menu <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available formatting options in $[officename] Math. The icon next to the formatting option indicates that it can be accessed through the Elements window (menu <emph>View - Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
<paragraph role="note" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="17">The letter "a" refers to the placeholder in your formula which you would like to assign to the respective formatting. You can substitute this character for any other you like.</paragraph>
<paragraph role="heading" id="hd_id3151104" xml-lang="en-US" level="3" l10n="U" oldref="4">Formatting options</paragraph>
<table id="tbl_id3154569">
diff --git a/helpcontent2/source/text/smath/01/03090800.xhp b/helpcontent2/source/text/smath/01/03090800.xhp
index 500b57b771..5e61650037 100644
--- a/helpcontent2/source/text/smath/01/03090800.xhp
+++ b/helpcontent2/source/text/smath/01/03090800.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0103090800xml" indexer="include" status="PUBLISH">
@@ -66,12 +66,12 @@
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_SETOPERATIONS_TBX" id="bm_id3145205" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_SETOPERATIONS_CAT" id="bm_id3145208" localize="false"/>
<paragraph role="heading" id="hd_id3156318" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090800.xhp" name="Set Operations">Set Operations</link></paragraph>
-<paragraph role="paragraph" id="par_id3154641" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_SETOPERATIONS_CAT">Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Formula Elements window</ahelp>. Call the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Formula Elements window have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them.</paragraph>
+<paragraph role="paragraph" id="par_id3154641" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_SETOPERATIONS_CAT">Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Elements window</ahelp>. Call the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Elements window have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them.</paragraph>
</section>
<section id="howtoget">
<embed href="text/smath/00/00000004.xhp#astfab"/>
</section>
-<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="3">After clicking the <emph>Set Operations</emph> icon in the Formula Elements window additional icons will be shown in the lower part of this window. Simply click a symbol to incorporate the operator in the formula being edited in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="3">After clicking the <emph>Set Operations</emph> icon in the Elements window additional icons will be shown in the lower part of this window. Simply click a symbol to incorporate the operator in the formula being edited in the Commands window.</paragraph>
<paragraph role="heading" id="hd_id3147258" xml-lang="en-US" level="3" l10n="U" oldref="4">The set operations in detail:</paragraph>
<table id="tbl_id3151177">
<tablerow>
diff --git a/helpcontent2/source/text/smath/01/03091100.xhp b/helpcontent2/source/text/smath/01/03091100.xhp
index ed63c73cd2..0e06a533e1 100644
--- a/helpcontent2/source/text/smath/01/03091100.xhp
+++ b/helpcontent2/source/text/smath/01/03091100.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
<paragraph role="paragraph" id="par_id3150342" xml-lang="en-US" l10n="U" oldref="2">Note: the quotation marks in the examples are used to emphasize text and do not belong to the content of the formulas and commands.</paragraph>
<paragraph role="warning" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="3">When typing example formulas into the <emph>Commands</emph> window, note that spaces are often required for correct structure.</paragraph>
<paragraph role="paragraph" id="par_id3149054" xml-lang="en-US" l10n="U" oldref="4">Braces "{}" are used to group expressions together to form one new expression. For example, "sqrt {x * y}" is the square root of the entire product x*y, while "sqrt x * y" is the square root of x multiplied by y. Braces do not require an extra space.</paragraph>
-<paragraph role="paragraph" id="par_id3151392" xml-lang="en-US" l10n="CHG" oldref="5">Set brackets were previously inserted in the Formula Elements window or directly in the Commands window as "left lbrace &lt;?&gt; right rbrace". Now, a left and a right set bracket can also be inserted using "lbrace" and "rbrace", with or without wildcards.</paragraph>
+<paragraph role="paragraph" id="par_id3151392" xml-lang="en-US" l10n="CHG" oldref="5">Set brackets were previously inserted in the Elements window or directly in the Commands window as "left lbrace &lt;?&gt; right rbrace". Now, a left and a right set bracket can also be inserted using "lbrace" and "rbrace", with or without wildcards.</paragraph>
<paragraph role="paragraph" id="par_id3147403" xml-lang="en-US" l10n="U" oldref="6">There are a total of eight (8) different types of brackets available. The "ceil" and "floor" brackets are often used for rounding up or down the argument to the next integer: "lceil -3.7 rceil = -3" or "lfloor -3.7 rfloor = -4".</paragraph>
<paragraph role="paragraph" id="par_id3146320" xml-lang="en-US" l10n="U" oldref="63">Operator brackets, also known as Bra-kets (angle brackets with a vertical line in between), are common in Physics notation: "langle a mline b rangle" or "langle a mline b mline c over d mline e rangle." The height and positioning of the vertical lines always corresponds exactly to the enclosing brackets.</paragraph>
<paragraph role="paragraph" id="par_id3157870" xml-lang="en-US" l10n="U" oldref="7">All brackets may only be used in pairs. The brackets have some common characteristics:</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091500.xhp b/helpcontent2/source/text/smath/01/03091500.xhp
index 54680b8f07..e0324dc00f 100644
--- a/helpcontent2/source/text/smath/01/03091500.xhp
+++ b/helpcontent2/source/text/smath/01/03091500.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3155961" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="reference"><link href="text/smath/01/03091500.xhp" name="Formula Reference Tables">Formula Reference Tables</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149502" xml-lang="en-US" l10n="CHG" oldref="350"><variable id="ref">This reference section contains lists of many operators, functions, symbols and formatting features available in <emph>$[officename] Math</emph>. Many of the commands displayed can be inserted using the icons in the <emph>Formula Elements</emph> window or the context menu of the <emph>Commands</emph> window.
+<paragraph role="paragraph" id="par_id3149502" xml-lang="en-US" l10n="CHG" oldref="350"><variable id="ref">This reference section contains lists of many operators, functions, symbols and formatting features available in <emph>$[officename] Math</emph>. Many of the commands displayed can be inserted using the icons in the <emph>Elements</emph> window or the context menu of the <emph>Commands</emph> window.
</variable></paragraph>
<embed href="text/smath/01/03091501.xhp#unary"/>
<embed href="text/smath/01/03091502.xhp#relations"/>
diff --git a/helpcontent2/source/text/smath/01/03091501.xhp b/helpcontent2/source/text/smath/01/03091501.xhp
index 65b64d5213..ffa4e8ed07 100644
--- a/helpcontent2/source/text/smath/01/03091501.xhp
+++ b/helpcontent2/source/text/smath/01/03091501.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@
<paragraph role="tablehead" id="par_idN106F7" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3151388" xml-lang="en-US" l10n="U" oldref="472">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3151388" xml-lang="en-US" l10n="U" oldref="472">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="474">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091502.xhp b/helpcontent2/source/text/smath/01/03091502.xhp
index e4c49f30ac..1a99d9e19a 100644
--- a/helpcontent2/source/text/smath/01/03091502.xhp
+++ b/helpcontent2/source/text/smath/01/03091502.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN10C98" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154032" xml-lang="en-US" l10n="U" oldref="475">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3154032" xml-lang="en-US" l10n="U" oldref="475">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3147272" xml-lang="en-US" l10n="U" oldref="477">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091503.xhp b/helpcontent2/source/text/smath/01/03091503.xhp
index 2ba449b5fb..14c00a4754 100644
--- a/helpcontent2/source/text/smath/01/03091503.xhp
+++ b/helpcontent2/source/text/smath/01/03091503.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN1130F" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145724" xml-lang="en-US" l10n="U" oldref="478">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3145724" xml-lang="en-US" l10n="U" oldref="478">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3158137" xml-lang="en-US" l10n="U" oldref="480">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091504.xhp b/helpcontent2/source/text/smath/01/03091504.xhp
index baf604cd0c..b5bb8d2cc1 100644
--- a/helpcontent2/source/text/smath/01/03091504.xhp
+++ b/helpcontent2/source/text/smath/01/03091504.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN11838" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156681" xml-lang="en-US" l10n="U" oldref="481">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3156681" xml-lang="en-US" l10n="U" oldref="481">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3156750" xml-lang="en-US" l10n="U" oldref="483">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091505.xhp b/helpcontent2/source/text/smath/01/03091505.xhp
index 6534b3a20f..c51166e619 100644
--- a/helpcontent2/source/text/smath/01/03091505.xhp
+++ b/helpcontent2/source/text/smath/01/03091505.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN11DE4" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3143994" xml-lang="en-US" l10n="U" oldref="484">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3143994" xml-lang="en-US" l10n="U" oldref="484">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3144064" xml-lang="en-US" l10n="U" oldref="486">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091506.xhp b/helpcontent2/source/text/smath/01/03091506.xhp
index b7d5fce23d..9aee16bdbe 100644
--- a/helpcontent2/source/text/smath/01/03091506.xhp
+++ b/helpcontent2/source/text/smath/01/03091506.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN12175" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3167610" xml-lang="en-US" l10n="U" oldref="487">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3167610" xml-lang="en-US" l10n="U" oldref="487">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3167680" xml-lang="en-US" l10n="U" oldref="489">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091507.xhp b/helpcontent2/source/text/smath/01/03091507.xhp
index 2c846d59fd..7b06a7831c 100644
--- a/helpcontent2/source/text/smath/01/03091507.xhp
+++ b/helpcontent2/source/text/smath/01/03091507.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN126E6" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3162086" xml-lang="en-US" l10n="U" oldref="490">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3162086" xml-lang="en-US" l10n="U" oldref="490">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3162156" xml-lang="en-US" l10n="U" oldref="492">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091508.xhp b/helpcontent2/source/text/smath/01/03091508.xhp
index c4c4669dbb..71a52c901a 100644
--- a/helpcontent2/source/text/smath/01/03091508.xhp
+++ b/helpcontent2/source/text/smath/01/03091508.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
<paragraph role="tablehead" id="par_idN12B53" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3180684" xml-lang="en-US" l10n="U" oldref="493">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3180684" xml-lang="en-US" l10n="U" oldref="493">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3180753" xml-lang="en-US" l10n="U" oldref="495">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091509.xhp b/helpcontent2/source/text/smath/01/03091509.xhp
index 0da2b9e197..9cc5b5b5b8 100644
--- a/helpcontent2/source/text/smath/01/03091509.xhp
+++ b/helpcontent2/source/text/smath/01/03091509.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
<paragraph role="tablehead" id="par_idN1308F" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3184320" xml-lang="en-US" l10n="U" oldref="496">Symbol in Formula Elements Window</paragraph>
+<paragraph role="tablehead" id="par_id3184320" xml-lang="en-US" l10n="U" oldref="496">Symbol in Elements Window</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3184389" xml-lang="en-US" l10n="U" oldref="498">Meaning</paragraph>
@@ -280,6 +280,19 @@
<paragraph role="tablecontent" id="par_id3186377" xml-lang="en-US" l10n="U" oldref="297">Wide space/gap</paragraph>
</tablecell>
</tablerow>
+
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_idN133AF99" xml-lang="en-US" l10n="NEW" localize="false">
+<item type="literal">nospace{e1 e2 ...}</item>
+</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan=""/>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id318637799" xml-lang="en-US" l10n="NEW">Suppress horizontal space between elements</paragraph>
+</tablecell>
+</tablerow>
+
</table>
<section id="relatedtopics">
<embed href="text/smath/01/03090700.xhp#formatierungen"/>
diff --git a/helpcontent2/source/text/smath/01/05010000.xhp b/helpcontent2/source/text/smath/01/05010000.xhp
index 88b830c3d0..06bb2d6dee 100644
--- a/helpcontent2/source/text/smath/01/05010000.xhp
+++ b/helpcontent2/source/text/smath/01/05010000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0105010000xml" indexer="include" status="PUBLISH">
diff --git a/helpcontent2/source/text/smath/01/05020000.xhp b/helpcontent2/source/text/smath/01/05020000.xhp
index 6e003b66a5..71ea3a93d0 100644
--- a/helpcontent2/source/text/smath/01/05020000.xhp
+++ b/helpcontent2/source/text/smath/01/05020000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/helpcontent2/source/text/smath/01/05030000.xhp b/helpcontent2/source/text/smath/01/05030000.xhp
index e362495013..01cef83ad4 100644
--- a/helpcontent2/source/text/smath/01/05030000.xhp
+++ b/helpcontent2/source/text/smath/01/05030000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,17 +29,13 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0105030000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Spacing</title>
<filename>/text/smath/01/05030000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-02T15:42:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154658"><bookmark_value>spacing; formula elements</bookmark_value>
diff --git a/helpcontent2/source/text/smath/01/05040000.xhp b/helpcontent2/source/text/smath/01/05040000.xhp
index 91e4670361..fa92ed1dac 100644
--- a/helpcontent2/source/text/smath/01/05040000.xhp
+++ b/helpcontent2/source/text/smath/01/05040000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -33,14 +33,10 @@
<title xml-lang="en-US" id="tit">Alignment</title>
<filename>/text/smath/01/05040000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
+
+
<bookmark branch="index" xml-lang="en-US" id="bm_id3148730"><bookmark_value>aligning; multi-line formulas</bookmark_value><bookmark_value>multi-line formulas; aligning</bookmark_value></bookmark><bookmark branch="hid/.uno:ChangeAlignment" xml-lang="en-US" id="bm_id3145596"/><paragraph role="heading" level="1" id="hd_id3148730" l10n="U" xml-lang="en-US" oldref="1">Alignment</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3152999" xml-lang="en-US" oldref="2"><variable id="ausrichtungtext"><ahelp hid="SID_ALIGN" visibility="visible">You can define the alignment of multi-line formulas as well as formulas with several elements in one line.</ahelp> Create multi-line formulas by entering a <emph>NEWLINE</emph> command in the <emph>Commands</emph> window.</variable></paragraph>
<section id="howtoget">
@@ -57,6 +53,6 @@
<paragraph l10n="U" role="paragraph" id="par_id3151264" xml-lang="en-US" oldref="10"><ahelp hid="STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:3" visibility="visible">Aligns the elements of a formula to the right.</ahelp></paragraph>
<bookmark branch="hid/starmath:PushButton:RID_ALIGNDIALOG:1" xml-lang="en-US" id="bm_id3153153"/><paragraph role="heading" level="2" id="hd_id3150261" l10n="U" xml-lang="en-US" oldref="19">Default</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153622" xml-lang="en-US" oldref="20"><ahelp hid="STARMATH:PUSHBUTTON:RID_ALIGNDIALOG:1" visibility="visible">Click here to save your changes as the default settings for new formulas.</ahelp> A security response will appear before saving.</paragraph>
-
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/smath/01/05050000.xhp b/helpcontent2/source/text/smath/01/05050000.xhp
index 3fcb1b8078..7e26c727fb 100644
--- a/helpcontent2/source/text/smath/01/05050000.xhp
+++ b/helpcontent2/source/text/smath/01/05050000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0105050000xml" indexer="include" status="PUBLISH">
diff --git a/helpcontent2/source/text/smath/01/06010000.xhp b/helpcontent2/source/text/smath/01/06010000.xhp
index e6ffd8fff4..1eeb718dfd 100644
--- a/helpcontent2/source/text/smath/01/06010000.xhp
+++ b/helpcontent2/source/text/smath/01/06010000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsmath0106010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Catalog</title>
diff --git a/helpcontent2/source/text/smath/01/06020000.xhp b/helpcontent2/source/text/smath/01/06020000.xhp
index d8b7502469..47515d8b8b 100644
--- a/helpcontent2/source/text/smath/01/06020000.xhp
+++ b/helpcontent2/source/text/smath/01/06020000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,15 +32,11 @@
<title xml-lang="en-US" id="tit">Import formula</title>
<filename>/text/smath/01/06020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3154659"><bookmark_value>importing; %PRODUCTNAME Math formulas</bookmark_value></bookmark><bookmark branch="hid/.uno:InsertFormula" xml-lang="en-US" id="bm_id3150346"/><paragraph role="heading" level="1" id="hd_id3154659" l10n="U" xml-lang="en-US" oldref="1">Import formula</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3150251" xml-lang="en-US" oldref="2"><variable id="formelimportierentext"><ahelp hid="SID_INSERT_FORMULA" visibility="visible">This command opens a dialog for importing a formula.</ahelp></variable></paragraph>
<paragraph xml-lang="en-US" oldref="3" id="par_id3153916" l10n="U" role="paragraph">The <emph>Insert</emph> dialog is set up like the <link href="text/shared/01/01020000.xhp" name="Open">Open</link> dialog under <emph>File</emph>. Use the <emph>Insert</emph> dialog to load, edit and display a formula saved as a file in the <emph>Commands</emph> window.</paragraph>
diff --git a/helpcontent2/source/text/smath/02/03010000.xhp b/helpcontent2/source/text/smath/02/03010000.xhp
index 734ee0dc40..1af6cdca46 100644
--- a/helpcontent2/source/text/smath/02/03010000.xhp
+++ b/helpcontent2/source/text/smath/02/03010000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0203010000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Formula Cursor</title>
<filename>/text/smath/02/03010000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-05T15:32:56">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149500"><bookmark_value>formula cursor in $[officename] Math</bookmark_value>
@@ -45,7 +41,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:FormelCursor" id="bm_id3154485" localize="false"/>
<paragraph role="heading" id="hd_id3149500" xml-lang="en-US" level="1" l10n="U" oldref="1">Formula Cursor</paragraph>
-<paragraph role="paragraph" id="par_id3153916" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="cursor"><ahelp hid="SID_FORMULACURSOR">Use this icon on the Tools bar to turn the Formula Cursor on or off.</ahelp> The part of the formula where the cursor is positioned in the <emph>Commands</emph> window is marked with a thin border when the formula cursor is active.
+<paragraph role="paragraph" id="par_id3153916" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="cursor"><ahelp hid="SID_FORMULACURSOR">Use this icon on the Tools bar to turn the Formula Cursor on or off.</ahelp> The part of the formula where the cursor is positioned in the <emph>Commands</emph> window is marked with a thin border when the formula cursor is active.
</variable></paragraph>
<embed href="text/smath/00/00000004.xhp#fcurs"/>
<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="14">You can also click a position in the document to move the cursor to its corresponding position in the <emph>Commands</emph> window.</paragraph>
diff --git a/helpcontent2/source/text/smath/04/01020000.xhp b/helpcontent2/source/text/smath/04/01020000.xhp
index 8b215b35e3..960ac98a88 100755
--- a/helpcontent2/source/text/smath/04/01020000.xhp
+++ b/helpcontent2/source/text/smath/04/01020000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmath0401020000xml" indexer="include" status="PUBLISH">
@@ -68,7 +68,7 @@
<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="3" l10n="U" oldref="17">F9</paragraph>
<paragraph role="paragraph" id="par_id3153003" xml-lang="en-US" l10n="U" oldref="18">Update</paragraph>
</section>
-<paragraph role="heading" id="hd_id3153732" xml-lang="en-US" level="2" l10n="U" oldref="21">Navigation in the Formula Elements Window</paragraph>
+<paragraph role="heading" id="hd_id3153732" xml-lang="en-US" level="2" l10n="U" oldref="21">Navigation in the Elements Window</paragraph>
<section id="Cu">
<paragraph role="heading" id="hd_id3155927" xml-lang="en-US" level="3" l10n="U" oldref="23">Left or right arrow</paragraph>
<paragraph role="paragraph" id="par_id3145249" xml-lang="en-US" l10n="U" oldref="24">Move left or right to the next category or function.</paragraph>
diff --git a/helpcontent2/source/text/smath/guide/keyboard.xhp b/helpcontent2/source/text/smath/guide/keyboard.xhp
index a842272f91..a3b8a86969 100755
--- a/helpcontent2/source/text/smath/guide/keyboard.xhp
+++ b/helpcontent2/source/text/smath/guide/keyboard.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmathguidekeyboardxml" indexer="include" status="PUBLISH">
@@ -69,13 +69,13 @@
<paragraph role="listitem" id="par_id3150391" xml-lang="en-US" l10n="U" oldref="9">The cursor waits in the Commands window and you can type the formula.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="13">You can compose formulas using the Formula Elements window. Open it with the menu <emph>View - Formula Elements</emph> if it is not already open.</paragraph>
+<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="13">You can compose formulas using the Elements window. Open it with the menu <emph>View - Elements</emph> if it is not already open.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155625" xml-lang="en-US" l10n="U" oldref="10">If the Formula Elements window is open, use F6 to switch from the Commands window to the Formula Elements window and back.</paragraph>
+<paragraph role="listitem" id="par_id3155625" xml-lang="en-US" l10n="U" oldref="10">If the Elements window is open, use F6 to switch from the Commands window to the Elements window and back.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="2" l10n="U" oldref="11">Formula Elements window</paragraph>
+<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="2" l10n="U" oldref="11">Elements window</paragraph>
<embed href="text/smath/04/01020000.xhp#Cu"/>
<embed href="text/smath/04/01020000.xhp#CR"/>
<embed href="text/smath/04/01020000.xhp#Tab"/>
diff --git a/helpcontent2/source/text/smath/guide/limits.xhp b/helpcontent2/source/text/smath/guide/limits.xhp
index dffd6b592e..de96f144e7 100644
--- a/helpcontent2/source/text/smath/guide/limits.xhp
+++ b/helpcontent2/source/text/smath/guide/limits.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,13 +50,13 @@
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id8811304" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Insert - Object - Formula</item>.</paragraph>
-<paragraph role="paragraph" id="par_id1276589" xml-lang="en-US" l10n="NEW">You see the Math input window and the Formula Elements window. If you don't see the Formula Elements window, you can enable it in the View menu.</paragraph>
+<paragraph role="paragraph" id="par_id1276589" xml-lang="en-US" l10n="NEW">You see the Math input window and the Elements window. If you don't see the Elements window, you can enable it in the View menu.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3283791" xml-lang="en-US" l10n="NEW">In the upper part of the Formula Elements window, click the <emph>Operators</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3283791" xml-lang="en-US" l10n="NEW">In the upper part of the Elements window, click the <emph>Operators</emph> icon.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id9734794" xml-lang="en-US" l10n="NEW">In the lower part of the Formula Elements window, click the <emph>Sum</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id9734794" xml-lang="en-US" l10n="NEW">In the lower part of the Elements window, click the <emph>Sum</emph> icon.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id9641712" xml-lang="en-US" l10n="NEW">To enable lower and upper limits, click additionally the <emph>Upper and Lower Limits</emph> icon.</paragraph>
@@ -77,7 +77,7 @@
<paragraph role="paragraph" id="par_id6756187" xml-lang="en-US" l10n="NEW">Now the formula is complete. Click into your text document outside the formula to leave the formula editor.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id9406414" xml-lang="en-US" l10n="NEW">In the same way, you can enter an Integral formula with limits. When you click an icon from the Formula Elements window, the assigned text command is inserted in the input window. If you know the text commands, you can enter the commands directly in the input window.</paragraph>
+<paragraph role="paragraph" id="par_id9406414" xml-lang="en-US" l10n="NEW">In the same way, you can enter an Integral formula with limits. When you click an icon from the Elements window, the assigned text command is inserted in the input window. If you know the text commands, you can enter the commands directly in the input window.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id5866267" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Insert - Object - Formula</item>.</paragraph>
@@ -85,7 +85,7 @@
<listitem>
<paragraph role="paragraph" id="par_id1965697" xml-lang="en-US" l10n="NEW">Click in the input window and enter the following line:</paragraph>
<paragraph role="code" id="par_id9004486" xml-lang="en-US" l10n="NEW">int from{a} to{b} f(x)`dx</paragraph>
-<paragraph role="paragraph" id="par_id4651020" xml-lang="en-US" l10n="NEW">A small gap exists between f(x) and dx, which you can also enter using the Formula Elements window: click the <emph>Format</emph> icon, then the <emph>Small Gap</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id4651020" xml-lang="en-US" l10n="NEW">A small gap exists between f(x) and dx, which you can also enter using the Elements window: click the <emph>Format</emph> icon, then the <emph>Small Gap</emph> icon.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3877071" xml-lang="en-US" l10n="NEW">If you don't like the font of the letters f and x, choose <item type="menuitem">Format - Fonts</item> and select other fonts. Click the <emph>Default</emph> button to use the new fonts as default from now on.</paragraph>
diff --git a/helpcontent2/source/text/smath/main0103.xhp b/helpcontent2/source/text/smath/main0103.xhp
index 2ea3379f15..19a0a16582 100755
--- a/helpcontent2/source/text/smath/main0103.xhp
+++ b/helpcontent2/source/text/smath/main0103.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmathmain0103xml" indexer="include" status="PUBLISH">
@@ -42,7 +42,7 @@
<body>
<section id="ansicht">
<paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/main0103.xhp" name="View">View</link></paragraph>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="2">Sets the display scale and defines which elements you want to be visible. Most of the commands that you can enter into the <emph>Commands</emph> window can also be accessed through a mouse click if you have already opened the Formula Elements window with <link href="text/smath/01/03090000.xhp" name="View - Formula Elements"><emph>View - Formula Elements</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="2">Sets the display scale and defines which elements you want to be visible. Most of the commands that you can enter into the <emph>Commands</emph> window can also be accessed through a mouse click if you have already opened the Elements window with <link href="text/smath/01/03090000.xhp" name="View - Elements"><emph>View - Elements</emph></link>.</paragraph>
</section>
<paragraph role="heading" id="hd_id3150205" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/smath/main0503.xhp b/helpcontent2/source/text/smath/main0503.xhp
index 6bfe11a241..99866bafdf 100644
--- a/helpcontent2/source/text/smath/main0503.xhp
+++ b/helpcontent2/source/text/smath/main0503.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsmathmain0503xml" indexer="include" status="PUBLISH">
@@ -57,6 +57,6 @@
<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="2" l10n="U" oldref="17">Individual Symbols</paragraph>
<paragraph role="paragraph" id="par_id3145246" xml-lang="en-US" l10n="U" oldref="6">You can create your own symbols and import characters from other fonts. You can add new symbols to the basic catalog of $[officename] Math symbols, or create your own special catalogs. Numerous special characters are also available.</paragraph>
<paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="2" l10n="U" oldref="18">Formulas in Context</paragraph>
-<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US" l10n="U" oldref="8">To make working with formulas easier, use the context menus, which can be called up with a right mouse click. This applies especially to the Commands window. This context menu contains all the commands that are found in the Formula Elements window, and also operators, and so on, which can be inserted into your formula by mouse-click without having to key them into the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US" l10n="U" oldref="8">To make working with formulas easier, use the context menus, which can be called up with a right mouse click. This applies especially to the Commands window. This context menu contains all the commands that are found in the Elements window, and also operators, and so on, which can be inserted into your formula by mouse-click without having to key them into the Commands window.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04070000.xhp b/helpcontent2/source/text/swriter/01/04070000.xhp
index edcd9ad6bb..51f5629fd8 100644
--- a/helpcontent2/source/text/swriter/01/04070000.xhp
+++ b/helpcontent2/source/text/swriter/01/04070000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0104070000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Envelope</title>
@@ -45,7 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3025884" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3148773" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145245" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04070000.xhp" name="Envelope">Envelope</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation.
+ <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#briefumschlag"/>
@@ -58,7 +58,7 @@
<paragraph xml-lang="en-US" id="par_id3154473" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_ENVELOP_PRINT">Creates a new document and inserts the envelope.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_HID_ENVELOP_INSERT" id="bm_id3151314" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3152959" role="heading" level="2" l10n="U" oldref="6">Insert</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp> The envelope is formatted with the <emph>Envelope</emph> page style.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="CHG" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
<paragraph xml-lang="en-US" id="hd_id8208563" role="heading" level="2" l10n="NEW">To delete an envelope from a document</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/swriter/02/10020000.xhp b/helpcontent2/source/text/swriter/02/10020000.xhp
index 966f0843cb..aa8dfa3b10 100644
--- a/helpcontent2/source/text/swriter/02/10020000.xhp
+++ b/helpcontent2/source/text/swriter/02/10020000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0210020000xml" indexer="include" status="PUBLISH">
@@ -41,11 +41,10 @@
</meta>
<body>
<section id="zoomout">
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id7064959" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id3149053" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ZoomMinus" id="bm_id9029511" localize="false"/>
<paragraph role="heading" id="hd_id3149870" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/10020000.xhp" name="Zoom Out">Zoom Out</link></paragraph>
-<paragraph role="paragraph" id="par_id3147401" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ZoomIn">Zooms out to see more of the document at a reduced size.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147401" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Zooms out to see more of the document at a reduced size.</ahelp></paragraph>
</section>
<section id="syzoomin">
<table id="tbl_id3147170">
diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp
index cb5dc0ccdb..4087a50112 100755
--- a/helpcontent2/source/text/swriter/04/01020000.xhp
+++ b/helpcontent2/source/text/swriter/04/01020000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0401020000xml" indexer="include">
<title xml-lang="en-US" id="tit">Shortcut Keys for %PRODUCTNAME Writer</title>
@@ -68,7 +68,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149821" role="tablecontent" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149821" role="tablecontent" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
</tablecell>
<tablecell>
@@ -85,7 +85,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147411" role="tablecontent" l10n="U" oldref="13"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147411" role="tablecontent" l10n="U" oldref="13"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
</tablecell>
<tablecell>
@@ -118,7 +118,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153118" role="tablecontent" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153118" role="tablecontent" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F5</paragraph>
</tablecell>
<tablecell>
@@ -135,7 +135,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149601" role="tablecontent" l10n="U" oldref="26"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149601" role="tablecontent" l10n="U" oldref="26"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
</tablecell>
<tablecell>
@@ -152,7 +152,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3145116" role="tablecontent" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3145116" role="tablecontent" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
</tablecell>
<tablecell>
@@ -185,7 +185,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155324" role="tablecontent" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155324" role="tablecontent" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
</tablecell>
<tablecell>
@@ -202,7 +202,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153394" role="tablecontent" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153394" role="tablecontent" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F9</paragraph>
</tablecell>
<tablecell>
@@ -211,7 +211,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155883" role="tablecontent" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155883" role="tablecontent" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F10</paragraph>
</tablecell>
<tablecell>
@@ -236,7 +236,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0905200802191980" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id0905200802191980" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F11</paragraph>
</tablecell>
<tablecell>
@@ -245,7 +245,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155945" role="tablecontent" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155945" role="tablecontent" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F11</paragraph>
</tablecell>
<tablecell>
@@ -262,7 +262,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148979" role="tablecontent" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3148979" role="tablecontent" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
</tablecell>
<tablecell>
@@ -279,7 +279,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153876" role="tablecontent" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153876" role="tablecontent" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F12</paragraph>
</tablecell>
<tablecell>
@@ -301,7 +301,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149785" role="tablecontent" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149785" role="tablecontent" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
<tablecell>
@@ -310,7 +310,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150239" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150239" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
</tablecell>
<tablecell>
@@ -319,7 +319,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3145238" role="tablecontent" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3145238" role="tablecontent" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
</tablecell>
<tablecell>
@@ -328,7 +328,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148578" role="tablecontent" l10n="U" oldref="69"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3148578" role="tablecontent" l10n="U" oldref="69"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+E</paragraph>
</tablecell>
<tablecell>
@@ -337,7 +337,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147016" role="tablecontent" l10n="U" oldref="72"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147016" role="tablecontent" l10n="U" oldref="72"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
</tablecell>
<tablecell>
@@ -346,7 +346,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150940" role="tablecontent" l10n="U" oldref="75"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150940" role="tablecontent" l10n="U" oldref="75"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+P</paragraph>
</tablecell>
<tablecell>
@@ -355,7 +355,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154363" role="tablecontent" l10n="U" oldref="78"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3154363" role="tablecontent" l10n="U" oldref="78"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+L</paragraph>
</tablecell>
<tablecell>
@@ -364,7 +364,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150519" role="tablecontent" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150519" role="tablecontent" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
</tablecell>
<tablecell>
@@ -373,7 +373,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147538" role="tablecontent" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147538" role="tablecontent" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+B</paragraph>
</tablecell>
<tablecell>
@@ -390,7 +390,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10D39" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_idN10D39" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+0 (zero)</paragraph>
</tablecell>
<tablecell>
@@ -399,7 +399,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151287" role="tablecontent" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3151287" role="tablecontent" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+1</paragraph>
</tablecell>
<tablecell>
@@ -408,7 +408,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153751" role="tablecontent" l10n="U" oldref="93"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153751" role="tablecontent" l10n="U" oldref="93"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+2</paragraph>
</tablecell>
<tablecell>
@@ -417,25 +417,37 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10DF8" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_idN10DF8" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+3</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_idN10E23" role="tablecontent" l10n="NEW">Apply Heading 3 paragraph style</paragraph>
</tablecell>
</tablerow>
+
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1550DF8" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN5510E23" role="tablecontent" l10n="NEW">Apply Heading 4 paragraph style</paragraph>
+ </tablecell>
+ </tablerow>
+
+
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150849" role="tablecontent" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150849" role="tablecontent" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+5</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146860" role="tablecontent" l10n="U" oldref="98">1.5 Line Spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146860" role="tablecontent" l10n="CHG" oldref="98">Apply Heading 5 paragraph style</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3146878" role="tablecontent" l10n="U" oldref="99"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3146878" role="tablecontent" l10n="U" oldref="99"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Plus Key(+)</paragraph>
</tablecell>
<tablecell>
@@ -444,7 +456,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155432" role="tablecontent" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155432" role="tablecontent" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-)</paragraph>
</tablecell>
<tablecell>
@@ -453,7 +465,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150732" role="tablecontent" l10n="U" oldref="303"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150732" role="tablecontent" l10n="U" oldref="303"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+minus sign (-)</paragraph>
</tablecell>
<tablecell>
@@ -462,7 +474,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148414" role="tablecontent" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3148414" role="tablecontent" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+multiplication sign * (only on number pad)</paragraph>
</tablecell>
<tablecell>
@@ -471,7 +483,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147321" role="tablecontent" l10n="U" oldref="108"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147321" role="tablecontent" l10n="U" oldref="108"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Space</paragraph>
</tablecell>
<tablecell>
@@ -488,7 +500,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149422" role="tablecontent" l10n="U" oldref="114"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149422" role="tablecontent" l10n="U" oldref="114"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
<tablecell>
@@ -497,7 +509,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3146967" role="tablecontent" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3146967" role="tablecontent" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter</paragraph>
</tablecell>
<tablecell>
@@ -506,7 +518,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3152906" role="tablecontent" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3152906" role="tablecontent" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
<tablecell>
@@ -515,7 +527,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153772" role="tablecontent" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3153772" role="tablecontent" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
<tablecell>
@@ -540,7 +552,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148631" role="tablecontent" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3148631" role="tablecontent" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Left</paragraph>
</tablecell>
<tablecell>
@@ -549,7 +561,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154244" role="tablecontent" l10n="U" oldref="128"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3154244" role="tablecontent" l10n="U" oldref="128"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Left</paragraph>
</tablecell>
<tablecell>
@@ -574,7 +586,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154067" role="tablecontent" l10n="U" oldref="136"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3154067" role="tablecontent" l10n="U" oldref="136"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Right</paragraph>
</tablecell>
<tablecell>
@@ -583,7 +595,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155272" role="tablecontent" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155272" role="tablecontent" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Right</paragraph>
</tablecell>
<tablecell>
@@ -688,7 +700,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149371" role="tablecontent" l10n="U" oldref="162"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149371" role="tablecontent" l10n="U" oldref="162"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
<tablecell>
@@ -697,7 +709,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151030" role="tablecontent" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3151030" role="tablecontent" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Home</paragraph>
</tablecell>
<tablecell>
@@ -706,7 +718,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151075" role="tablecontent" l10n="U" oldref="168"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3151075" role="tablecontent" l10n="U" oldref="168"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
<tablecell>
@@ -715,7 +727,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149750" role="tablecontent" l10n="U" oldref="171"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3149750" role="tablecontent" l10n="U" oldref="171"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+End</paragraph>
</tablecell>
<tablecell>
@@ -724,7 +736,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147083" role="tablecontent" l10n="U" oldref="174"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147083" role="tablecontent" l10n="U" oldref="174"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageUp</paragraph>
</tablecell>
<tablecell>
@@ -733,7 +745,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153846" role="tablecontent" l10n="U" oldref="177"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153846" role="tablecontent" l10n="U" oldref="177"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageDown</paragraph>
</tablecell>
<tablecell>
@@ -782,7 +794,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148448" role="tablecontent" l10n="U" oldref="192"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3148448" role="tablecontent" l10n="U" oldref="192"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
</tablecell>
<tablecell>
@@ -791,7 +803,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151080" role="tablecontent" l10n="U" oldref="195"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3151080" role="tablecontent" l10n="U" oldref="195"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Backspace</paragraph>
</tablecell>
<tablecell>
@@ -801,7 +813,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151124" role="tablecontent" l10n="U" oldref="198"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3151124" role="tablecontent" l10n="U" oldref="198"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Del</paragraph>
</tablecell>
<tablecell>
@@ -810,7 +822,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3146937" role="tablecontent" l10n="U" oldref="201"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3146937" role="tablecontent" l10n="U" oldref="201"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Backspace</paragraph>
</tablecell>
<tablecell>
@@ -819,7 +831,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153551" role="tablecontent" l10n="U" oldref="294"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153551" role="tablecontent" l10n="U" oldref="294"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell>
@@ -828,7 +840,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147360" role="tablecontent" l10n="U" oldref="297"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147360" role="tablecontent" l10n="U" oldref="297"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</paragraph>
</tablecell>
<tablecell>
@@ -837,8 +849,8 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3145382" role="tablecontent" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ double-click or <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3145382" role="tablecontent" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ double-click or <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</paragraph>
</tablecell>
<tablecell>
@@ -863,7 +875,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153679" role="tablecontent" l10n="CHG" oldref="206"><switchinline select="sys"><caseinline select="MAC">Command+Option
+ <paragraph xml-lang="en-US" id="hd_id3153679" role="tablecontent" l10n="CHG" oldref="206"><switchinline select="sys"><caseinline select="MAC">Command+Option
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Up Arrow<comment>UFI: see sw-features "Ctrl + Up/Down accelerators added to move paragraphs". See now also i31697</comment></paragraph>
</tablecell>
<tablecell>
@@ -872,7 +884,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153712" role="tablecontent" l10n="CHG" oldref="209"><switchinline select="sys"><caseinline select="MAC">Command+Option
+ <paragraph xml-lang="en-US" id="hd_id3153712" role="tablecontent" l10n="CHG" oldref="209"><switchinline select="sys"><caseinline select="MAC">Command+Option
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell>
@@ -897,14 +909,14 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155369" role="tablecontent" l10n="U" oldref="265"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3155369" role="tablecontent" l10n="U" oldref="265"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155395"><bookmark_value>tab stops; before headings</bookmark_value>
<bookmark_value>headings; starting with tab stops</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="par_id3155395" role="tablecontent" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph xml-lang="en-US" id="par_id3155395" role="tablecontent" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149161" role="tablecontent" l10n="U" oldref="264">To change the heading level with the keyboard, first position the cursor in front of the heading.</paragraph>
</tablecell>
@@ -924,7 +936,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3156014" role="tablecontent" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3156014" role="tablecontent" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
<tablecell>
@@ -933,7 +945,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3156069" role="tablecontent" l10n="U" oldref="216"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3156069" role="tablecontent" l10n="U" oldref="216"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
<tablecell>
@@ -942,7 +954,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154308" role="tablecontent" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3154308" role="tablecontent" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
<tablecell>
@@ -951,17 +963,17 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153255" role="tablecontent" l10n="U" oldref="222"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3153255" role="tablecontent" l10n="U" oldref="222"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153281" role="tablecontent" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3153281" role="tablecontent" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154905" role="tablecontent" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3154905" role="tablecontent" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
<tablecell>
@@ -970,7 +982,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154951" role="tablecontent" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3154951" role="tablecontent" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
<tablecell>
@@ -979,41 +991,41 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150793" role="tablecontent" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command
+ <paragraph xml-lang="en-US" id="hd_id3150793" role="tablecontent" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150818" role="tablecontent" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3150818" role="tablecontent" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3154451" role="tablecontent" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command
+ <paragraph xml-lang="en-US" id="hd_id3154451" role="tablecontent" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154477" role="tablecontent" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3154477" role="tablecontent" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3145272" role="tablecontent" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3145272" role="tablecontent" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145297" role="tablecontent" l10n="U" oldref="245">3 seconds in Insert mode, Arrow Key inserts row/column, <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3145297" role="tablecontent" l10n="U" oldref="245">3 seconds in Insert mode, Arrow Key inserts row/column, <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key inserts cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3155533" role="tablecontent" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3155533" role="tablecontent" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Del</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155559" role="tablecontent" l10n="U" oldref="248">3 seconds in Delete mode, Arrow key deletes row/column, <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3155559" role="tablecontent" l10n="U" oldref="248">3 seconds in Delete mode, Arrow key deletes row/column, <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key merges cell with neighboring cell</paragraph>
</tablecell>
</tablerow>
@@ -1021,7 +1033,7 @@
<tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155593"><bookmark_value>removing; cell protection in text documents</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155593" role="tablecontent" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
+<paragraph xml-lang="en-US" id="hd_id3155593" role="tablecontent" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T</paragraph>
</tablecell>
<tablecell>
@@ -1030,7 +1042,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147496" role="tablecontent" l10n="U" oldref="270">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3147496" role="tablecontent" l10n="U" oldref="270">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
</tablecell>
<tablecell>
@@ -1071,7 +1083,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3149913" role="tablecontent" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="hd_id3149913" role="tablecontent" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
<tablecell>
@@ -1080,7 +1092,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151200" role="tablecontent" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command
+ <paragraph xml-lang="en-US" id="hd_id3151200" role="tablecontent" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
<tablecell>
@@ -1089,7 +1101,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3151246" role="tablecontent" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command
+ <paragraph xml-lang="en-US" id="hd_id3151246" role="tablecontent" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
<tablecell>
@@ -1098,7 +1110,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150129" role="tablecontent" l10n="U" oldref="310"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150129" role="tablecontent" l10n="U" oldref="310"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/swriter/guide/borders.xhp b/helpcontent2/source/text/swriter/guide/borders.xhp
index 014c95b8a6..10d35ebdda 100755
--- a/helpcontent2/source/text/swriter/guide/borders.xhp
+++ b/helpcontent2/source/text/swriter/guide/borders.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidebordersxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">User Defined Borders in Text Documents </title>
- <filename>text/swriter/guide/borders.xhp</filename>
+ <filename>/text/swriter/guide/borders.xhp</filename>
</topic>
</meta>
<body>
diff --git a/helpcontent2/source/text/swriter/guide/finding.xhp b/helpcontent2/source/text/swriter/guide/finding.xhp
index 789e9dfc29..cdb84991dc 100644
--- a/helpcontent2/source/text/swriter/guide/finding.xhp
+++ b/helpcontent2/source/text/swriter/guide/finding.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidefindingxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Finding and Replacing in Writer</title>
- <filename>text/swriter/guide/finding.xhp</filename>
+ <filename>/text/swriter/guide/finding.xhp</filename>
</topic>
</meta>
<body>
diff --git a/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp b/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
index 38d8de329d..39fd026fc0 100644
--- a/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
+++ b/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
@@ -54,8 +54,22 @@
<paragraph xml-lang="en-US" id="par_id3149634" role="listitem" l10n="U" oldref="30">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
- <list type="unordered"/>
+
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>File - New - Master Document</emph>.</paragraph>
+</listitem>
+
+<listitem>
+<paragraph role="listitem" id="par_id3149612" xml-lang="en-US" l10n="U" oldref="32">Open an existing document and choose <emph>File - Send - Create Master Document</emph>.</paragraph>
+</listitem>
+</list>
+
+
+
+
<list type="ordered" startwith="2">
<listitem>
<paragraph xml-lang="en-US" id="par_id3149873" role="listitem" l10n="CHG" oldref="28">If you are creating a new master document, the first entry in the Navigator should be a <item type="menuitem">Text</item>
@@ -66,8 +80,21 @@
<emph/>icon, and do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
- <list type="unordered"/>
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="34">To insert an existing file as a subdocument, choose <emph>File</emph>, locate the file that you want to include, and then click <emph>OK</emph>.</paragraph>
+</listitem>
+
+<listitem>
+<paragraph role="listitem" id="par_id3145405" xml-lang="en-US" l10n="U" oldref="35">To create a new subdocument, choose <emph>New Document</emph>, type a name for the file, and then click <emph>Save</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id8550981" xml-lang="en-US" l10n="CHG">To insert some text between subdocuments, choose <emph>Text</emph>. Then type the text. You cannot insert text next to an existing text entry in the Navigator.<comment>i81372</comment></paragraph>
+</listitem>
+</list>
+
+
<list type="ordered" startwith="4">
<listitem>
<paragraph xml-lang="en-US" id="par_id3153382" role="listitem" l10n="U" oldref="36">Choose <emph>File - Save</emph>.</paragraph>
@@ -160,4 +187,4 @@
<paragraph xml-lang="en-US" id="par_id3154382" role="paragraph" l10n="C"><link href="text/shared/01/02110000.xhp" name="Navigator in master mode">Navigator in master mode</link></paragraph>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/header_with_line.xhp b/helpcontent2/source/text/swriter/guide/header_with_line.xhp
index cb096a691e..e4e8991450 100644
--- a/helpcontent2/source/text/swriter/guide/header_with_line.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_with_line.xhp
@@ -64,12 +64,23 @@
<emph/>dialog opens.</paragraph>
</listitem>
</list>
- <list type="unordered"/>
- <list type="unordered"/>
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3150520" xml-lang="en-US" l10n="U" oldref="24">To add a separator line between the header or the footer and the content of the page, click the bottom edge of the square in the <emph>Line arrangement</emph> area. Click a line style in the <emph>Style</emph> box.</paragraph>
+</listitem>
+
+<listitem>
+<paragraph role="listitem" id="par_id3153742" xml-lang="en-US" l10n="U" oldref="25">To adjust the spacing between the content of the header or footer and the line, clear the <emph>Synchronize</emph> box, and then enter a value in the<emph> Bottom</emph> box.</paragraph>
+</listitem>
+</list>
+
+
+
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
<embed href="text/swriter/guide/change_header.xhp#change_header"/>
<embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/indices_delete.xhp b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
index 3b832ae028..8eee7d6bb6 100755
--- a/helpcontent2/source/text/swriter/guide/indices_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
@@ -57,7 +57,19 @@
<paragraph xml-lang="en-US" id="par_id3155526" role="listitem" l10n="U" oldref="16">Choose <emph>Edit - Index Entry</emph>, and do one of the following: </paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3154238" xml-lang="en-US" l10n="U" oldref="17">To change the entry, enter different text in the <emph>Entry</emph> box.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="18">To remove the entry, click <emph>Delete</emph>.</paragraph>
+</listitem>
+</list>
+
+
<paragraph xml-lang="en-US" id="par_id3155893" role="paragraph" l10n="U" oldref="15">To cycle through the index entries in your document, click the next or the previous arrows in the <link href="text/swriter/01/02160000.xhp" name="Edit Index Entry dialog"><emph>Edit Index Entry</emph> dialog</link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
@@ -69,4 +81,4 @@
<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/indices_enter.xhp b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
index b0729eea40..cba62f51b9 100755
--- a/helpcontent2/source/text/swriter/guide/indices_enter.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
@@ -53,7 +53,23 @@
<paragraph xml-lang="en-US" id="par_id3147409" role="listitem" l10n="U" oldref="9">Choose <emph>Insert - Indexes and Tables - Entry</emph>, and do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="11">To change the text that appears in the index, type the text that you want in the <emph>Entry</emph> box. The text that you type here does not replace the selected text in the document.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154258" xml-lang="en-US" l10n="U" oldref="8">To add an index mark to similar words in your document, select <emph>Apply to all similar texts</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3155889" xml-lang="en-US" l10n="U" oldref="10">To add the entries to a custom index, click the <emph>New User-defined Index</emph> icon, enter the name of the index, and then click <emph>OK</emph>.</paragraph>
+</listitem>
+</list>
+
+
+
<paragraph xml-lang="en-US" id="hd_id3147119" role="heading" level="2" l10n="U"
oldref="12">To Define Table of Contents Entries</paragraph>
<paragraph xml-lang="en-US" id="par_id3147132" role="paragraph" l10n="CHG" oldref="5">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents.</paragraph>
@@ -83,4 +99,4 @@
<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/load_styles.xhp b/helpcontent2/source/text/swriter/guide/load_styles.xhp
index aed007936e..120a703118 100644
--- a/helpcontent2/source/text/swriter/guide/load_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/load_styles.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguideload_stylesxml" indexer="include">
<title xml-lang="en-US" id="tit">Using Styles From Another Document or Template</title>
@@ -64,7 +64,16 @@
<paragraph xml-lang="en-US" id="par_id3145098" role="listitem" l10n="U" oldref="16">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="ordered">
+ <comment>somehow the following list disappeared, see issue 112471</comment>
+ <list type="unordered">
+
+<listitem>
+<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="17">Click an entry in the <emph>Categories</emph> list, then click the template containing the styles that you want to use in the <emph>Templates</emph> list, and then click <emph>OK</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153377" xml-lang="en-US" l10n="U" oldref="13">Click <emph>From File</emph>, locate the file containing the styles that you want to use, and then click name, and then click <emph>Open</emph>.</paragraph>
+</listitem>
+
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
diff --git a/helpcontent2/source/text/swriter/guide/main.xhp b/helpcontent2/source/text/swriter/guide/main.xhp
index 728c52d6b6..652421d4df 100755
--- a/helpcontent2/source/text/swriter/guide/main.xhp
+++ b/helpcontent2/source/text/swriter/guide/main.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidemainxml" indexer="include">
<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Writer</title>
@@ -237,7 +237,7 @@
<embed href="text/swriter/guide/printer_tray.xhp#printer_tray"/>
<embed href="text/swriter/guide/references.xhp#references"/>
<embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
-<embed href="text/swriter/guide/select_language.xhp#select_language"/>
+<comment>removed a line</comment>
<embed href="text/swriter/guide/send2html.xhp#send2html"/>
<embed href="text/swriter/guide/shortcut_writing.xhp#shortcut_writing"/>
<embed href="text/swriter/guide/text_direct_cursor.xhp#text_direct_cursor"/>
diff --git a/helpcontent2/source/text/swriter/guide/makefile.mk b/helpcontent2/source/text/swriter/guide/makefile.mk
index d70e6b8856..700a295c44 100644
--- a/helpcontent2/source/text/swriter/guide/makefile.mk
+++ b/helpcontent2/source/text/swriter/guide/makefile.mk
@@ -143,7 +143,6 @@ XHPFILES = \
section_edit.xhp \
section_insert.xhp \
sections.xhp \
- select_language.xhp \
send2html.xhp \
shortcut_writing.xhp \
smarttags.xhp \
diff --git a/helpcontent2/source/text/swriter/guide/number_sequence.xhp b/helpcontent2/source/text/swriter/guide/number_sequence.xhp
index 308e9e6cbb..0eb693f2ad 100644
--- a/helpcontent2/source/text/swriter/guide/number_sequence.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_sequence.xhp
@@ -66,7 +66,19 @@
<paragraph xml-lang="en-US" id="par_id3153387" role="listitem" l10n="U" oldref="62">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3154250" xml-lang="en-US" l10n="U" oldref="42">Type a number in the <emph>Value</emph> box, or leave the box empty to use automatic numbering.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154851" xml-lang="en-US" l10n="U" oldref="58">Select the outline level where you want the numbering to restart in the <emph>Level </emph>box.</paragraph>
+</listitem>
+</list>
+
+
+
<list type="ordered" startwith="6">
<listitem>
<paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="U" oldref="41">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
@@ -80,4 +92,4 @@
<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
index a240828075..8373dbfd81 100755
--- a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
+++ b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
@@ -58,7 +58,19 @@
<paragraph xml-lang="en-US" id="par_id3153366" role="listitem" l10n="U" oldref="23">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153390" xml-lang="en-US" l10n="U" oldref="11">To remove the number while preserving the indent of the paragraph, press the Backspace key.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="CHG" oldref="16">To remove the number and the indent of the paragraph, click the <emph>Numbering on/off</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph.</paragraph>
+</listitem>
+</list>
+
+
+
<paragraph xml-lang="en-US" id="hd_id3154856" role="heading" level="2" l10n="U"
oldref="18">To Change the Number That a Numbered List Starts With</paragraph>
<list type="ordered">
@@ -85,4 +97,4 @@
<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
<paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/pagebackground.xhp b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
index a04316fbe8..0e6c3be466 100755
--- a/helpcontent2/source/text/swriter/guide/pagebackground.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
@@ -65,7 +65,19 @@
<paragraph xml-lang="en-US" id="par_idN1084B" role="listitem" l10n="NEW">In the <emph>Next Style</emph> box, select the page style that you want to apply to the next page.</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_idN10855" xml-lang="en-US" l10n="NEW">To only apply the new page style to a single page, select "Default".</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_idN10859" xml-lang="en-US" l10n="NEW">To apply the new page style to all subsequent pages, select the name of the new page style.</paragraph>
+</listitem>
+</list>
+
+
+
<list type="ordered" startwith="6">
<listitem>
<paragraph xml-lang="en-US" id="par_idN1085F" role="listitem" l10n="NEW">Click the <emph>Background</emph> tab.</paragraph>
@@ -108,7 +120,21 @@
<emph/>box, select a page style that uses the page background.</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_idN108DB" xml-lang="en-US" l10n="NEW">To change the background of the current page only, select a page style where the Next Style option is set to "Default".</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_idN108DF" xml-lang="en-US" l10n="NEW">To change the background of the current and subsequent pages, select a page style where the Next Style option is set to the name of the page style.</paragraph>
+<paragraph role="paragraph" id="par_idN108E2" xml-lang="en-US" l10n="NEW">If you want to change the page background later on in the document, repeat steps 1 to 3.</paragraph>
+</listitem>
+</list>
+
+
+
+
<list type="ordered" startwith="5">
<listitem>
<paragraph xml-lang="en-US" id="par_idN108E8" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
@@ -121,4 +147,4 @@
<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/pagestyles.xhp b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
index 4c42411263..ae06c70292 100755
--- a/helpcontent2/source/text/swriter/guide/pagestyles.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
@@ -72,7 +72,19 @@
<paragraph xml-lang="en-US" id="par_id3145110" role="listitem" l10n="U" oldref="15">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3156252" xml-lang="en-US" l10n="U" oldref="16">To apply the custom page style to a single page, select the default page style that is used in your document in the <emph>Next Style</emph> box.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153376" xml-lang="en-US" l10n="U" oldref="17">To apply the custom page style to more than one page, select its name in the <emph>Next Style</emph> box. To stop using the style, insert a manual page break and assign it a different page style.</paragraph>
+</listitem>
+</list>
+
+
+
<list type="ordered" startwith="6">
<listitem>
<paragraph xml-lang="en-US" id="par_id3154252" role="listitem" l10n="U" oldref="20">Use the tabs in the dialog to set the layout options for the page style, and then click <emph>OK</emph>.</paragraph>
@@ -120,4 +132,4 @@
<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/section_edit.xhp b/helpcontent2/source/text/swriter/guide/section_edit.xhp
index 1454115711..da9347d3b6 100755
--- a/helpcontent2/source/text/swriter/guide/section_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/section_edit.xhp
@@ -61,7 +61,23 @@
<paragraph xml-lang="en-US" id="par_id3153397" role="listitem" l10n="U" oldref="17">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153120" xml-lang="en-US" l10n="U" oldref="18">To convert a section into normal text, click <emph>Remove</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149631" xml-lang="en-US" l10n="U" oldref="19">To make a section read-only, select the <emph>Protected</emph> check box in the <emph>Write Protection</emph> area.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149609" xml-lang="en-US" l10n="U" oldref="20">To hide a section, select the <emph>Hide</emph> check box in the <emph>Hide</emph> area.</paragraph>
+</listitem>
+</list>
+
+
+
+
<list type="ordered" startwith="4">
<listitem>
<paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="21">Set the other options that you want, and then click <emph>OK</emph>.</paragraph>
@@ -73,4 +89,4 @@
<paragraph xml-lang="en-US" id="par_id3156255" role="paragraph" l10n="U" oldref="22"><link href="text/swriter/01/02170000.xhp" name="Format - Sections">Format - Sections</link></paragraph>
<paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/select_language.xhp b/helpcontent2/source/text/swriter/guide/select_language.xhp
deleted file mode 100644
index 8dae7863b3..0000000000
--- a/helpcontent2/source/text/swriter/guide/select_language.xhp
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--
-***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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="textswriterguideselect_languagexml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Checking Spelling in Other Languages</title>
- <filename>/text/swriter/guide/select_language.xhp</filename>
- </topic>
- </meta>
- <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152443"><bookmark_value>languages; recognition of</bookmark_value>
-<bookmark_value>recognition;languages</bookmark_value>
-<bookmark_value>spellcheck;activating for all languages</bookmark_value>
-<bookmark_value>checking spelling;all languages</bookmark_value>
-</bookmark><comment>MW made a two level entry of "regognition of languages"</comment>
-<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U" oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link></variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155914" role="paragraph" l10n="U" oldref="34">$[officename] can check the spelling of words in more than one language, provided that you have installed dictionaries for the other languages.</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item> list is selected.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149643" role="listitem" l10n="CHG" oldref="39">Activate the AutoSpellcheck icon in the Standard bar.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item> feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose <item type="menuitem">Word is</item> or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
- <embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
- <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
- </body>
-</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
index a4a57fbedd..b532178f2a 100644
--- a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidespellcheck_dialogxml" indexer="include">
<title xml-lang="en-US" id="tit">Checking Spelling and Grammar</title>
@@ -68,7 +68,7 @@
</list>
<section id="relatedtopics">
<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
- <embed href="text/swriter/guide/select_language.xhp#select_language"/>
+<comment>removed a line</comment>
<paragraph xml-lang="en-US" id="par_id3147107" role="paragraph" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
diff --git a/helpcontent2/source/text/swriter/guide/subscript.xhp b/helpcontent2/source/text/swriter/guide/subscript.xhp
index 6825b72ced..aab232ac1a 100755
--- a/helpcontent2/source/text/swriter/guide/subscript.xhp
+++ b/helpcontent2/source/text/swriter/guide/subscript.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidesubscriptxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Making Text Superscript or Subscript</title>
@@ -53,7 +53,17 @@
<paragraph xml-lang="en-US" id="par_id3155865" role="listitem" l10n="U" oldref="28">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+ <comment>somehow the following list disappeared, see issue 112471, and this remained: (list type="unordered"/) (replaced brackets) </comment>
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Character - Position</emph>, and then select <emph>Superscript</emph> or <emph>Subscript</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156111" xml-lang="en-US" l10n="U" oldref="3">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+P to make the text superscript, and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+B to make the text subscript.</paragraph>
+</listitem>
+</list>
+
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph xml-lang="en-US" id="par_id3153416" role="paragraph" l10n="U" oldref="26"><link href="text/shared/01/05020500.xhp" name="Format - Character - Position">Format - Character - Position</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3154705" role="paragraph" l10n="U" oldref="27"><link href="text/shared/01/06040200.xhp" name="Tools - AutoCorrect - Replace">Tools - AutoCorrect - Replace</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/table_insert.xhp b/helpcontent2/source/text/swriter/guide/table_insert.xhp
index 8b519ca824..df9caad445 100755
--- a/helpcontent2/source/text/swriter/guide/table_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_insert.xhp
@@ -96,7 +96,20 @@
<paragraph xml-lang="en-US" id="par_id3154420" role="listitem" l10n="U" oldref="46">In your text document, do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+
+
+
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153383" xml-lang="en-US" l10n="U" oldref="47">Choose <emph>Edit - Paste</emph>. The cell range is pasted as an OLE object. To edit the contents of the cells, double-click the object.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Edit - Paste Special</emph>, and choose from the following options:</paragraph>
+</listitem>
+</list>
+
+
+
<table id="tbl_id3152755">
<tablerow>
<tablecell>
@@ -188,4 +201,4 @@
<embed href="text/swriter/guide/table_delete.xhp#table_delete"/>
<embed href="text/swriter/guide/borders.xhp#borders"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp
index 3293d59734..330837c393 100755
--- a/helpcontent2/source/text/swriter/main0204.xhp
+++ b/helpcontent2/source/text/swriter/main0204.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswritermain0204xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Bar</title>
@@ -43,20 +43,12 @@
<paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
<paragraph role="paragraph" id="par_id3154252" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_TABLE_TOOLBOX">The <emph>Table </emph>Bar contains functions you need when working with tables. It appears when you move the cursor into a table.</ahelp></paragraph>
</section>
-<embed href="text/shared/02/02010000.xhp#benvor"/>
-<embed href="text/shared/02/02010000.xhp#sylistenfeld"/>
-<embed href="text/shared/02/02020000.xhp#schriftart"/>
-<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
-<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<embed href="text/swriter/02/04250000.xhp#summe"/>
-<embed href="text/swriter/02/04250000.xhp#sysumme"/>
-<embed href="text/swriter/02/04220000.xhp#tabellefix"/>
-<embed href="text/swriter/02/04220000.xhp#sytabellefix"/>
-<embed href="text/swriter/02/04230000.xhp#tabellefixprop"/>
-<embed href="text/swriter/02/04230000.xhp#sytabellefixprop"/>
-<embed href="text/swriter/02/04240000.xhp#tabellevariabel"/>
-<embed href="text/swriter/02/04240000.xhp#sytabellevariabel"/>
+<embed href="text/shared/02/03140000.xhp#linienstil"/>
+<embed href="text/shared/02/03140000.xhp#sylinienstil"/>
+
+<embed href="text/shared/02/03130000.xhp#umrandung"/>
+<embed href="text/shared/02/03130000.xhp#syumrandung"/>
+
<paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph>
<embed href="text/shared/01/05100100.xhp#verbindentext"/>
<embed href="text/shared/01/05100100.xhp#syzellenverbinden"/>
@@ -64,6 +56,7 @@
<embed href="text/shared/01/05100200.xhp#syzellenteilen"/>
<embed href="text/shared/02/04210000.xhp#optimieren"/>
<embed href="text/shared/02/04210000.xhp#syoptimieren"/>
+
<embed href="text/swriter/02/04090000.xhp#zeileeinfuegen"/>
<embed href="text/swriter/02/04090000.xhp#syzeileeinfuegen"/>
<embed href="text/swriter/02/04100000.xhp#spalteeinfuegen"/>
@@ -73,12 +66,18 @@
<embed href="text/swriter/00/00000405.xhp#syzeileloeschen"/>
<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/swriter/01/05120500.xhp" name="Delete Column">Delete Column</link></paragraph>
<embed href="text/swriter/01/05120500.xhp#loeschentext"/>
+
+<embed href="text/swriter/02/04220000.xhp#tabellefix"/>
+<embed href="text/swriter/02/04220000.xhp#sytabellefix"/>
+<embed href="text/swriter/02/04230000.xhp#tabellefixprop"/>
+<embed href="text/swriter/02/04230000.xhp#sytabellefixprop"/>
+<embed href="text/swriter/02/04240000.xhp#tabellevariabel"/>
+<embed href="text/swriter/02/04240000.xhp#sytabellevariabel"/>
<embed href="text/swriter/00/00000405.xhp#syspalteloeschen"/>
-<embed href="text/shared/02/03130000.xhp#umrandung"/>
-<embed href="text/shared/02/03130000.xhp#syumrandung"/>
-<embed href="text/shared/02/03140000.xhp#linienstil"/>
-<embed href="text/shared/02/03140000.xhp#sylinienstil"/>
<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/>
<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+<embed href="text/swriter/02/04250000.xhp#summe"/>
+<embed href="text/swriter/02/04250000.xhp#sysumme"/>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/main0206.xhp b/helpcontent2/source/text/swriter/main0206.xhp
index 6085ab95c6..7078058505 100755
--- a/helpcontent2/source/text/swriter/main0206.xhp
+++ b/helpcontent2/source/text/swriter/main0206.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswritermain0206xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Bullets and Numbering Bar</title>
<filename>/text/swriter/main0206.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T15:24:53">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="objektleistenum">
@@ -45,12 +41,6 @@
<paragraph role="heading" id="hd_id3154256" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0206.xhp" name="Bullets and Numbering Bar">Bullets and Numbering Bar</link></paragraph>
<paragraph role="paragraph" id="par_id3154277" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_NUM_TOOLBOX">The <emph>Bullets and Numbering</emph> bar contains functions to modify the structure of numbered paragraphs, including changing the order of paragraphs and defining different paragraph levels.</ahelp></paragraph>
</section>
-<embed href="text/shared/02/02010000.xhp#benvor"/>
-<embed href="text/shared/02/02010000.xhp#sylistenfeld"/>
-<embed href="text/shared/02/02020000.xhp#schriftart"/>
-<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
-<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
<embed href="text/swriter/02/06040000.xhp#numerierungausschalten"/>
<embed href="text/swriter/02/06040000.xhp#synumerierungausschalten"/>
<embed href="text/shared/02/06060000.xhp#hochstufen"/>
diff --git a/helpcontent2/source/text/swriter/main0215.xhp b/helpcontent2/source/text/swriter/main0215.xhp
index 1c770ebfc1..8e8eca4fae 100755
--- a/helpcontent2/source/text/swriter/main0215.xhp
+++ b/helpcontent2/source/text/swriter/main0215.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswritermain0215xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Frame Bar</title>
<filename>/text/swriter/main0215.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T15:26:25">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="objektleisterahmen">
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index b79cb6bcc9..b389c418c3 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -371,17 +371,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index c5d9b0cbf5..e44424f8ee 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -384,17 +384,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 0eb859a989..af7502bc5f 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -72,17 +72,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 3af9db8e5c..5a29e0315e 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -70,17 +70,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index ea99a877b3..b216372f3b 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -305,17 +305,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index e1cb5db140..494cd75032 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -307,17 +307,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index de5ede8126..fc8767572b 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -150,17 +150,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 6e89183d78..63c3df0e3f 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -390,7 +390,6 @@ LINKLINKFILES= \
text$/swriter$/guide$/section_edit.xhp \
text$/swriter$/guide$/section_insert.xhp \
text$/swriter$/guide$/sections.xhp \
- text$/swriter$/guide$/select_language.xhp \
text$/swriter$/guide$/send2html.xhp \
text$/swriter$/guide$/shortcut_writing.xhp \
text$/swriter$/guide$/smarttags.xhp \
@@ -463,17 +462,11 @@ LINKLINKFILES= \
text$/shared$/00$/00000020.xhp \
text$/shared$/00$/00000021.xhp \
text$/shared$/00$/00000099.xhp \
- text$/shared$/00$/00000202.xhp \
- text$/shared$/00$/00000203.xhp \
- text$/shared$/00$/00000204.xhp \
- text$/shared$/00$/00000205.xhp \
+ text$/shared$/00$/00000200.xhp \
text$/shared$/00$/00000206.xhp \
text$/shared$/00$/00000207.xhp \
text$/shared$/00$/00000208.xhp \
text$/shared$/00$/00000210.xhp \
- text$/shared$/00$/00000212.xhp \
- text$/shared$/00$/00000213.xhp \
- text$/shared$/00$/00000214.xhp \
text$/shared$/00$/00000215.xhp \
text$/shared$/00$/00000401.xhp \
text$/shared$/00$/00000402.xhp \