summaryrefslogtreecommitdiff
path: root/helpcontent2/source
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source')
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11170000.xhp77
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11180000.xhp77
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11190000.xhp65
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/makefile.mk2
-rw-r--r--helpcontent2/source/text/sbasic/shared/main0211.xhp6
-rw-r--r--helpcontent2/source/text/scalc/01/02170000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/03080000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/04060103.xhp274
-rw-r--r--helpcontent2/source/text/scalc/01/04060106.xhp10
-rw-r--r--helpcontent2/source/text/scalc/01/04060109.xhp1
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060182.xhp23
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060185.xhp10
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cell_protect.xhp6
-rw-r--r--helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp3
-rw-r--r--helpcontent2/source/text/scalc/guide/format_value.xhp110
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/format_value_userdef.xhp224
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/integer_leading_zero.xhp144
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/mark_cells.xhp160
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/note_insert.xhp103
-rw-r--r--helpcontent2/source/text/scalc/guide/numbers_text.xhp13
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/rounding_numbers.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/table_view.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/text_numbers.xhp9
-rw-r--r--helpcontent2/source/text/schart/01/04030000.xhp25
-rwxr-xr-xhelpcontent2/source/text/schart/main0000.xhp17
-rwxr-xr-xhelpcontent2/source/text/schart/main0202.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000021.xhp477
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp253
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp2137
-rw-r--r--helpcontent2/source/text/shared/01/05340100.xhp63
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050100.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050200.xhp68
-rwxr-xr-xhelpcontent2/source/text/shared/01/formatting_mark.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/12000000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/12100200.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30000000.xhp84
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_send.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/export_ms.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp3
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp333
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp233
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp390
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp18
-rw-r--r--helpcontent2/source/text/shared/main0212.xhp160
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010600.xhp125
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp11
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp361
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp127
-rwxr-xr-xhelpcontent2/source/text/shared/tree_strings.xhp2
-rw-r--r--helpcontent2/source/text/simpress/01/02120000.xhp110
-rwxr-xr-xhelpcontent2/source/text/smath/01/03090000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04090200.xhp104
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge00.xhp3
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_off.xhp8
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/search_regexp.xhp112
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/tablemode.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/template_default.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp50
64 files changed, 3437 insertions, 3283 deletions
diff --git a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
index 1404317cb9..0c64213c61 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11170000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,41 +30,39 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Manage Breakpoints</title>
-<filename>/text/sbasic/shared/02/11170000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-13T10:20:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="manage_breakpoints">
-<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
-<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
-</section>
-<section id="sybreakpoints">
-<table id="tbl_id3153750">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3155339" xml-lang="en-US">Icon</alt>
+ <topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Manage Breakpoints</title>
+ <filename>/text/sbasic/shared/02/11170000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="manage_breakpoints">
+<bookmark xml-lang="en-US" branch="hid/.uno:ManageBreakPoints" id="bm_id0929200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
+ </section>
+ <section id="sybreakpoints">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="3">Manage Breakpoints</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Manage Breakpoints</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11180000.xhp b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
new file mode 100644
index 0000000000..cae3b4fb7d
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
+ * 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="textsbasicshared0211180000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Import Dialog</title>
+ <filename>/text/sbasic/shared/02/11180000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="import">
+<bookmark xml-lang="en-US" branch="hid/.uno:ImportDialog" id="bm_id092920903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11180000.xhp" name="Import Dialog">Import Dialog</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls an "Open" dialog to import a BASIC dialog file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505211" role="paragraph" l10n="NEW">If the imported dialog has a name that already exists in the library, you see a message box where you can decide to rename the imported dialog. In this case the dialog will be renamed to the next free "automatic" name like when creating a new dialog. Or you can replace the existing dialog by the imported dialog. If you click Cancel the dialog is not imported.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505360" role="paragraph" l10n="NEW">Dialogs can contain localization data. When importing a dialog, a mismatch of the dialogs' localization status can occur.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505320" role="paragraph" l10n="NEW">If the library contains additional languages compared to the imported dialog, or if the imported dialog is not localized at all, then the additional languages will silently be added to the imported dialog using the strings of the dialog's default locale.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505383" role="paragraph" l10n="NEW">If the imported dialog contains additional languages compared to the library, or if the library is not localized at all, then you see a message box with Add, Omit, and Cancel buttons.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0929200903505340" role="paragraph" l10n="NEW">Add: The additional languages from the imported dialog will be added to the already existing dialog. The resources from the library's default language will be used for the new languages. This is the same as if you add these languages manually.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0929200903505367" role="paragraph" l10n="NEW">Omit: The library's language settings will stay unchanged. The imported dialog's resources for the omitted languages are not copied into the library, but they remain in the imported dialog's source files.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <section id="syimport">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_importdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Import Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11190000.xhp b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
new file mode 100644
index 0000000000..716a0d944a
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
+ * 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="textsbasicshared0211190000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Export Dialog</title>
+ <filename>/text/sbasic/shared/02/11190000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="export">
+<bookmark xml-lang="en-US" branch="hid/.uno:ExportDialog" id="bm_id099200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11190000.xhp" name="Export Dialog">Export Dialog</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">In the dialog editor, this command calls a "Save as" dialog to export the current BASIC dialog.</ahelp></paragraph>
+ </section>
+ <section id="syexport">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_exportdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Export Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/makefile.mk b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
index 78ab5d206a..7b3a30a9a6 100644
--- a/helpcontent2/source/text/sbasic/shared/02/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
@@ -64,6 +64,8 @@ XHPFILES = \
11150000.xhp \
11160000.xhp \
11170000.xhp \
+ 11180000.xhp \
+ 11190000.xhp \
20000000.xhp
# --- Targets ------------------------------------------------------
diff --git a/helpcontent2/source/text/sbasic/shared/main0211.xhp b/helpcontent2/source/text/sbasic/shared/main0211.xhp
index cba6fc0644..9c51ab843f 100644
--- a/helpcontent2/source/text/sbasic/shared/main0211.xhp
+++ b/helpcontent2/source/text/sbasic/shared/main0211.xhp
@@ -75,11 +75,13 @@
<embed href="text/sbasic/shared/02/11110000.xhp#symodule"/>
<embed href="text/sbasic/shared/02/11120000.xhp#klammer"/>
<embed href="text/sbasic/shared/02/11120000.xhp#syklammer"/>
- <embed href="text/sbasic/shared/02/20000000.xhp#kontrollfelder"/>
- <embed href="text/sbasic/shared/02/20000000.xhp#sykontrollfelder"/>
<embed href="text/sbasic/shared/02/11140000.xhp#laden"/>
<embed href="text/sbasic/shared/02/11140000.xhp#syladen"/>
<embed href="text/sbasic/shared/02/11150000.xhp#speichern"/>
<embed href="text/sbasic/shared/02/11150000.xhp#syspeichern"/>
+ <embed href="text/sbasic/shared/02/11180000.xhp#import"/>
+ <embed href="text/sbasic/shared/02/11180000.xhp#syimport"/>
+ <embed href="text/sbasic/shared/02/11190000.xhp#export"/>
+ <embed href="text/sbasic/shared/02/11190000.xhp#syexport"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/02170000.xhp b/helpcontent2/source/text/scalc/01/02170000.xhp
index e660b427bf..2591698803 100644
--- a/helpcontent2/source/text/scalc/01/02170000.xhp
+++ b/helpcontent2/source/text/scalc/01/02170000.xhp
@@ -56,9 +56,9 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/scalc/00/00000402.xhp#btaloes"/>
</section>
-<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet if changes to the document are being recorded, as in when <emph>Edit - Changes - Record</emph> is activated.</paragraph>
+<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet while <emph>Edit - Changes - Record</emph> is activated.</paragraph>
<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="2" l10n="U" oldref="3">Yes</paragraph>
-<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Permanently deletes the active sheet.</paragraph>
+<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Deletes the current sheet.</paragraph>
<paragraph role="heading" id="hd_id3149412" xml-lang="en-US" level="2" l10n="U" oldref="5">No</paragraph>
<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="6">Cancels the dialog. No delete is performed.</paragraph>
</body>
diff --git a/helpcontent2/source/text/scalc/01/03080000.xhp b/helpcontent2/source/text/scalc/01/03080000.xhp
index 53bf5b1129..ad655a0b33 100644
--- a/helpcontent2/source/text/scalc/01/03080000.xhp
+++ b/helpcontent2/source/text/scalc/01/03080000.xhp
@@ -51,13 +51,13 @@
<bookmark xml-lang="en-US" branch="hid/FID_TOGGLESYNTAX" 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">Highlights numerical values in your sheet.</ahelp></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>
</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"/>
</section>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, number cells in blue, and all other types of cells, such as formulas, logical values, and dates, are formatted in green.</paragraph>
+<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>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060103.xhp b/helpcontent2/source/text/scalc/01/04060103.xhp
index dd0f670eec..2a6c06d755 100644
--- a/helpcontent2/source/text/scalc/01/04060103.xhp
+++ b/helpcontent2/source/text/scalc/01/04060103.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -62,17 +62,17 @@
oldref="361">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147427" role="code" l10n="U" oldref="362">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3147125" role="paragraph" l10n="U" oldref="363">
-<emph>Cost</emph> is the acquisition costs.</paragraph>
+ <emph>Cost</emph> is the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151074" role="paragraph" l10n="U" oldref="364">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+ <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
<paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="365">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+ <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156286" role="paragraph" l10n="U" oldref="366">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+ <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="367">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
+ <emph>Period</emph> is the settlement period to be considered.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="368">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
+ <emph>Rate</emph> is the rate of depreciation.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
</section>
<section id="amorlinc">
@@ -87,17 +87,17 @@
oldref="371">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147363" role="code" l10n="U" oldref="372">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3146920" role="paragraph" l10n="U" oldref="373">
-<emph>Cost</emph> means the acquisition costs.</paragraph>
+ <emph>Cost</emph> means the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3163807" role="paragraph" l10n="U" oldref="374">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+ <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148488" role="paragraph" l10n="U" oldref="375">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+ <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149530" role="paragraph" l10n="U" oldref="376">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+ <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148633" role="paragraph" l10n="U" oldref="377">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
+ <emph>Period</emph> is the settlement period to be considered.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="378">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
+ <emph>Rate</emph> is the rate of depreciation.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
</section>
<section id="accrint">
@@ -113,17 +113,17 @@
oldref="337">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3159092" role="code" l10n="U" oldref="338">ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3150519" role="paragraph" l10n="U" oldref="339">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
+ <emph>Issue</emph> is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155376" role="paragraph" l10n="U" oldref="340">
-<emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
+ <emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3166431" role="paragraph" l10n="U" oldref="341">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+ <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="342">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
+ <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
<paragraph xml-lang="en-US" id="par_id3156445" role="paragraph" l10n="U" oldref="343">
-<emph>Par</emph> is the par value of the security.</paragraph>
+ <emph>Par</emph> is the par value of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149406" role="paragraph" l10n="U" oldref="344">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+ <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3148699" role="heading" level="3" l10n="U"
oldref="345">Example</paragraph>
@@ -143,13 +143,13 @@
oldref="350">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147074" role="code" l10n="U" oldref="351">ACCRINTM(Issue; Settlement; Rate; Par; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3144773" role="paragraph" l10n="U" oldref="352">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
+ <emph>Issue</emph> is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154956" role="paragraph" l10n="CHG" oldref="353">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+ <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153972" role="paragraph" l10n="U" oldref="354">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
+ <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
<paragraph xml-lang="en-US" id="par_id3159204" role="paragraph" l10n="U" oldref="355">
-<emph>Par</emph> is the par value of the security.</paragraph>
+ <emph>Par</emph> is the par value of the security.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3155384" role="heading" level="3" l10n="U"
oldref="356">Example</paragraph>
@@ -169,13 +169,13 @@
oldref="392">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3145362" role="code" l10n="U" oldref="393">RECEIVED("Settlement"; "Maturity"; Investment; Discount; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3154654" role="paragraph" l10n="U" oldref="394">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153011" role="paragraph" l10n="U" oldref="395">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="396">
-<emph>Investment</emph> is the purchase sum.</paragraph>
+ <emph>Investment</emph> is the purchase sum.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155760" role="paragraph" l10n="U" oldref="397">
-<emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
+ <emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3154710" role="heading" level="3" l10n="U"
oldref="398">Example</paragraph>
@@ -197,23 +197,23 @@
<paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="3" l10n="U" oldref="7">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150395" role="code" l10n="U" oldref="8">PV(Rate; NPer; Pmt; FV; Type)</paragraph>
<paragraph xml-lang="en-US" id="par_id3151341" role="paragraph" l10n="U" oldref="9">
-<emph>Rate</emph> defines the interest rate per period.</paragraph>
+ <emph>Rate</emph> defines the interest rate per period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153023" role="paragraph" l10n="U" oldref="10">
-<emph>NPer</emph> is the total number of periods (payment period).</paragraph>
+ <emph>NPer</emph> is the total number of periods (payment period).</paragraph>
<paragraph xml-lang="en-US" id="par_id3146323" role="paragraph" l10n="U" oldref="11">
-<emph>Pmt</emph> is the regular payment made per period.</paragraph>
+ <emph>Pmt</emph> is the regular payment made per period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="12">
-<emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
+ <emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
<paragraph xml-lang="en-US" id="par_id3146883" role="paragraph" l10n="U" oldref="13">
-<emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
+ <emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10B13" role="paragraph" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
+ <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+ </paragraph>
<paragraph xml-lang="en-US" id="hd_id3150037" role="heading" level="3" l10n="U"
oldref="14">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3145225" role="paragraph" l10n="U" oldref="15">What is the present value of an investment, if 500 currency units are paid out monthly and the annual interest rate is 8%? The payment period is 48 months and 20,000 currency units are to remain at the end of the payment period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155907" role="paragraph" l10n="U" oldref="16">
-<item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
+ <item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149150" role="paragraph" l10n="U" oldref="17">If you enter references instead of these values into the formula, you can calculate any number of "If-then" scenarios. Please note: references to constants must be defined as absolute references. Examples of this type of application are found under the depreciation functions.</paragraph>
</section>
<section id="syd">
@@ -231,18 +231,18 @@
oldref="22">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150483" role="code" l10n="U" oldref="23">SYD(Cost; Salvage; Life; Period)</paragraph>
<paragraph xml-lang="en-US" id="par_id3146879" role="paragraph" l10n="U" oldref="24">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> is the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147423" role="paragraph" l10n="U" oldref="25">
-<emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
+ <emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151229" role="paragraph" l10n="U" oldref="26">
-<emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
+ <emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147473" role="paragraph" l10n="U" oldref="27">
-<emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
+ <emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3148434" role="heading" level="3" l10n="U"
oldref="28">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="29">A video system initially costing 50,000 currency units is to be depreciated annually for the next 5 years. The salvage value is to be 10,000 currency units. You want to calculate depreciation for the first year.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150900" role="paragraph" l10n="U" oldref="30">
-<item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
+ <item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
<paragraph xml-lang="en-US" id="par_id3146142" role="paragraph" l10n="U" oldref="31">To have an overview of depreciation rates per period, it is best to define a depreciation table. By entering the different depreciation formulas available in <item type="productname">%PRODUCTNAME</item> Calc next to each other, you can see which depreciation form is the most appropriate. Enter the table as follows:</paragraph>
<table id="tbl_id3149189">
<tablerow>
@@ -250,28 +250,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155258" role="tablehead" l10n="U" oldref="32">
-<emph>A</emph>
-</paragraph>
+ <emph>A</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154558" role="tablehead" l10n="U" oldref="33">
-<emph>B</emph>
-</paragraph>
+ <emph>B</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3152372" role="tablehead" l10n="U" oldref="34">
-<emph>C</emph>
-</paragraph>
+ <emph>C</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3149949" role="tablehead" l10n="U" oldref="35">
-<emph>D</emph>
-</paragraph>
+ <emph>D</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145123" role="tablehead" l10n="U" oldref="36">
-<emph>E</emph>
-</paragraph>
+ <emph>E</emph>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -280,28 +280,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153778" role="tablecontent" l10n="U" oldref="38">
-<item type="input">Initial Cost</item>
-</paragraph>
+ <item type="input">Initial Cost</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159083" role="tablecontent" l10n="U" oldref="39">
-<item type="input">Salvage Value</item>
-</paragraph>
+ <item type="input">Salvage Value</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150002" role="tablecontent" l10n="U" oldref="40">
-<item type="input">Useful Life</item>
-</paragraph>
+ <item type="input">Useful Life</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153006" role="tablecontent" l10n="U" oldref="41">
-<item type="input">Time Period</item>
-</paragraph>
+ <item type="input">Time Period</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154505" role="tablecontent" l10n="U" oldref="42">
-<item type="input">Deprec. SYD</item>
-</paragraph>
+ <item type="input">Deprec. SYD</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -310,28 +310,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155926" role="tablecontent" l10n="U" oldref="44">
-<item type="input">50,000 currency units</item>
-</paragraph>
+ <item type="input">50,000 currency units</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153736" role="tablecontent" l10n="U" oldref="45">
-<item type="input">10,000 currency units</item>
-</paragraph>
+ <item type="input">10,000 currency units</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150131" role="tablecontent" l10n="U" oldref="46">
-<item type="input">5</item>
-</paragraph>
+ <item type="input">5</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148766" role="tablecontent" l10n="U" oldref="47">
-<item type="input">1</item>
-</paragraph>
+ <item type="input">1</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159136" role="tablecontent" l10n="U" oldref="48">
-<item type="input">13,333.33 currency units</item>
-</paragraph>
+ <item type="input">13,333.33 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -346,8 +346,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148397" role="tablecontent" l10n="U" oldref="50">
-<item type="input">2</item>
-</paragraph>
+ <item type="input">2</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3146907" role="tablecontent" l10n="U" oldref="51">
@@ -367,13 +367,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150267" role="tablecontent" l10n="U" oldref="53">
-<item type="input">3</item>
-</paragraph>
+ <item type="input">3</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145628" role="tablecontent" l10n="U" oldref="54">
-<item type="input">8,000.00 currency units</item>
-</paragraph>
+ <item type="input">8,000.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -388,13 +388,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153545" role="tablecontent" l10n="U" oldref="56">
-<item type="input">4</item>
-</paragraph>
+ <item type="input">4</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154634" role="tablecontent" l10n="U" oldref="57">
-<item type="input">5,333.33 currency units</item>
-</paragraph>
+ <item type="input">5,333.33 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -409,13 +409,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155085" role="tablecontent" l10n="U" oldref="59">
-<item type="input">5</item>
-</paragraph>
+ <item type="input">5</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3158413" role="tablecontent" l10n="U" oldref="60">
-<item type="input">2,666.67 currency units</item>
-</paragraph>
+ <item type="input">2,666.67 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -430,13 +430,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155404" role="tablecontent" l10n="U" oldref="62">
-<item type="input">6</item>
-</paragraph>
+ <item type="input">6</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148431" role="tablecontent" l10n="U" oldref="63">
-<item type="input">0.00 currency units</item>
-</paragraph>
+ <item type="input">0.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -451,8 +451,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3083286" role="tablecontent" l10n="U" oldref="65">
-<item type="input">7</item>
-</paragraph>
+ <item type="input">7</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -469,8 +469,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154815" role="tablecontent" l10n="U" oldref="68">
-<item type="input">8</item>
-</paragraph>
+ <item type="input">8</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -487,8 +487,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156307" role="tablecontent" l10n="U" oldref="71">
-<item type="input">9</item>
-</paragraph>
+ <item type="input">9</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -505,8 +505,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3146856" role="tablecontent" l10n="U" oldref="74">
-<item type="input">10</item>
-</paragraph>
+ <item type="input">10</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -532,8 +532,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156113" role="tablecontent" l10n="U" oldref="78">
-<item type="input">&gt;0</item>
-</paragraph>
+ <item type="input">&gt;0</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -541,26 +541,26 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153625" role="tablecontent" l10n="U" oldref="79">
-<item type="input">Total</item>
-</paragraph>
+ <item type="input">Total</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151297" role="tablecontent" l10n="U" oldref="80">
-<item type="input">40,000.00 currency units</item>
-</paragraph>
+ <item type="input">40,000.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
</table>
<paragraph xml-lang="en-US" id="par_id3149979" role="paragraph" l10n="U" oldref="81">The formula in E2 is as follows:</paragraph>
<paragraph xml-lang="en-US" id="par_id3155849" role="paragraph" l10n="U" oldref="82">
-<item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
-</paragraph>
+ <item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
+ </paragraph>
<paragraph xml-lang="en-US" id="par_id3156124" role="paragraph" l10n="U" oldref="83">This formula is duplicated in column E down to E11 (select E2, then drag down the lower right corner with the mouse).</paragraph>
<paragraph xml-lang="en-US" id="par_id3147270" role="paragraph" l10n="U" oldref="84">Cell E13 contains the formula used to check the total of the depreciation amounts. It uses the SUMIF function as the negative values in E8:E11 must not be considered. The condition &gt;0 is contained in cell A13. The formula in E13 is as follows:</paragraph>
<paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="U" oldref="85">
-<item type="input">=SUMIF(E2:E11;A13)</item>
-</paragraph>
+ <item type="input">=SUMIF(E2:E11;A13)</item>
+ </paragraph>
<paragraph xml-lang="en-US" id="par_id3155998" role="paragraph" l10n="U" oldref="86">Now view the depreciation for a 10 year period, or at a salvage value of 1 currency unit, or enter a different initial cost, and so on.</paragraph>
</section>
<section id="disc">
@@ -576,13 +576,13 @@
oldref="381">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3149756" role="code" l10n="U" oldref="382">DISC("Settlement"; "Maturity"; Price; Redemption; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3156014" role="paragraph" l10n="U" oldref="383">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="384">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3159180" role="paragraph" l10n="U" oldref="385">
-<emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
+ <emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147253" role="paragraph" l10n="U" oldref="386">
-<emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
+ <emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3151174" role="heading" level="3" l10n="U"
oldref="387">Example</paragraph>
@@ -604,15 +604,15 @@
oldref="404">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3153373" role="code" l10n="U" oldref="405">DURATION_ADD("Settlement"; "Maturity"; Coupon; Yield; Frequency; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3155397" role="paragraph" l10n="U" oldref="406">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148558" role="paragraph" l10n="U" oldref="407">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153096" role="paragraph" l10n="U" oldref="408">
-<emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
+ <emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
<paragraph xml-lang="en-US" id="par_id3154594" role="paragraph" l10n="U" oldref="409">
-<emph>Yield</emph> is the annual yield of the security.</paragraph>
+ <emph>Yield</emph> is the annual yield of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149906" role="paragraph" l10n="U" oldref="410">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+ <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3146995" role="heading" level="3" l10n="U"
oldref="411">Example</paragraph>
@@ -636,14 +636,14 @@
oldref="91">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3148805" role="code" l10n="U" oldref="92">EFFECTIVE(Nom; P)</paragraph>
<paragraph xml-lang="en-US" id="par_id3149768" role="paragraph" l10n="U" oldref="93">
-<emph>Nom</emph> is the nominal interest.</paragraph>
+ <emph>Nom</emph> is the nominal interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149334" role="paragraph" l10n="U" oldref="94">
-<emph>P</emph> is the number of interest payment periods per year.</paragraph>
+ <emph>P</emph> is the number of interest payment periods per year.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154223" role="heading" level="3" l10n="U"
oldref="95">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3144499" role="paragraph" l10n="U" oldref="96">If the annual nominal interest rate is 9.75% and four interest calculation periods are defined, what is the actual interest rate (effective rate)?</paragraph>
<paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="U" oldref="97">
-<item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
+ <item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
</section>
<section id="effect_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147241"><bookmark_value>effective interest rates</bookmark_value>
@@ -658,9 +658,9 @@
oldref="416">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3155118" role="code" l10n="U" oldref="417">EFFECT_ADD(NominalRate; NPerY)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148907" role="paragraph" l10n="U" oldref="418">
-<emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
+ <emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154274" role="paragraph" l10n="U" oldref="419">
-<emph>NPerY </emph>is the number of interest payments per year.</paragraph>
+ <emph>NPerY </emph>is the number of interest payments per year.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3149156" role="heading" level="3" l10n="U"
oldref="420">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3158426" role="paragraph" l10n="U" oldref="421">What is the effective annual rate of interest for a 5.25% nominal rate and quarterly payment.</paragraph>
@@ -682,15 +682,15 @@
oldref="102">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3166452" role="code" l10n="U" oldref="103">DDB(Cost; Salvage; Life; Period; Factor)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153237" role="paragraph" l10n="U" oldref="104">
-<emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149787" role="paragraph" l10n="U" oldref="105">
-<emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
+ <emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152945" role="paragraph" l10n="U" oldref="106">
<emph>Life</emph> is the number of periods (for example, years or months) defining how long the asset is to be used.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149736" role="paragraph" l10n="U" oldref="107">
<emph>Period</emph> states the period for which the value is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150243" role="paragraph" l10n="U" oldref="108">
-<emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
+ <emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159274" role="heading" level="3" l10n="U"
oldref="109">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3152882" role="paragraph" l10n="U" oldref="110">A computer system with an initial cost of 75,000 currency units is to be depreciated monthly over 5 years. The value at the end of the depreciation is to be 1 currency unit. The factor is 2.</paragraph>
@@ -712,20 +712,20 @@
oldref="116">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3153349" role="code" l10n="U" oldref="117">DB(Cost; Salvage; Life; Period; Month)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148462" role="paragraph" l10n="U" oldref="118">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> is the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148658" role="paragraph" l10n="U" oldref="119">
-<emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
+ <emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145371" role="paragraph" l10n="U" oldref="120">
-<emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
+ <emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154608" role="paragraph" l10n="U" oldref="121">
-<emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
+ <emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150829" role="paragraph" l10n="U" oldref="122">
-<emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
+ <emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3151130" role="heading" level="3" l10n="U"
oldref="123">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3156147" role="paragraph" l10n="U" oldref="124">A computer system with an initial cost of 25,000 currency units is to be depreciated over a three year period. The salvage value is to be 1,000 currency units. One period is 30 days.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149513" role="paragraph" l10n="U" oldref="125">
-<item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
+ <item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
<paragraph xml-lang="en-US" id="par_id3159242" role="paragraph" l10n="U" oldref="126">The fixed-declining depreciation of the computer system is 1,075.00 currency units.</paragraph>
</section>
<section id="irr">
@@ -741,12 +741,12 @@
oldref="130">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3155427" role="code" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
<paragraph xml-lang="en-US" id="par_id3144758" role="paragraph" l10n="U" oldref="132">
-<emph>Values</emph> represents an array containing the values.</paragraph>
+ <emph>Values</emph> represents an array containing the values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="133">
-<emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
+ <emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3151258" role="heading" level="3" l10n="U"
oldref="134">Example</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 80.24%.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 11,33%.</paragraph>
</section>
<section id="ispmt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151012"><bookmark_value>calculating; interests for unchanged amortization installments</bookmark_value>
@@ -761,18 +761,18 @@
oldref="316">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3146070" role="code" l10n="U" oldref="317">ISPMT(Rate; Period; TotalPeriods; Invest)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="318">
-<emph>Rate</emph> sets the periodic interest rate.</paragraph>
+ <emph>Rate</emph> sets the periodic interest rate.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145777" role="paragraph" l10n="U" oldref="319">
-<emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
+ <emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153678" role="paragraph" l10n="U" oldref="320">
-<emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
+ <emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
<paragraph xml-lang="en-US" id="par_id3159390" role="paragraph" l10n="U" oldref="321">
-<emph>Invest</emph> is the amount of the investment.</paragraph>
+ <emph>Invest</emph> is the amount of the investment.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156162" role="heading" level="3" l10n="U"
oldref="322">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3149558" role="paragraph" l10n="U" oldref="323">For a credit amount of 120,000 currency units with a two-year term and monthly installments, at a yearly interest rate of 12% the level of interest after 1.5 years is required.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150949" role="paragraph" l10n="U" oldref="324">
-<item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
+ <item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
</section>
</sort>
<paragraph xml-lang="en-US" id="par_id3146812" role="paragraph" l10n="U" oldref="426"><link href="text/scalc/01/04060119.xhp" name="Forward to Financial Functions Part Two">Financial Functions Part Two</link></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 0774564c79..84ed7a721e 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -592,7 +592,7 @@ oldref="284">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3145765" role="code" l10n="CHG" oldref="285">COMBINA(Count1; Count2)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153372" role="paragraph" l10n="CHG" oldref="286"><emph>Count1</emph> is the number of items in the set.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155544" role="paragraph" l10n="CHG" oldref="287"><emph>Count2</emph> is the number of items to choose from the set.</paragraph>
-<paragraph xml-lang="en-US" id="par_id1997131" role="paragraph" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AB, BA, AC, CA, BC and CB.</paragraph>
+<paragraph xml-lang="en-US" id="par_id1997131" role="paragraph" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AA, AB, AC, BB, BC and CC.</paragraph>
<paragraph xml-lang="en-US" id="par_id2052064" role="paragraph" l10n="CHG">COMBINA implements the formula: (Count1+Count2-1)! / (Count2!(Count1-1)!)<comment>i88052</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3154584" role="heading" level="3" l10n="U"
oldref="288">Example</paragraph>
@@ -740,14 +740,14 @@ oldref="640">Example</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_POTENZ" id="bm_id3155728" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155717" role="heading" level="2" l10n="U"
oldref="350">POWER</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159495" role="paragraph" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to a power.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3159495" role="paragraph" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to another number.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3159513" role="heading" level="3" l10n="U"
oldref="352">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159526" role="code" l10n="U" oldref="353">POWER(Base; Power)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159540" role="paragraph" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Power</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159526" role="code" l10n="U" oldref="353">POWER(Base; Exponent)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159540" role="paragraph" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Exponent</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id5081637" role="paragraph" l10n="NEW">The same result may be achieved by using the exponentiation operator ^:</paragraph>
<paragraph xml-lang="en-US" id="par_id9759514" role="code" l10n="NEW">
-<item type="literal">Base^Power</item>
+<item type="literal">Base^Exponent</item>
</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159580" role="heading" level="3" l10n="U"
oldref="356">Example</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index ab90880518..7f75839ecb 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -243,7 +243,6 @@
<paragraph xml-lang="en-US" id="par_id1027200802470312" role="paragraph" l10n="NEW">
<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10CAE" role="note" l10n="NEW">If you open an Excel spreadsheet that uses indirect addresses calculated from string functions, the sheet addresses will not be translated automatically. For example, the Excel address in INDIRECT("filename!sheetname"&amp;B1) is not converted into the Calc address in INDIRECT("filename.sheetname"&amp;B1).<comment>UFI: for #i34465#</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id7687917" role="note" l10n="NEW">INDIRECT cannot resolve range names as in INDIRECT("RangeName").<comment>i83070</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3150389" role="heading" level="3" l10n="U"
oldref="67">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3150608" role="paragraph" l10n="U" oldref="68">
diff --git a/helpcontent2/source/text/scalc/01/04060182.xhp b/helpcontent2/source/text/scalc/01/04060182.xhp
index 2c38afb43d..7ae9e6e869 100755
--- a/helpcontent2/source/text/scalc/01/04060182.xhp
+++ b/helpcontent2/source/text/scalc/01/04060182.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -276,20 +276,17 @@
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GTEST" id="bm_id3147569" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153216" role="heading" level="2" l10n="U"
oldref="103">ZTEST</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150758" role="paragraph" l10n="U" oldref="104"><ahelp hid="HID_FUNC_GTEST">Returns the two-tailed P value of a z test with standard distribution.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150758" role="paragraph" l10n="CHG" oldref="104"><ahelp hid="HID_FUNC_GTEST">Calculates the probability of observing a z-statistic greater than the one computed based on a sample.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="3" l10n="U"
oldref="105">Syntax</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153274" role="code" l10n="U" oldref="106">ZTEST(Data; Number; Sigma)</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156109" role="paragraph" l10n="U" oldref="107">
- <emph>Data</emph> is the array of the data.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="U" oldref="108">
- <emph>Number</emph> is the value to be tested.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="U" oldref="109">
- <emph>Sigma</emph> (optional) is the standard deviation of the total population. If this argument is missing, the standard deviation of the sample in question will be processed.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3151289" role="heading" level="3" l10n="U"
- oldref="110">Example</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153756" role="paragraph" l10n="U" oldref="111">
- <item type="input">=ZTEST(A1:A50;12)</item> yields the probability that value 12 belongs to the standard distribution of the total population of data in A1:A50.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153274" role="code" l10n="CHG" oldref="106">ZTEST(Data; mu; Sigma)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156109" role="paragraph" l10n="CHG" oldref="107">
+ <emph>Data</emph> is the given sample, drawn from a normally distributed population.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="CHG" oldref="108">
+ <emph>mu</emph> is the known mean of the population.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="CHG" oldref="109">
+ <emph>Sigma</emph> (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
</section>
<section id="harmean">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153623"><bookmark_value>HARMEAN function</bookmark_value>
diff --git a/helpcontent2/source/text/scalc/01/04060185.xhp b/helpcontent2/source/text/scalc/01/04060185.xhp
index 16a579e51d..677ad095fd 100755
--- a/helpcontent2/source/text/scalc/01/04060185.xhp
+++ b/helpcontent2/source/text/scalc/01/04060185.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -507,8 +507,8 @@
oldref="175">WEIBULL</paragraph>
<paragraph xml-lang="en-US" id="par_id3154916" role="paragraph" l10n="U" oldref="176"><ahelp hid="HID_FUNC_WEIBULL">Returns the values of the Weibull distribution.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0305200911372767" role="paragraph" l10n="NEW">The Weibull distribution is a continuous probability distribution, with parameters Alpha &gt; 0 (shape) and Beta &gt; 0 (scale). </paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372777" role="paragraph" l10n="NEW">If C is 1, WEIBULL calculates the probability density function.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372743" role="paragraph" l10n="NEW">If C is 0, WEIBULL calculates the cumulative distribution function.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372777" role="paragraph" l10n="NEW">If C is 0, WEIBULL calculates the probability density function.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372743" role="paragraph" l10n="NEW">If C is 1, WEIBULL calculates the cumulative distribution function.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159393" role="heading" level="3" l10n="U"
oldref="177">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3154478" role="code" l10n="U" oldref="178">WEIBULL(Number; Alpha; Beta; C)</paragraph>
@@ -518,8 +518,8 @@
<emph>Alpha </emph>is the shape parameter of the Weibull distribution.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154668" role="paragraph" l10n="U" oldref="181">
<emph>Beta</emph> is the scale parameter of the Weibull distribution.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154825" role="paragraph" l10n="U" oldref="182">
- <emph>C</emph> indicates the type of function. If C equals 0 the form of the function is calculated, if C equals 1 the distribution is calculated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154825" role="paragraph" l10n="CHG" oldref="182">
+ <emph>C</emph> indicates the type of function.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3153794" role="heading" level="3" l10n="U"
oldref="183">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3146077" role="paragraph" l10n="U" oldref="184">
diff --git a/helpcontent2/source/text/scalc/guide/cell_protect.xhp b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
index 2e67ff433e..5d6cb0eb3d 100755
--- a/helpcontent2/source/text/scalc/guide/cell_protect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@
<bookmark_value>hiding;formulas</bookmark_value>
<bookmark_value>formulas;hiding</bookmark_value>
</bookmark><comment>MW transferred "modifying;..." and "changing;..." into one index entry</comment>
-<paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link>
+<paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="U" oldref="17">In <item type="productname">%PRODUCTNAME</item> Calc you can protect sheets and the document as a whole. You can choose whether the cells are protected against accidental changes, whether the formulas can be viewed from within Calc, whether the cells are visible or whether the cells can be printed.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145261" role="paragraph" l10n="U" oldref="18">Protection can be provided by means of a password, but it does not have to be. If you have assigned a password, protection can only be removed once the correct password has been entered.</paragraph>
@@ -79,7 +79,7 @@
<paragraph xml-lang="en-US" id="par_idN106C7" role="listitem" l10n="CHG">To protect the structure of the document, for example the count, <link href="text/scalc/guide/rename_table.xhp">names</link>, and order of the sheets, from being changed, choose <item type="menuitem">Tools - Protect Document - Document</item>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN106CF" role="listitem" l10n="NEW">(Optional) Enter a password of at least 5 characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106CF" role="listitem" l10n="CHG">(Optional) Enter a password.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106D2" role="warning" l10n="NEW">If you forget your password, you cannot deactivate the protection. If you only want to protect cells from accidental changes, set the sheet protection, but do not enter a password.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
index 821d21dc6f..66c15ec5be 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -53,7 +53,6 @@
<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_id3149401" role="tip" l10n="U" oldref="38">By double-clicking on some buttons inside the DataPilot table you can hide the subelements below it.</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/format_value.xhp b/helpcontent2/source/text/scalc/guide/format_value.xhp
index 842362762f..7d97cabc0d 100644
--- a/helpcontent2/source/text/scalc/guide/format_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: format_value.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,60 +32,56 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Numbers With Decimals</title>
-<filename>/text/scalc/guide/format_value.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T14:05:23">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers; formatting in tables</bookmark_value>
-<bookmark_value>formats; numbers in tables</bookmark_value>
-<bookmark_value>tables; number formats</bookmark_value>
-<bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
-<bookmark_value>decimal places;formatting numbers</bookmark_value>
-<bookmark_value>formatting;numbers with decimals</bookmark_value>
-<bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
-<bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
-<bookmark_value>deleting; decimal places</bookmark_value>
-<bookmark_value>decimal places; adding/deleting</bookmark_value>
-</bookmark><comment>mw changed one index entry</comment><comment>mw inserted three index entries from scalc/02/02160000.xhp and three index entries from scalc/02/02170000.xhp. Then changed three index entries and deleted two.</comment><comment>mw deleted one "number formats;..." entry and changed the other</comment>
-<paragraph role="heading" id="hd_id3145367" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
+ <topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Formatting Numbers With Decimals</title>
+ <filename>/text/scalc/guide/format_value.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers;formatting decimals</bookmark_value>
+ <bookmark_value>formats; numbers in tables</bookmark_value>
+ <bookmark_value>tables; number formats</bookmark_value>
+ <bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
+ <bookmark_value>decimal places;formatting numbers</bookmark_value>
+ <bookmark_value>formatting;numbers with decimals</bookmark_value>
+ <bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
+ <bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
+ <bookmark_value>deleting; decimal places</bookmark_value>
+ <bookmark_value>decimal places; adding/deleting</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145367" role="heading" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
-<paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149121">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="E">
-<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149021" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154012" role="paragraph" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147394" role="listitem" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153157" role="listitem" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
+ </listitem>
+ </list>
+ <table id="tbl_id3149121">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="E">
+<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149021">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149256" xml-lang="en-US" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149256" role="paragraph" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
-<embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
-<embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
+ <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+ <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
index 659656e40c..1144320d0d 100755
--- a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: format_value_userdef.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,115 +32,108 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">User-defined Number Formats</title>
-<filename>/text/scalc/guide/format_value_userdef.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers; user-defined formatting in tables</bookmark_value>
-<bookmark_value>formatting; user-defined numbers</bookmark_value>
-<bookmark_value>number formats; millions</bookmark_value>
-<bookmark_value>format codes; user-defined number formats</bookmark_value>
-</bookmark>
- <comment>mw copied "format codes;" from shared/01/05020300.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U" oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link>
+ <topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">User-defined Number Formats</title>
+ <filename>/text/scalc/guide/format_value_userdef.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers;user-defined formatting</bookmark_value>
+ <bookmark_value>formatting; user-defined numbers</bookmark_value>
+ <bookmark_value>number formats; millions</bookmark_value>
+ <bookmark_value>format codes; user-defined number formats</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U"
+ oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
- <table id="tbl_id3153157">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <section id="relatedtopics">
-
- <embed href="text/scalc/guide/format_value.xhp#format_value"/>
- <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
- <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
- <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
+ <table id="tbl_id3153157">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+ <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
index 9612575904..ed941f9763 100755
--- a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
+++ b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: integer_leading_zero.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,72 +32,73 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Entering a Number with Leading Zeros</title>
-<filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Entering a Number with Leading Zeros</title>
+ <filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147560"><bookmark_value>zero values; entering leading zeros</bookmark_value>
-<bookmark_value>numbers; with leading zeros</bookmark_value>
-<bookmark_value>leading zeros</bookmark_value>
-<bookmark_value>integers with leading zeros</bookmark_value>
-<bookmark_value>numbers; changing text/number formats</bookmark_value>
-<bookmark_value>cells; changing text/number formats</bookmark_value>
-<bookmark_value>formats; changing text/number</bookmark_value>
-<bookmark_value>text in cells; changing to numbers</bookmark_value>
-<bookmark_value>converting; text to numbers</bookmark_value>
-</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><paragraph role="heading" id="hd_id3147560" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
+ <bookmark_value>numbers; with leading zeros</bookmark_value>
+ <bookmark_value>leading zeros</bookmark_value>
+ <bookmark_value>integers with leading zeros</bookmark_value>
+ <bookmark_value>cells; changing text/number formats</bookmark_value>
+ <bookmark_value>formats; changing text/number</bookmark_value>
+ <bookmark_value>text in cells; changing to numbers</bookmark_value>
+ <bookmark_value>converting;text with leading zeros, into numbers</bookmark_value>
+</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><comment>mw changed "converting;" and deleted "numbers,changing..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3147560" role="heading" level="1" l10n="U"
+ oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
</variable></paragraph>
-<section id="inttext">
-<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="E" oldref="66" localize="false"/>
-<paragraph role="paragraph" id="par_id3153158" xml-lang="en-US" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155068" xml-lang="en-US" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="64">Check <emph>Current selection only</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146916" xml-lang="en-US" l10n="U" oldref="65">Click <emph>Replace All</emph>
-</paragraph>
-</listitem>
-</list>
-</section>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-<embed href="text/scalc/guide/format_value.xhp#format_value"/>
-</section>
-</body>
-</helpdocument>
+ <section id="inttext">
+ <paragraph xml-lang="en-US" id="par_id3153194" role="paragraph" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146119" role="listitem" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154013" role="listitem" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="E" oldref="66"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3153158" role="paragraph" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149377" role="listitem" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154944" role="listitem" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155068" role="listitem" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149018" role="listitem" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156382" role="listitem" l10n="U" oldref="64">Check <emph>Current selection only</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146916" role="listitem" l10n="U" oldref="65">Click <emph>Replace All</emph>
+ </paragraph>
+ </listitem>
+ </list>
+ </section>
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/mark_cells.xhp b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
index 3f34af06f0..d6cddc9d6a 100755
--- a/helpcontent2/source/text/scalc/guide/mark_cells.xhp
+++ b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mark_cells.xhp,v $
- * $Revision: 1.7.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,81 +32,87 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting Multiple Cells</title>
-<filename>/text/scalc/guide/mark_cells.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T12:48:20">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Selecting Multiple Cells</title>
+ <filename>/text/scalc/guide/mark_cells.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153361"><bookmark_value>cells; selecting</bookmark_value>
-<bookmark_value>marking cells</bookmark_value>
-<bookmark_value>selecting;cells</bookmark_value>
-<bookmark_value>multiple cells selection</bookmark_value>
-<bookmark_value>selection modes in spreadsheets</bookmark_value>
-<bookmark_value>tables; selecting ranges</bookmark_value>
+ <bookmark_value>marking cells</bookmark_value>
+ <bookmark_value>selecting;cells</bookmark_value>
+ <bookmark_value>multiple cells selection</bookmark_value>
+ <bookmark_value>selection modes in spreadsheets</bookmark_value>
+ <bookmark_value>tables; selecting ranges</bookmark_value>
</bookmark><comment>mw changed "selection modes..."</comment>
-<paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
+<paragraph xml-lang="en-US" id="hd_id3153361" role="heading" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
</variable></paragraph>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
-<paragraph role="paragraph" id="par_id3149261" xml-lang="en-US" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="19">Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. You can now move the individual cell by drag and drop.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
-<paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
-<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
-<table id="tbl_id3145643">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="10">Field contents</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="12">STD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148486" xml-lang="en-US" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="14">EXT</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150305" xml-lang="en-US" l10n="U" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="16">ADD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149261" role="paragraph" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="19">Do one of the following:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163710" role="listitem" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149959" role="listitem" l10n="CHG" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. Release the mouse button. You can now move the individual cell by drag and drop.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3154942" role="heading" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1001200901072060" role="paragraph" l10n="NEW">Do one of the following:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1001200901072023" role="paragraph" l10n="NEW">Click the STD / EXT / ADD area in the status bar until it shows ADD. Now click all cells that you want to select.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146971" role="heading" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
+ <table id="tbl_id3145643">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159264" role="paragraph" l10n="U" oldref="10">Field contents</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155337" role="paragraph" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="U" oldref="12">STD</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148486" role="paragraph" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150090" role="paragraph" l10n="U" oldref="14">EXT</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150305" role="paragraph" l10n="CHG" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked. Alternatively, Shift-click a cell.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145587" role="paragraph" l10n="U" oldref="16">ADD</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154487" xml-lang="en-US" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3154487" role="paragraph" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index a06b85a258..32644ced09 100755
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: note_insert.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,56 +30,52 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting and Editing Comments</title>
-<filename>/text/scalc/guide/note_insert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T12:10:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting and Editing Comments</title>
+ <filename>/text/scalc/guide/note_insert.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>comments; on cells</bookmark_value>
-<bookmark_value>cells;comments</bookmark_value>
-<bookmark_value>comments; on cells</bookmark_value>
-<bookmark_value>remarks on cells</bookmark_value>
-<bookmark_value>formatting;comments on cells</bookmark_value>
-<bookmark_value>viewing;comments on cells</bookmark_value>
+ <bookmark_value>cells;comments</bookmark_value>
+ <bookmark_value>comments; on cells</bookmark_value>
+ <bookmark_value>remarks on cells</bookmark_value>
+ <bookmark_value>formatting;comments on cells</bookmark_value>
+ <bookmark_value>viewing;comments on cells</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
+ oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The comment is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each comment as you like.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
-<embed href="text/scalc/guide/validity.xhp#validity"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150440" role="paragraph" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145750" role="listitem" l10n="CHG" oldref="34">The comment is visible whenever the mouse pointer is over the cell, if you did enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148575" role="listitem" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149958" role="listitem" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10699" role="listitem" l10n="NEW">Move or resize each comment as you like.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1069D" role="listitem" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
+ <embed href="text/scalc/guide/validity.xhp#validity"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/numbers_text.xhp b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
index 5d8e0a1636..b5d5299423 100644
--- a/helpcontent2/source/text/scalc/guide/numbers_text.xhp
+++ b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
@@ -41,9 +41,11 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>converting;text to numbers</bookmark_value>
-<bookmark_value>formats; text as numbers</bookmark_value>
-</bookmark>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>formats; text as numbers</bookmark_value>
+ <bookmark_value>time format conversion</bookmark_value>
+ <bookmark_value>date formats;conversion</bookmark_value>
+ <bookmark_value>converting;text, into numbers</bookmark_value>
+</bookmark><comment>mw changed "converting;" and added two index entries</comment>
<paragraph xml-lang="en-US" id="hd_id0908200901265171" role="heading" level="1" l10n="NEW"><variable id="numbers_text"><link href="text/scalc/guide/numbers_text.xhp" name="Converting Text to Numbers">Converting Text to Numbers</link>
</variable></paragraph>
<section id="text">
@@ -84,9 +86,12 @@
<paragraph xml-lang="en-US" id="par_id0908200901265420" role="paragraph" l10n="NEW">If only a time string is given, it may have an hours value of more than 24, while minutes and seconds can have a maximum value of 59.</paragraph>
<paragraph xml-lang="en-US" id="par_id0908200901265448" role="paragraph" l10n="NEW">The conversion is done for single arguments only, as in =A1+A2, or ="1E2"+1. Cell range arguments are not affected, so SUM(A1:A2) differs from A1+A2 if at least one of the two cells contain a convertible string.</paragraph>
<paragraph xml-lang="en-US" id="par_id090820090126540" role="paragraph" l10n="NEW">Strings inside formulas are also converted, such as in ="1999-11-22"+42, which returns the date 42 days after November 22nd, 1999. Calculations involving localized dates as strings inside the formula return an error. For example, the localized date string "11/22/1999" or "22.11.1999" cannot be used for the automatic conversion.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id1005200903485368" role="heading" level="2" l10n="NEW">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1005200903485359" role="paragraph" l10n="NEW">In A1 enter the text <item type="literal">'1e2</item> (which is converted to the number 100 internally).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1005200903485341" role="paragraph" l10n="NEW">In A2 enter <item type="literal">=A1+1</item> (which correctly results in 101).</paragraph>
</section>
<section id="relatedtopics">
- <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
<embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
<paragraph xml-lang="en-US" id="par_id0908200901265544" role="paragraph" l10n="NEW"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
<embed href="text/scalc/guide/format_value.xhp#format_value"/>
diff --git a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
index de02505124..1cd50455c4 100755
--- a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
@@ -73,7 +73,7 @@
<paragraph role="listitem" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="7">In the <emph>Category</emph> field, select <emph>Number</emph>. Under <emph>Options</emph>, change the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To permanently change this everywhere</paragraph>
+<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To change this everywhere</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index b0eb375903..c0da5d8dba 100755
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -53,7 +53,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="table_view"><link href="text/scalc/guide/table_view.xhp" name="Changing Table Views">Changing Table Views</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To permanently hide column and line headers in a table:</paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To hide column and line headers in a table:</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/text_numbers.xhp b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
index 940a88fdf8..37ccfb1ad4 100644
--- a/helpcontent2/source/text/scalc/guide/text_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
@@ -41,13 +41,12 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers; as text</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers;entering as text</bookmark_value>
<bookmark_value>text formats; for numbers</bookmark_value>
- <bookmark_value>numbers; entering without number formats </bookmark_value>
<bookmark_value>formats; numbers as text</bookmark_value>
<bookmark_value>cell formats; text/numbers</bookmark_value>
<bookmark_value>formatting;numbers as text</bookmark_value>
-</bookmark>
+</bookmark><comment>mw deleted "numbers; entering without..." and changed "numbers;as text"</comment>
<paragraph xml-lang="en-US" id="hd_id3145068" role="heading" level="1" l10n="U"
oldref="46"><variable id="text_numbers"><link href="text/scalc/guide/text_numbers.xhp" name="Formatting Numbers as Text">Formatting Numbers as Text</link>
</variable></paragraph>
@@ -57,8 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="45">If you decide to enter a number directly as text, enter an apostrophe (') first. For example, for years in column headings, you can enter '1999, '2000 and '2001. The apostrophe is not visible in the cell, it only indicates that the entry is to be recognized as a text. This is useful if, for example, you enter a telephone number or postal code that begins with a zero (0), because a zero (0) at the start of a sequence of digits is removed in normal number formats.</paragraph>
</section>
<section id="relatedtopics">
- <embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>
- <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
+ <embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>
+ <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
<paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="47"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
<embed href="text/scalc/guide/format_value.xhp#format_value"/>
</section>
diff --git a/helpcontent2/source/text/schart/01/04030000.xhp b/helpcontent2/source/text/schart/01/04030000.xhp
index 20ef489737..68c33ce303 100644
--- a/helpcontent2/source/text/schart/01/04030000.xhp
+++ b/helpcontent2/source/text/schart/01/04030000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -64,41 +64,46 @@
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER" id="bm_id3146972" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_NUMBER" id="bm_id901516" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_VALUE" id="bm_id8825342" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149401" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3149401" role="heading" level="2" l10n="CHG"
oldref="17">Show value as number</paragraph>
<paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" oldref="18"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER">Displays the absolute values of the data points.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_NUMBERFORMAT" id="bm_id1717276" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id5077059" role="heading" level="1" l10n="NEW">Number format</paragraph>
+<paragraph xml-lang="en-US" id="hd_id5077059" role="heading" level="2" l10n="NEW">Number format</paragraph>
<paragraph xml-lang="en-US" id="par_id9794610" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the number format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_TP_DATA_DESCR_RB_PERCENT" id="bm_id3155766" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT" id="bm_id3154254" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PERCENT" id="bm_id9111911" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145643" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3145643" role="heading" level="2" l10n="CHG"
oldref="9">Show value as percentage</paragraph>
<paragraph xml-lang="en-US" id="par_id3156382" role="paragraph" l10n="U" oldref="10"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT">Displays the percentage of the data points in each column.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_PERCENT_NUMBERFORMAT" id="bm_id381481" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1316873" role="heading" level="1" l10n="NEW">Percentage format</paragraph>
+<paragraph xml-lang="en-US" id="hd_id1316873" role="heading" level="2" l10n="NEW">Percentage format</paragraph>
<paragraph xml-lang="en-US" id="par_id5476241" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the percentage format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_TEXT" id="bm_id3149258" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT" id="bm_id3153964" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_TEXT" id="bm_id3015533" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="2" l10n="CHG"
oldref="11">Show category</paragraph>
<paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="U" oldref="12"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT">Shows the data point text labels.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_SYMBOL" id="bm_id3147004" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL" id="bm_id3143220" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SYMBOL" id="bm_id2496108" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150298" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3150298" role="heading" level="2" l10n="CHG"
oldref="15">Show legend key</paragraph>
<paragraph xml-lang="en-US" id="par_id3150205" role="paragraph" l10n="U" oldref="16"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL">Displays the legend icons next to each data point label.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SEPARATOR" id="bm_id6416821" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3836787" role="heading" level="1" l10n="NEW">Separator</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3836787" role="heading" level="2" l10n="NEW">Separator</paragraph>
<paragraph xml-lang="en-US" id="par_id6668904" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the separator between multiple text strings for the same object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PLACEMENT" id="bm_id110620081228356" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id4319284" role="heading" level="1" l10n="NEW">Placement</paragraph>
+<paragraph xml-lang="en-US" id="hd_id4319284" role="heading" level="2" l10n="NEW">Placement</paragraph>
<paragraph xml-lang="en-US" id="par_id5159459" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the placement of data labels relative to the objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_TEXTDIRECTION" id="bm_id1106200812295486" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1106200812280727" role="heading" level="1" l10n="NEW">Text Direction</paragraph>
+<paragraph xml-lang="en-US" id="hd_id1106200812280727" role="heading" level="2" l10n="NEW">Text Direction</paragraph>
<paragraph xml-lang="en-US" id="par_id1106200812280719" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_KNOB" id="bm_id100720090156524" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1007200901590713" role="heading" level="2" l10n="NEW">Rotate Text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1007200901590752" role="paragraph" l10n="NEW"><ahelp hid=".">Click in the dial to set the text orientation for the data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_EDIT" id="bm_id1007200901571849" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1007200901590757" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the rotation angle for the data labels. A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/schart/main0000.xhp b/helpcontent2/source/text/schart/main0000.xhp
index 809a58c360..c401bde8b0 100755
--- a/helpcontent2/source/text/schart/main0000.xhp
+++ b/helpcontent2/source/text/schart/main0000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,7 +48,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3154685" role="paragraph" l10n="CHG" oldref="2"><variable id="chart">$[officename] lets you present data graphically in a chart, so that you can visually compare data series and view trends in the data. You can insert charts into spreadsheets, text documents, drawings, and presentations.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3153143" role="heading" level="1" l10n="CHG"
+ <paragraph xml-lang="en-US" id="hd_id3153143" role="heading" level="2" l10n="CHG"
oldref="5">Chart Data</paragraph>
<paragraph xml-lang="en-US" id="par_id5181432" role="paragraph" l10n="NEW">Charts can be based on the following data:</paragraph>
<list type="ordered">
@@ -70,10 +70,10 @@
<bookmark xml-lang="en-US" branch="hid/.uno:StarChartDialog" id="bm_id3146060" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_INSERT_CHART" id="bm_id3149532" localize="false"/>
<paragraph xml-lang="en-US" id="par_id76601" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Creates a chart in the current document. To use a continuous range of cells as the data source for your chart, click inside the cell range, and then choose this command. Alternatively, select some cells and choose this command to create a chart of the selected cells.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="hd_id5345011" role="heading" level="1" l10n="NEW">To insert a chart</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5345011" role="heading" level="2" l10n="NEW">To insert a chart</paragraph>
<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
<embed href="text/schart/01/choose_chart_type.xhp#choose_chart_type"/>
- <paragraph xml-lang="en-US" id="hd_id5631580" role="heading" level="1" l10n="NEW">To edit a chart</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5631580" role="heading" level="2" l10n="NEW">To edit a chart</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id7911008" role="paragraph" l10n="NEW">Click a chart to edit the object properties:</paragraph>
@@ -88,8 +88,9 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id8442335" role="paragraph" l10n="NEW">Double-click a chart element in chart edit mode:</paragraph>
<paragraph xml-lang="en-US" id="par_id4194769" role="paragraph" l10n="NEW">Double-click an axis to edit the scale, type, color, and more.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8644672" role="paragraph" l10n="NEW">Double-click a data point, or a data series in the legend, to edit the graphical values of the data series.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6574907" role="paragraph" l10n="NEW">With a data series selected, double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8644672" role="paragraph" l10n="NEW">Double-click a data point to select and edit the data series to which the data point belongs.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6574907" role="paragraph" l10n="NEW">With a data series selected, click, then double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200902360575" role="paragraph" l10n="NEW">Double-click the legend to select and edit the legend. Click, then double-click a symbol in the selected legend to edit the associated data series.</paragraph>
<paragraph xml-lang="en-US" id="par_id7528916" role="paragraph" l10n="NEW">Double-click any other chart element, or click the element and open the Format menu, to edit the properties.</paragraph>
</listitem>
<listitem>
@@ -124,7 +125,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FormatStockGain" id="bm_id0810200903491288" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0810200903545113" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the stock gain indicators.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataLabels" id="bm_id0810200903510321" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0810200903545149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data lables.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0810200903545149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data labels.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatYErrorBars" id="bm_id0810200903522796" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0810200903545159" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the Y error bars.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatMeanValue" id="bm_id0810200903531785" localize="false"/>
@@ -184,4 +185,4 @@
<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
<embed href="text/schart/01/three_d_view.xhp#three_d_view"/>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/schart/main0202.xhp b/helpcontent2/source/text/schart/main0202.xhp
index c2a5ecdf08..01fa2c3699 100755
--- a/helpcontent2/source/text/schart/main0202.xhp
+++ b/helpcontent2/source/text/schart/main0202.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="hd_id0810200902300537" role="heading" level="2" l10n="NEW">Chart Data Table</paragraph>
<paragraph xml-lang="en-US" id="par_id0810200902300699" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Data Table dialog where you can edit the chart data.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300672" role="heading" level="2" l10n="NEW">Horizontal Grid On/Off</paragraph>
- <paragraph xml-lang="en-US" id="par_id0810200902300630" role="paragraph" l10n="NEW"><ahelp hid=".">The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the X axis. Note: This only works if the Minor grid check boxes in Insert - Grids are cleared.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0810200902300630" role="paragraph" l10n="CHG"><ahelp hid=".">The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the Y axis.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300738" role="heading" level="2" l10n="NEW">Legend On/Off</paragraph>
<paragraph xml-lang="en-US" id="par_id081020090230076" role="paragraph" l10n="NEW"><ahelp hid=".">To show or hide a legend, click Legend On/Off on the Formatting bar.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300785" role="heading" level="2" l10n="NEW">Scale Text</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..cb699afc17 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000021.xhp,v $
- *
- * $Revision: 1.23.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -37,238 +35,251 @@
<meta>
-<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">XML File Formats</title>
-<filename>/text/shared/00/00000021.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">XML File Formats</title>
+ <filename>/text/shared/00/00000021.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>exporting; XML files</bookmark_value>
-<bookmark_value>XML file formats</bookmark_value>
-<bookmark_value>extensions; file formats</bookmark_value>
-<bookmark_value>suffixes in file formats</bookmark_value>
-<bookmark_value>document types in $[officename]</bookmark_value>
-<bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
-<bookmark_value>defaults;file formats in $[officename]</bookmark_value>
-<bookmark_value>file formats;OpenDocument/XML</bookmark_value>
-<bookmark_value>OpenDocument file formats</bookmark_value>
-<bookmark_value>ODF file formats</bookmark_value>
+ <bookmark_value>XML file formats</bookmark_value>
+ <bookmark_value>extensions; file formats</bookmark_value>
+ <bookmark_value>suffixes in file formats</bookmark_value>
+ <bookmark_value>document types in $[officename]</bookmark_value>
+ <bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
+ <bookmark_value>defaults;file formats in $[officename]</bookmark_value>
+ <bookmark_value>file formats;OpenDocument/XML</bookmark_value>
+ <bookmark_value>OpenDocument file formats</bookmark_value>
+ <bookmark_value>ODF file formats</bookmark_value>
</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DID_SAVE_PACKED_XML" id="bm_id3159242" localize="false"/>
-<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
+<paragraph xml-lang="en-US" id="hd_id3154408" role="heading" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148919" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10725" xml-lang="en-US" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="2" l10n="CHG" oldref="4">OpenDocument file format names</paragraph>
-<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
+ <paragraph xml-lang="en-US" id="par_id3148919" role="paragraph" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10725" role="note" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="2" l10n="CHG"
+ oldref="4">OpenDocument file format names</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154926" role="paragraph" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
<table id="tbl_id3109850">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="6">Document format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="7">File extension</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10762" xml-lang="en-US" l10n="CHG">ODF Text </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10767" xml-lang="en-US" l10n="NEW">*.odt</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1076D" xml-lang="en-US" l10n="CHG">ODF Text Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10772" xml-lang="en-US" l10n="NEW">*.ott</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10778" xml-lang="en-US" l10n="NEW">ODF Master Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1077D" xml-lang="en-US" l10n="NEW">*.odm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10783" xml-lang="en-US" l10n="NEW">HTML Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10788" xml-lang="en-US" l10n="NEW">*.html</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1078E" xml-lang="en-US" l10n="NEW">HTML Document Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10793" xml-lang="en-US" l10n="NEW">*.oth</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10799" xml-lang="en-US" l10n="CHG">ODF Spreadsheet</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1079E" xml-lang="en-US" l10n="NEW">*.ods</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A4" xml-lang="en-US" l10n="CHG">ODF Spreadsheet Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A9" xml-lang="en-US" l10n="NEW">*.ots</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107AF" xml-lang="en-US" l10n="CHG">ODF Drawing</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107B4" xml-lang="en-US" l10n="NEW">*.odg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BA" xml-lang="en-US" l10n="CHG">ODF Drawing Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BF" xml-lang="en-US" l10n="NEW">*.otg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107C5" xml-lang="en-US" l10n="CHG">ODF Presentation</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107CA" xml-lang="en-US" l10n="NEW">*.odp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D0" xml-lang="en-US" l10n="CHG">ODF Presentation Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D5" xml-lang="en-US" l10n="NEW">*.otp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107DB" xml-lang="en-US" l10n="CHG">ODF Formula</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107E0" xml-lang="en-US" l10n="NEW">*.odf</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="CHG">ODF Database</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10860" xml-lang="en-US" l10n="NEW">*.odb</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2089907" xml-lang="en-US" l10n="NEW">*.oxt</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157898" role="tablehead" l10n="CHG" oldref="6">Document format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149549" role="tablehead" l10n="U" oldref="7">File extension</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10762" role="tablecontent" l10n="CHG">ODF Text </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10767" role="tablecontent" l10n="NEW">*.odt</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1076D" role="tablecontent" l10n="CHG">ODF Text Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10772" role="tablecontent" l10n="NEW">*.ott</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="tablecontent" l10n="NEW">ODF Master Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent" l10n="NEW">*.odm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent" l10n="NEW">HTML Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10788" role="tablecontent" l10n="NEW">*.html</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="CHG">ODF HTML Document Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10793" role="tablecontent" l10n="NEW">*.oth</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10799" role="tablecontent" l10n="CHG">ODF Spreadsheet</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1079E" role="tablecontent" l10n="NEW">*.ods</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="tablecontent" l10n="CHG">ODF Spreadsheet Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A9" role="tablecontent" l10n="NEW">*.ots</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107AF" role="tablecontent" l10n="CHG">ODF Drawing</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107B4" role="tablecontent" l10n="NEW">*.odg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BA" role="tablecontent" l10n="CHG">ODF Drawing Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BF" role="tablecontent" l10n="NEW">*.otg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107C5" role="tablecontent" l10n="CHG">ODF Presentation</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107CA" role="tablecontent" l10n="NEW">*.odp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D0" role="tablecontent" l10n="CHG">ODF Presentation Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="tablecontent" l10n="NEW">*.otp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107DB" role="tablecontent" l10n="CHG">ODF Formula</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107E0" role="tablecontent" l10n="NEW">*.odf</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="CHG">ODF Database</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10860" role="tablecontent" l10n="NEW">*.odb</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id9756157" role="tablecontent" l10n="NEW">%PRODUCTNAME Extension</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2089907" role="tablecontent" l10n="NEW">*.oxt</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="note" id="par_idN1088F" xml-lang="en-US" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
-<paragraph role="paragraph" id="par_id4818872" xml-lang="en-US" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
-<paragraph role="heading" id="par_idN107E3" xml-lang="en-US" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
-<paragraph role="paragraph" id="par_id0514200811525257" xml-lang="en-US" l10n="NEW">The OpenDocument format evolves over time.<comment>UFI: convert text to table as soon as Help Authoring Environment allows new tables</comment></paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id0514200811565671" xml-lang="en-US" l10n="NEW">ODF version</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530375" xml-lang="en-US" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565662" xml-lang="en-US" l10n="NEW">ODF 1.0 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530487" xml-lang="en-US" l10n="NEW">2005-05-01</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530455" xml-lang="en-US" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565787" xml-lang="en-US" l10n="NEW">ODF 1.1 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530479" xml-lang="en-US" l10n="NEW">2007-02-02</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530467" xml-lang="en-US" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565762" xml-lang="en-US" l10n="NEW">ODF 1.2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530440" xml-lang="en-US" l10n="NEW">to be announced</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN1088F" role="note" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4818872" role="paragraph" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107E3" role="heading" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0514200811525257" role="paragraph" l10n="NEW">The OpenDocument format evolves over time.</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565671" role="tablehead" l10n="NEW">ODF version</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530375" role="tablehead" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530491" role="tablehead" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565662" role="tablecontent" l10n="NEW">ODF 1.0 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530487" role="tablecontent" l10n="NEW">2005-05-01</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530455" role="tablecontent" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565787" role="tablecontent" l10n="NEW">ODF 1.1 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530479" role="tablecontent" l10n="NEW">2007-02-02</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530467" role="tablecontent" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">-</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530471" role="tablecontent" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent" l10n="NEW">ODF 1.2 (Extended)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
-<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
-<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
-<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3150740" xml-lang="en-US" l10n="CHG" oldref="33">If you save a document with a password, <emph>meta.xml</emph> will not be encrypted.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150391" xml-lang="en-US" l10n="U" oldref="34">The file <emph>settings.xml</emph> contains further information about the settings for this document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="35">In <emph>styles.xml,</emph> you find the styles applied to the document that can be seen in the Styles and Formatting window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153353" xml-lang="en-US" l10n="U" oldref="36">The <emph>meta-inf/manifest.xml</emph> file describes the structure of the XML file.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153368" xml-lang="en-US" l10n="CHG" oldref="37">Additional files and folders can be contained in the packed file format.</paragraph>
-<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="38">Definition of the XML formats</paragraph>
-<paragraph role="paragraph" id="par_idN10AAD" xml-lang="en-US" l10n="NEW">The schema for the OpenDocument formats can be found on the <link href="http://www.oasis-open.org">www.oasis-open.org</link> web site.</paragraph>
-<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="39">The DTD (Document Type Description) files for the older formats can be found in the installation folder.<comment>removed path</comment></paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="OpenOffice.org">OpenOffice.org</link> website.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/doc_open.xhp#doc_open"/>
-<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<paragraph role="paragraph" id="par_idN10AC5" xml-lang="en-US" l10n="NEW"><link href="text/shared/autopi/01130000.xhp">Document Converter Wizard</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id0514200811525591" role="paragraph" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1. Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146907" role="tip" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150398" role="heading" level="2" l10n="U"
+ oldref="28">XML file structure</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149649" role="paragraph" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153178" role="listitem" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154068" role="listitem" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145152" role="listitem" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150391" role="listitem" l10n="U" oldref="34">The file <emph>settings.xml</emph> contains further information about the settings for this document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150447" role="listitem" l10n="U" oldref="35">In <emph>styles.xml,</emph> you find the styles applied to the document that can be seen in the Styles and Formatting window.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153353" role="listitem" l10n="U" oldref="36">The <emph>meta-inf/manifest.xml</emph> file describes the structure of the XML file.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="CHG" oldref="37">Additional files and folders can be contained in the packed file format.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154299" role="heading" level="2" l10n="U"
+ oldref="38">Definition of the XML formats</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AAD" role="paragraph" l10n="NEW">The schema for the OpenDocument formats can be found on the <link href="http://www.oasis-open.org">www.oasis-open.org</link> web site.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149561" role="paragraph" l10n="CHG" oldref="39">The DTD (Document Type Description) files for the older formats can be found in the installation folder.<comment>removed path</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152596" role="paragraph" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="OpenOffice.org">OpenOffice.org</link> website.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/doc_open.xhp#doc_open"/>
+ <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <paragraph xml-lang="en-US" id="par_idN10AC5" role="paragraph" l10n="NEW"><link href="text/shared/autopi/01130000.xhp">Document Converter Wizard</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index d6fcd04818..0083ec417e 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -227,7 +227,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3146081" role="paragraph" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline><emph>Position and Size - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts)
+</caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts)
</variable></paragraph>
<section id="punkte">
<paragraph xml-lang="en-US" id="par_id3083283" role="paragraph" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index ecaa6f6d49..c77a3b8746 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,129 +32,157 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Open</title>
-<filename>/text/shared/01/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Open</title>
+ <filename>/text/shared/01/01020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145211"><bookmark_value>directories; creating new</bookmark_value>
-<bookmark_value>folder creation</bookmark_value>
-<bookmark_value>My Documents folder; opening</bookmark_value>
-<bookmark_value>default directories</bookmark_value>
-<bookmark_value>multiple documents; opening</bookmark_value>
-<bookmark_value>opening; several files</bookmark_value>
-<bookmark_value>selecting; several files</bookmark_value>
-<bookmark_value>opening; files, with placeholders</bookmark_value>
-<bookmark_value>regular expressions; opening files</bookmark_value>
-<bookmark_value>files; opening with placeholders</bookmark_value>
-<bookmark_value>placeholders;on opening files</bookmark_value>
-<bookmark_value>documents; opening with templates</bookmark_value>
-<bookmark_value>templates; opening documents with</bookmark_value>
-<bookmark_value>documents; styles changed</bookmark_value>
-<bookmark_value>styles; 'changed' message</bookmark_value>
-</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment>
+ <bookmark_value>folder creation</bookmark_value>
+ <bookmark_value>My Documents folder; opening</bookmark_value>
+ <bookmark_value>default directories</bookmark_value>
+ <bookmark_value>multiple documents; opening</bookmark_value>
+ <bookmark_value>opening; several files</bookmark_value>
+ <bookmark_value>selecting; several files</bookmark_value>
+ <bookmark_value>opening; files, with placeholders</bookmark_value>
+ <bookmark_value>placeholders;on opening files</bookmark_value>
+ <bookmark_value>documents; opening with templates</bookmark_value>
+ <bookmark_value>templates; opening documents with</bookmark_value>
+ <bookmark_value>documents; styles changed</bookmark_value>
+ <bookmark_value>styles; 'changed' message</bookmark_value>
+</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment><comment>mw deleted "regular expressions;" and "files;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDOC" id="bm_id3908743" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Open" id="bm_id3146765" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146936" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151191" role="paragraph" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000401.xhp#oeffnen"/>
-</section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
-<paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#oeffnen"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149877" role="paragraph" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
+ <emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
+ <emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
+ <emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
+ <emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150713" role="note" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="11">Up One Level</paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
-<embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
+<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147250" role="heading" level="2" l10n="U"
+ oldref="11">Up One Level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147226" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id3153748" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="2" l10n="U" oldref="13">Create New Directory</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
+<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145211" role="heading" level="2" l10n="U"
+ oldref="13">Create New Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id3147008" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id5397808" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="2" l10n="U" oldref="38">Default Directory</paragraph>
-<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="19">Display area</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
-<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/><paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/><paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/><paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/><paragraph role="paragraph" id="par_id3161458" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/><paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147010" role="heading" level="2" l10n="U"
+ oldref="38">Default Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3109847" role="paragraph" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U"
+ oldref="19">Display area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159256" role="tip" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153331" role="paragraph" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3161458" role="paragraph" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147531" role="paragraph" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_FOLDER_FILENAME" id="bm_id3149656" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/><paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="2" l10n="U" oldref="21">File name</paragraph>
-<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3153779" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154280" role="heading" level="2" l10n="U"
+ oldref="21">File name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161656" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150541" role="paragraph" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153779" role="paragraph" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>For example, to list all of the text files in a directory, enter the asterisk wildcard with the text file extension (*.txt), and then click<emph> Open</emph>. Use the question mark (?) wildcard to represent any character, as in (??3*.txt), which only displays text files with a '3' as the third character in the file name.</defaultinline></switchinline></paragraph>
-<embed href="text/shared/04/01010000.xhp#autocompurl"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="2" l10n="U" oldref="81">Version</paragraph>
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
+ <embed href="text/shared/04/01010000.xhp#autocompurl"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145117" role="heading" level="2" l10n="U"
+ oldref="81">Version</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149291" role="paragraph" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id3151176" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="25">File type</paragraph>
-<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+ oldref="25">File type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153969" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/><paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="27">Open</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="2" l10n="U" oldref="88">Insert</paragraph>
-<paragraph role="paragraph" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="2" l10n="U" oldref="35">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154125" role="heading" level="2" l10n="U"
+ oldref="27">Open</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152933" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147085" role="heading" level="2" l10n="U"
+ oldref="88">Insert</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156293" role="paragraph" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="2" l10n="U"
+ oldref="35">Read-only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
<switch select="appl">
<case select="IMPRESS">
-<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/><paragraph role="heading" id="hd_id3149984" xml-lang="en-US" level="2" l10n="U" oldref="113">Play</paragraph>
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149984" role="heading" level="2" l10n="U"
+ oldref="113">Play</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
</case>
</switch>
<section id="vorlagen">
-<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/><paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="3" l10n="U" oldref="53">Opening Documents With Templates</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="CHG" oldref="40">
-<item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151292" xml-lang="en-US" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144442" xml-lang="en-US" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
+<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="3" l10n="U"
+ oldref="53">Opening Documents With Templates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="CHG" oldref="40">
+ <item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151292" role="listitem" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
</caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph></link></paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
-<paragraph role="note" id="par_id6930143" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Save As</item> and select a template filter to save a template at any other directory that is not in the list, then the documents based on that template will not be checked.</paragraph>
-<paragraph role="paragraph" id="par_id3150105" xml-lang="en-US" l10n="CHG" oldref="73">When you open a document that was created from a "sticky template" (as defined above), <item type="productname">%PRODUCTNAME</item> checks to see if the template has been modified since the document was last opened. If the template was changed a dialog is shown where you can select which styles to apply to the document.</paragraph>
-<paragraph role="paragraph" id="par_id3153096" xml-lang="en-US" l10n="U" oldref="74">To apply the new styles from the template to the document, click <emph>Yes</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3147581" xml-lang="en-US" l10n="U" oldref="75">To retain the styles that are currently used in the document, click <emph>No</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3154988" xml-lang="en-US" l10n="U" oldref="44">If a document was created using a template that cannot be found a dialog is shown that asks you how to proceed next time the document is opened.</paragraph>
-<paragraph role="paragraph" id="par_id3151351" xml-lang="en-US" l10n="CHG" oldref="91">To break the link between the document and the missing template, click <emph>No</emph>, otherwise <item type="productname">%PRODUCTNAME</item> will look for the template the next time you open the document.</paragraph>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149417" xml-lang="en-US" l10n="C"><link href="text/shared/guide/doc_open.xhp" name="Opening Documents">Opening Documents</link></paragraph>
-<paragraph role="paragraph" id="par_id3153848" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000020.xhp" name="Import and Export Filters">Import and Export Filters</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146905" role="listitem" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
+ <emph>- Paths</emph></link></paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id7375713" role="note" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6930143" role="note" l10n="NEW">When you use <item type="menuitem">File - Save As</item> and select a template filter to save a template at any other directory that is not in the list, then the documents based on that template will not be checked.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150105" role="paragraph" l10n="CHG" oldref="73">When you open a document that was created from a "sticky template" (as defined above), <item type="productname">%PRODUCTNAME</item> checks to see if the template has been modified since the document was last opened. If the template was changed a dialog is shown where you can select which styles to apply to the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153096" role="paragraph" l10n="U" oldref="74">To apply the new styles from the template to the document, click <emph>Yes</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147581" role="paragraph" l10n="U" oldref="75">To retain the styles that are currently used in the document, click <emph>No</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154988" role="paragraph" l10n="U" oldref="44">If a document was created using a template that cannot be found a dialog is shown that asks you how to proceed next time the document is opened.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151351" role="paragraph" l10n="CHG" oldref="91">To break the link between the document and the missing template, click <emph>No</emph>, otherwise <item type="productname">%PRODUCTNAME</item> will look for the template the next time you open the document.</paragraph>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149417" role="paragraph" l10n="C"><link href="text/shared/guide/doc_open.xhp" name="Opening Documents">Opening Documents</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153848" role="paragraph" l10n="C"><link href="text/shared/00/00000020.xhp" name="Import and Export Filters">Import and Export Filters</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 533a05b40d..79eb1411a1 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -198,7 +198,8 @@
<paragraph xml-lang="en-US" id="par_id3156293" role="tablecontent" l10n="U" oldref="174">[a-e]</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e, including both start and end characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id100520090232005" role="tablecontent" l10n="NEW">The characters are ordered by their code numbers.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -214,7 +215,7 @@
<paragraph xml-lang="en-US" id="par_id3145318" role="tablecontent" l10n="U" oldref="178">[^a-s]</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents any character that is not between a and s.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents everything that is not between a and s.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -231,7 +232,7 @@
<paragraph xml-lang="en-US" id="par_id3153951" role="tablecontent" l10n="U" oldref="186">|</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before or after the "|". For example, "this|that" finds "this" and "that".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before the "|" and also finds the terms that occur after the "|". For example, "this|that" finds "this" and "that".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -239,7 +240,7 @@
<paragraph xml-lang="en-US" id="par_id3147376" role="tablecontent" l10n="U" oldref="209">{2}</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds "tree".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds and selects "tree".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -247,7 +248,7 @@
<paragraph xml-lang="en-US" id="par_id3151289" role="tablecontent" l10n="U" oldref="211">{1,2}</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="U" oldref="212">Defines the number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds both "tree" and "treated".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="CHG" oldref="212">Defines the minimum and maximum number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds and selects "tre" and "tree".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -333,7 +334,7 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150092" role="tablecontent" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
-</paragraph>
+ </paragraph>
</tablecell>
</tablerow>
</table>
@@ -348,7 +349,12 @@
<paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">$ means the match must end a paragraph. </paragraph>
<section id="relatedtopics">
<embed href="text/shared/01/02100000.xhp#02100000"/>
- <paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+<switch select="appl">
+<case select="WRITER"><embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+ <embed href="text/swriter/guide/finding.xhp#finding"/>
+</case>
+</switch>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
<paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 567c64a43b..f8045f39ba 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020301.xhp,v $
- * $Revision: 1.13.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,1082 +35,1103 @@
<meta>
-<topic id="textshared0105020301xml" indexer="include">
-<title id="tit" xml-lang="en-US">Number Format Codes</title>
-<filename>/text/shared/01/05020301.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0105020301xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Number Format Codes</title>
+ <filename>/text/shared/01/05020301.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153514"><bookmark_value>format codes; numbers</bookmark_value>
-<bookmark_value>conditions; in number formats</bookmark_value>
-<bookmark_value>number formats; codes</bookmark_value>
-<bookmark_value>currency formats</bookmark_value>
-<bookmark_value>formats;of currencies/date/time</bookmark_value>
-<bookmark_value>numbers; date, time and currency formats</bookmark_value>
-<bookmark_value>Euro; currency formats</bookmark_value>
-<bookmark_value>date formats</bookmark_value>
-<bookmark_value>times, formats</bookmark_value>
-</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment>
-<paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
+ <bookmark_value>conditions; in number formats</bookmark_value>
+ <bookmark_value>number formats; codes</bookmark_value>
+ <bookmark_value>currency formats</bookmark_value>
+ <bookmark_value>formats;of currencies/date/time</bookmark_value>
+ <bookmark_value>numbers; date, time and currency formats</bookmark_value>
+ <bookmark_value>Euro; currency formats</bookmark_value>
+ <bookmark_value>date formats</bookmark_value>
+ <bookmark_value>times;formats</bookmark_value>
+</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment><comment>mw corrected a typo in "times, formats"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150467" xml-lang="en-US" l10n="U" oldref="88">Number format codes can consist of up to three sections separated by a semicolon (;).</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="108">In a number format code with two sections, the first section applies to positive values and zero, and the second section applies to negative values.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3158442" xml-lang="en-US" l10n="CHG" oldref="109">In a number format code with three sections, the first section applies to positive values, the second section to negative values, and the third section to the value zero.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="110">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="2" l10n="U" oldref="229">Decimal Places and Significant Digits</paragraph>
-<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U" oldref="3">Use zero (0) or the number sign (#) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format.</paragraph>
-<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="107">Use question marks (?) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
-<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
-<table id="tbl_id3149760">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150902" xml-lang="en-US" l10n="U" oldref="86">Placeholders</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="87">Explanation</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="5">#</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="6">Does not display extra zeros.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">0 (Zero)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Displays extra zeros if the number has less places than zeros in the format.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3150467" role="paragraph" l10n="U" oldref="88">Number format codes can consist of up to three sections separated by a semicolon (;).</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150146" role="listitem" l10n="U" oldref="108">In a number format code with two sections, the first section applies to positive values and zero, and the second section applies to negative values.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3158442" role="listitem" l10n="CHG" oldref="109">In a number format code with three sections, the first section applies to positive values, the second section to negative values, and the third section to the value zero.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155069" role="listitem" l10n="U" oldref="110">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3151262" role="heading" level="2" l10n="U"
+ oldref="229">Decimal Places and Significant Digits</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153624" role="paragraph" l10n="U" oldref="3">Use zero (0) or the number sign (#) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153323" role="paragraph" l10n="U" oldref="107">Use question marks (?) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="U" oldref="4">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
+ <table id="tbl_id3149760">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150902" role="tablehead" l10n="U" oldref="86">Placeholders</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157896" role="tablehead" l10n="U" oldref="87">Explanation</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152801" role="code" l10n="U" oldref="5">#</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145090" role="tablecontent" l10n="U" oldref="6">Does not display extra zeros.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="code" l10n="U" oldref="7">0 (Zero)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="tablecontent" l10n="U" oldref="8">Displays extra zeros if the number has less places than zeros in the format.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="par_idN1087E" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
-<table id="tbl_id3153577">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="9">Number Format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Format Code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="11">3456.78 as 3456.8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="12">####.#</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="13">9.9 as 9.900</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3159256" xml-lang="en-US" l10n="U" oldref="14">#.000</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147077" xml-lang="en-US" l10n="U" oldref="15">13 as 13.0 and 1234.567 as 1234.57</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="16">#.0#</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="17">5.75 as 5 3/4 and 6.3 as 6 3/10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"># ???/???</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="19">.5 as 0.5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="20">0.##</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN1087E" role="heading" level="3" l10n="NEW">Examples</paragraph>
+ <table id="tbl_id3153577">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149182" role="tablehead" l10n="U" oldref="9">Number Format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="tablehead" l10n="U" oldref="10">Format Code</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148538" role="tablecontent" l10n="U" oldref="11">3456.78 as 3456.8</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150355" role="code" l10n="U" oldref="12">####.#</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154142" role="tablecontent" l10n="U" oldref="13">9.9 as 9.900</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159256" role="code" l10n="U" oldref="14">#.000</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147077" role="tablecontent" l10n="U" oldref="15">13 as 13.0 and 1234.567 as 1234.57</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155388" role="code" l10n="U" oldref="16">#.0#</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="tablecontent" l10n="U" oldref="17">5.75 as 5 3/4 and 6.3 as 6 3/10</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145315" role="code" l10n="U" oldref="18"># ???/???</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156152" role="tablecontent" l10n="U" oldref="19">.5 as 0.5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149762" role="code" l10n="U" oldref="20">0.##</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="230">Thousands Separator</paragraph>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="21">Depending on your language setting, you can use a comma or a period as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
-<table id="tbl_id3150244">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154905" xml-lang="en-US" l10n="U" oldref="22">Number Format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="23">Format Code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="24">15000 as 15,000</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="25">#,###</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="26">16000 as 16</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3153961" xml-lang="en-US" l10n="U" oldref="27">#,</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3149276" role="heading" level="3" l10n="U"
+ oldref="230">Thousands Separator</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154380" role="paragraph" l10n="U" oldref="21">Depending on your language setting, you can use a comma or a period as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
+ <table id="tbl_id3150244">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154905" role="tablehead" l10n="U" oldref="22">Number Format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150822" role="tablehead" l10n="U" oldref="23">Format Code</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147264" role="tablecontent" l10n="U" oldref="24">15000 as 15,000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151223" role="code" l10n="U" oldref="25">#,###</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154935" role="tablecontent" l10n="U" oldref="26">16000 as 16</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153961" role="code" l10n="U" oldref="27">#,</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3154836" xml-lang="en-US" level="2" l10n="U" oldref="79">Including Text in Number Format Codes</paragraph>
-<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="231">Text and Numbers</paragraph>
-<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="80">To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (") in front of and behind the text, or a backslash (\) before a single character. For example, enter <emph>#.# "meters"</emph> to display "3.5 meters" or <emph>#.# \m</emph> to display "3.5 m".</paragraph>
-<paragraph role="heading" id="hd_id3148979" xml-lang="en-US" level="3" l10n="U" oldref="232">Text and Text</paragraph>
-<paragraph role="paragraph" id="par_id3153338" xml-lang="en-US" l10n="U" oldref="82">To include text in a number format that is applied to a cell that might contain text, enclose the text by double quotation marks (" "), and then add an at sign (@). For example, enter <emph>"Total for "@</emph> to display "Total for December".</paragraph>
-<paragraph role="heading" id="hd_id3154330" xml-lang="en-US" level="3" l10n="U" oldref="233">Spaces</paragraph>
-<paragraph role="paragraph" id="par_id3156294" xml-lang="en-US" l10n="U" oldref="81">To use a character to define the width of a space in a number format, type an underscore ( _ ) followed by the character. The width of the space varies according to the width of the character that you choose. For example, <emph>_M</emph> creates a wider space than <emph>_i</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="2" l10n="U" oldref="234">Color</paragraph>
-<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="28">To set the color of a section of a number format code, insert one of the following color names in square brackets [ ]:</paragraph>
-<table id="tbl_id3157321">
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3154630" xml-lang="en-US" l10n="U" oldref="29">CYAN</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="30">GREEN</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="31">BLACK</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="32">BLUE</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="33">MAGENTA</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="34">RED</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3147502" xml-lang="en-US" l10n="U" oldref="35">WHITE</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3153368" xml-lang="en-US" l10n="U" oldref="36">YELLOW</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3154836" role="heading" level="2" l10n="U"
+ oldref="79">Including Text in Number Format Codes</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150398" role="heading" level="3" l10n="U"
+ oldref="231">Text and Numbers</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154224" role="paragraph" l10n="U" oldref="80">To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (") in front of and behind the text, or a backslash (\) before a single character. For example, enter <emph>#.# "meters"</emph> to display "3.5 meters" or <emph>#.# \m</emph> to display "3.5 m".</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148979" role="heading" level="3" l10n="U"
+ oldref="232">Text and Text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153338" role="paragraph" l10n="U" oldref="82">To include text in a number format that is applied to a cell that might contain text, enclose the text by double quotation marks (" "), and then add an at sign (@). For example, enter <emph>"Total for "@</emph> to display "Total for December".</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154330" role="heading" level="3" l10n="U"
+ oldref="233">Spaces</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156294" role="paragraph" l10n="U" oldref="81">To use a character to define the width of a space in a number format, type an underscore ( _ ) followed by the character. The width of the space varies according to the width of the character that you choose. For example, <emph>_M</emph> creates a wider space than <emph>_i</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155994" role="heading" level="2" l10n="U"
+ oldref="234">Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="paragraph" l10n="U" oldref="28">To set the color of a section of a number format code, insert one of the following color names in square brackets [ ]:</paragraph>
+ <table id="tbl_id3157321">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154630" role="code" l10n="U" oldref="29">CYAN</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148676" role="code" l10n="U" oldref="30">GREEN</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="code" l10n="U" oldref="31">BLACK</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149167" role="code" l10n="U" oldref="32">BLUE</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3158407" role="code" l10n="U" oldref="33">MAGENTA</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149560" role="code" l10n="U" oldref="34">RED</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147502" role="code" l10n="U" oldref="35">WHITE</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153368" role="code" l10n="U" oldref="36">YELLOW</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3147435" xml-lang="en-US" level="2" l10n="U" oldref="111">Conditions</paragraph>
-<paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="U" oldref="235">Conditional Brackets</paragraph>
-<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="112">You can define a number format so that it only applies when the condition that you specify is met. Conditions are enclosed by square brackets [ ].</paragraph>
-<paragraph role="paragraph" id="par_id3159179" xml-lang="en-US" l10n="U" oldref="115">You can use any combination of numbers and the &lt;, &lt;=, &gt;, &gt;=, = and &lt;&gt; operators.</paragraph>
-<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="U" oldref="236">For example, if you want to apply different colors to different temperature data, enter:</paragraph>
-<paragraph role="example" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="113">[BLUE][&lt;0]#,0 "°C";[RED][&gt;30]#,0 "°C";[BLACK]#,0 "°C"</paragraph>
-<paragraph role="paragraph" id="par_id3157870" xml-lang="en-US" l10n="U" oldref="114">All temperatures below zero are blue, temperatures between 0 and 30 °C are black, and temperatures higher than 30 °C are red.</paragraph>
-<paragraph role="heading" id="hd_id3154833" xml-lang="en-US" level="3" l10n="U" oldref="90">Positive and Negative Numbers</paragraph>
-<paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="91">To define a number format that adds a different text to a number depending on if the number is positive, negative, or equal to zero, use the following format:</paragraph>
-<paragraph role="example" id="par_id3153727" xml-lang="en-US" l10n="U" oldref="92">"plus" 0;"minus" 0;"null" 0</paragraph>
-<paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="83">Percentages and Scientific Notation</paragraph>
-<paragraph role="heading" id="hd_id3147218" xml-lang="en-US" level="3" l10n="U" oldref="237">Percentages</paragraph>
-<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="CHG" oldref="84">To display numbers as percentages, add the percent sign (%) to the number format.</paragraph>
-<paragraph role="heading" id="hd_id3156005" xml-lang="en-US" level="3" l10n="U" oldref="89">Scientific Notation</paragraph>
-<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="85">Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. <comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment>In <item type="productname">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+.</paragraph>
-<paragraph role="heading" id="hd_id3159080" xml-lang="en-US" level="2" l10n="U" oldref="98">Number Format Codes of Currency Formats</paragraph>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="CHG" oldref="99">The default currency format for the cells in your spreadsheet is determined by the regional setting of your operating system. If you want, you can apply a custom currency symbol to a cell. For example, enter #,##0.00 € to display 4.50 € (Euros).<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="167">You can also specify the locale setting for the currency by entering the locale code for the country after the symbol. For example, [$€-407] represents Euros in Germany. To view the locale code for a country, select the country in the <emph>Language</emph> list on the <emph>Numbers</emph> tab of the <emph>Format Cells</emph> dialog.</paragraph>
-<embed href="text/shared/01/05020300.xhp#waehrungtext"/>
-<paragraph role="heading" id="hd_id3157309" xml-lang="en-US" level="2" l10n="U" oldref="238">Date and Time Formats</paragraph>
-<paragraph role="heading" id="hd_id3153740" xml-lang="en-US" level="3" l10n="U" oldref="37">Date Formats</paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="38">To display days, months and years, use the following number format codes. </paragraph>
-<paragraph role="warning" id="par_id610980" xml-lang="en-US" l10n="NEW">Not all format codes give meaningful results for all languages.</paragraph>
-<table id="tbl_id3147426">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3152376" xml-lang="en-US" l10n="U" oldref="39">Format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3159130" xml-lang="en-US" l10n="U" oldref="40">Format Code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147380" xml-lang="en-US" l10n="U" oldref="41">Month as 3.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3146928" xml-lang="en-US" l10n="U" oldref="42">M</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="43">Month as 03.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3153052" xml-lang="en-US" l10n="U" oldref="44">MM</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="45">Month as Jan-Dec</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="46">MMM</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149909" xml-lang="en-US" l10n="U" oldref="47">Month as January-December</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3155318" xml-lang="en-US" l10n="U" oldref="48">MMMM</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151218" xml-lang="en-US" l10n="U" oldref="116">First letter of Name of Month</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="117">MMMMM</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="49">Day as 2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3156181" xml-lang="en-US" l10n="U" oldref="50">D</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="51">Day as 02</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3156358" xml-lang="en-US" l10n="U" oldref="52">DD</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148495" xml-lang="en-US" l10n="U" oldref="53">Day as Sun-Sat</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3161665" xml-lang="en-US" l10n="U" oldref="54">NN or DDD</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154272" xml-lang="en-US" l10n="U" oldref="118">Day as Sunday to Saturday</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3145164" xml-lang="en-US" l10n="U" oldref="119">NNN or DDDD</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="55">Day followed by comma, as in "Sunday,"</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="56">NNNN</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="57">Year as 00-99</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3143236" xml-lang="en-US" l10n="U" oldref="58">YY</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="59">Year as 1900-2078</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3151358" xml-lang="en-US" l10n="U" oldref="60">YYYY</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153355" xml-lang="en-US" l10n="U" oldref="96">Calendar week</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="97">WW</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154302" xml-lang="en-US" l10n="U" oldref="103">Quarterly as Q1 to Q4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3159266" xml-lang="en-US" l10n="CHG" oldref="104">Q</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147583" xml-lang="en-US" l10n="U" oldref="105">Quarterly as 1st quarter to 4th quarter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3146918" xml-lang="en-US" l10n="U" oldref="106">QQ</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147534" xml-lang="en-US" l10n="U" oldref="120">Era on the Japanese Gengou calendar, single character (possible values are: M, T, S, H)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="121">G</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3163806" xml-lang="en-US" l10n="U" oldref="122">Era, abbreviation</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="123">GG</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="124">Era, full name</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="125">GGG</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="126">Number of the year within an era, without a leading zero for single-digit years</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3147255" xml-lang="en-US" l10n="U" oldref="127">E</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148487" xml-lang="en-US" l10n="U" oldref="128">Number of the year within an era, with a leading zero for single-digit years</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="129">EE or R</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152861" xml-lang="en-US" l10n="U" oldref="138">Era, full name and year</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149926" xml-lang="en-US" l10n="U" oldref="139">RR or GGGEE</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3147435" role="heading" level="2" l10n="U"
+ oldref="111">Conditions</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148575" role="heading" level="3" l10n="U"
+ oldref="235">Conditional Brackets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="112">You can define a number format so that it only applies when the condition that you specify is met. Conditions are enclosed by square brackets [ ].</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159179" role="paragraph" l10n="U" oldref="115">You can use any combination of numbers and the &lt;, &lt;=, &gt;, &gt;=, = and &lt;&gt; operators.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159196" role="paragraph" l10n="U" oldref="236">For example, if you want to apply different colors to different temperature data, enter:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150872" role="example" l10n="U" oldref="113">[BLUE][&lt;0]#,0 "°C";[RED][&gt;30]#,0 "°C";[BLACK]#,0 "°C"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157870" role="paragraph" l10n="U" oldref="114">All temperatures below zero are blue, temperatures between 0 and 30 °C are black, and temperatures higher than 30 °C are red.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154833" role="heading" level="3" l10n="U"
+ oldref="90">Positive and Negative Numbers</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="91">To define a number format that adds a different text to a number depending on if the number is positive, negative, or equal to zero, use the following format:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153727" role="example" l10n="U" oldref="92">"plus" 0;"minus" 0;"null" 0</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="2" l10n="U"
+ oldref="83">Percentages and Scientific Notation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147218" role="heading" level="3" l10n="U"
+ oldref="237">Percentages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151168" role="paragraph" l10n="CHG" oldref="84">To display numbers as percentages, add the percent sign (%) to the number format.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156005" role="heading" level="3" l10n="U"
+ oldref="89">Scientific Notation</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146923" role="paragraph" l10n="U" oldref="85">Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. <comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment>In <item type="productname">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159080" role="heading" level="2" l10n="U"
+ oldref="98">Number Format Codes of Currency Formats</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="CHG" oldref="99">The default currency format for the cells in your spreadsheet is determined by the regional setting of your operating system. If you want, you can apply a custom currency symbol to a cell. For example, enter #,##0.00 € to display 4.50 € (Euros).<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="167">You can also specify the locale setting for the currency by entering the locale code for the country after the symbol. For example, [$€-407] represents Euros in Germany. To view the locale code for a country, select the country in the <emph>Language</emph> list on the <emph>Numbers</emph> tab of the <emph>Format Cells</emph> dialog.</paragraph>
+ <embed href="text/shared/01/05020300.xhp#waehrungtext"/>
+ <paragraph xml-lang="en-US" id="hd_id3157309" role="heading" level="2" l10n="U"
+ oldref="238">Date and Time Formats</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153740" role="heading" level="3" l10n="U"
+ oldref="37">Date Formats</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="U" oldref="38">To display days, months and years, use the following number format codes. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id610980" role="warning" l10n="NEW">Not all format codes give meaningful results for all languages.</paragraph>
+ <table id="tbl_id3147426">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152376" role="tablehead" l10n="U" oldref="39">Format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159130" role="tablehead" l10n="U" oldref="40">Format Code</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147380" role="tablecontent" l10n="U" oldref="41">Month as 3.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146928" role="code" l10n="U" oldref="42">M</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145594" role="tablecontent" l10n="U" oldref="43">Month as 03.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153052" role="code" l10n="U" oldref="44">MM</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145728" role="tablecontent" l10n="U" oldref="45">Month as Jan-Dec</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151073" role="code" l10n="U" oldref="46">MMM</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149909" role="tablecontent" l10n="U" oldref="47">Month as January-December</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155318" role="code" l10n="U" oldref="48">MMMM</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151218" role="tablecontent" l10n="U" oldref="116">First letter of Name of Month</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150420" role="code" l10n="U" oldref="117">MMMMM</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154501" role="tablecontent" l10n="U" oldref="49">Day as 2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156181" role="code" l10n="U" oldref="50">D</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146969" role="tablecontent" l10n="U" oldref="51">Day as 02</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156358" role="code" l10n="U" oldref="52">DD</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148495" role="tablecontent" l10n="U" oldref="53">Day as Sun-Sat</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161665" role="code" l10n="U" oldref="54">NN or DDD</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154272" role="tablecontent" l10n="U" oldref="118">Day as Sunday to Saturday</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145164" role="code" l10n="U" oldref="119">NNN or DDDD</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146791" role="tablecontent" l10n="U" oldref="55">Day followed by comma, as in "Sunday,"</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146081" role="code" l10n="U" oldref="56">NNNN</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156275" role="tablecontent" l10n="U" oldref="57">Year as 00-99</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143236" role="code" l10n="U" oldref="58">YY</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="59">Year as 1900-2078</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151358" role="code" l10n="U" oldref="60">YYYY</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153355" role="tablecontent" l10n="U" oldref="96">Calendar week</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150744" role="code" l10n="U" oldref="97">WW</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154302" role="tablecontent" l10n="U" oldref="103">Quarterly as Q1 to Q4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159266" role="code" l10n="CHG" oldref="104">Q</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147583" role="tablecontent" l10n="U" oldref="105">Quarterly as 1st quarter to 4th quarter</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146918" role="code" l10n="U" oldref="106">QQ</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147534" role="tablecontent" l10n="U" oldref="120">Era on the Japanese Gengou calendar, single character (possible values are: M, T, S, H)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151249" role="code" l10n="U" oldref="121">G</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3163806" role="tablecontent" l10n="U" oldref="122">Era, abbreviation</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155962" role="code" l10n="U" oldref="123">GG</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151187" role="tablecontent" l10n="U" oldref="124">Era, full name</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="code" l10n="U" oldref="125">GGG</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147344" role="tablecontent" l10n="U" oldref="126">Number of the year within an era, without a leading zero for single-digit years</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147255" role="code" l10n="U" oldref="127">E</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148487" role="tablecontent" l10n="U" oldref="128">Number of the year within an era, with a leading zero for single-digit years</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150298" role="code" l10n="U" oldref="129">EE or R</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152861" role="tablecontent" l10n="U" oldref="138">Era, full name and year</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149926" role="code" l10n="U" oldref="139">RR or GGGEE</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id1002200811423518" xml-lang="en-US" l10n="NEW">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you will need to know the formatting codes used in that other locale. </paragraph>
-<paragraph role="paragraph" id="par_id1002200811423556" xml-lang="en-US" l10n="NEW">For example, if your software is set to an English locale, and you want to format a year with four digits, you enter YYYY as a formatting code. When you switch to a German locale, you must use JJJJ instead. The following table lists only the localized differences.</paragraph>
-<table id="tbl_id1002200811465915">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563044" xml-lang="en-US" l10n="NEW">Locale</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563137" xml-lang="en-US" l10n="NEW">Year</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563164" xml-lang="en-US" l10n="NEW">Month</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563128" xml-lang="en-US" l10n="NEW">Day</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563135" xml-lang="en-US" l10n="NEW">Hour</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id1002200811563289" xml-lang="en-US" l10n="NEW">Day Of Week</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id100220081156322" xml-lang="en-US" l10n="NEW">Era</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563233" xml-lang="en-US" l10n="NEW">English - en</paragraph>
-<paragraph role="tablecontent" id="par_id1002200811563243" xml-lang="en-US" l10n="NEW">and all not listed locales</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563352" xml-lang="en-US" l10n="NEW">Y</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563396" xml-lang="en-US" l10n="NEW">M</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563385" xml-lang="en-US" l10n="NEW">D</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563472" xml-lang="en-US" l10n="NEW">H</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563430" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563488" xml-lang="en-US" l10n="NEW">G</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563484" xml-lang="en-US" l10n="NEW">German - de</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563518" xml-lang="en-US" l10n="NEW">J</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563735" xml-lang="en-US" l10n="NEW">T</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563823" xml-lang="en-US" l10n="NEW">Netherlands - nl</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563852" xml-lang="en-US" l10n="NEW">J</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563827" xml-lang="en-US" l10n="NEW">U</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563916" xml-lang="en-US" l10n="NEW">French - fr</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563970" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563980" xml-lang="en-US" l10n="NEW">J</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564065" xml-lang="en-US" l10n="NEW">O</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156407" xml-lang="en-US" l10n="NEW">Italian - it</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156403" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564042" xml-lang="en-US" l10n="NEW">G</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156412" xml-lang="en-US" l10n="NEW">O</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564119" xml-lang="en-US" l10n="NEW">X</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564197" xml-lang="en-US" l10n="NEW">Portuguese - pt</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564272" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156423" xml-lang="en-US" l10n="NEW">O</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564218" xml-lang="en-US" l10n="NEW">Spanish - es</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564390" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564319" xml-lang="en-US" l10n="NEW">O</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156433" xml-lang="en-US" l10n="NEW">Danish - da</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id100220081156444" xml-lang="en-US" l10n="NEW">T</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564448" xml-lang="en-US" l10n="NEW">Norwegian - no, nb, nn</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564549" xml-lang="en-US" l10n="NEW">T</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564565" xml-lang="en-US" l10n="NEW">Swedish - sv</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564556" xml-lang="en-US" l10n="NEW">T</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564637" xml-lang="en-US" l10n="NEW">Finnish - fi</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564627" xml-lang="en-US" l10n="NEW">V</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564643" xml-lang="en-US" l10n="NEW">K</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564763" xml-lang="en-US" l10n="NEW">P</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811564715" xml-lang="en-US" l10n="NEW">T</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id1002200811423518" role="paragraph" l10n="NEW">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you will need to know the formatting codes used in that other locale. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id1002200811423556" role="paragraph" l10n="NEW">For example, if your software is set to an English locale, and you want to format a year with four digits, you enter YYYY as a formatting code. When you switch to a German locale, you must use JJJJ instead. The following table lists only the localized differences.</paragraph>
+ <table id="tbl_id1002200811465915">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563044" role="tablehead" l10n="NEW">Locale</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563137" role="tablehead" l10n="NEW">Year</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563164" role="tablehead" l10n="NEW">Month</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563128" role="tablehead" l10n="NEW">Day</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563135" role="tablehead" l10n="NEW">Hour</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563289" role="tablehead" l10n="NEW">Day Of Week</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156322" role="tablehead" l10n="NEW">Era</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563233" role="tablecontent" l10n="NEW">English - en</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1002200811563243" role="tablecontent" l10n="NEW">and all not listed locales</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563352" role="tablecontent" l10n="NEW">Y</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563396" role="tablecontent" l10n="NEW">M</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563385" role="tablecontent" l10n="NEW">D</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563472" role="tablecontent" l10n="NEW">H</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563430" role="tablecontent" l10n="NEW">A</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563488" role="tablecontent" l10n="NEW">G</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563484" role="tablecontent" l10n="NEW">German - de</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563518" role="tablecontent" l10n="NEW">J</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563735" role="tablecontent" l10n="NEW">T</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563823" role="tablecontent" l10n="NEW">Netherlands - nl</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563852" role="tablecontent" l10n="NEW">J</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563827" role="tablecontent" l10n="NEW">U</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563916" role="tablecontent" l10n="NEW">French - fr</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563970" role="tablecontent" l10n="NEW">A</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811563980" role="tablecontent" l10n="NEW">J</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564065" role="tablecontent" l10n="NEW">O</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156407" role="tablecontent" l10n="NEW">Italian - it</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156403" role="tablecontent" l10n="NEW">A</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564042" role="tablecontent" l10n="NEW">G</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156412" role="tablecontent" l10n="NEW">O</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564119" role="tablecontent" l10n="NEW">X</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564197" role="tablecontent" l10n="NEW">Portuguese - pt</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564272" role="tablecontent" l10n="NEW">A</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156423" role="tablecontent" l10n="NEW">O</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564218" role="tablecontent" l10n="NEW">Spanish - es</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564390" role="tablecontent" l10n="NEW">A</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564319" role="tablecontent" l10n="NEW">O</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156433" role="tablecontent" l10n="NEW">Danish - da</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100220081156444" role="tablecontent" l10n="NEW">T</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564448" role="tablecontent" l10n="NEW">Norwegian - no, nb, nn</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564549" role="tablecontent" l10n="NEW">T</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564565" role="tablecontent" l10n="NEW">Swedish - sv</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564556" role="tablecontent" l10n="NEW">T</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564637" role="tablecontent" l10n="NEW">Finnish - fi</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564627" role="tablecontent" l10n="NEW">V</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564643" role="tablecontent" l10n="NEW">K</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564763" role="tablecontent" l10n="NEW">P</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1002200811564715" role="tablecontent" l10n="NEW">T</paragraph>
+ </tablecell>
+ <tablecell>
+</tablecell>
+ <tablecell>
+</tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
-<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
-<paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
-<table id="tbl_id3145133">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3145764" xml-lang="en-US" l10n="U" oldref="217">Modifier</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3152967" xml-lang="en-US" l10n="U" oldref="218">Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3148390" xml-lang="en-US" l10n="U" oldref="219">[~buddhist]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153781" xml-lang="en-US" l10n="U" oldref="220">Thai Buddhist Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3157969" xml-lang="en-US" l10n="U" oldref="133">[~gengou]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="134">Japanese Gengou Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="131">[~gregorian]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="132">Gregorian Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3146808" xml-lang="en-US" l10n="U" oldref="221">[~hanja] or [~hanja_yoil]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="136">Korean Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="222">[~hijri]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149238" xml-lang="en-US" l10n="U" oldref="223">Arabic Islamic Calendar, currently supported for the following locales: ar_EG, ar_LB, ar_SA, and ar_TN</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="224">[~jewish]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151288" xml-lang="en-US" l10n="U" oldref="225">Jewish Calendar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="code" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="135">[~ROC]</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="226">Republic Of China Calendar</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3149929" role="heading" level="3" l10n="U"
+ oldref="227">Entering Dates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148397" role="paragraph" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153274" role="paragraph" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153795" role="paragraph" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
+ <table id="tbl_id3145133">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145764" role="tablehead" l10n="U" oldref="217">Modifier</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152967" role="tablehead" l10n="U" oldref="218">Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148390" role="code" l10n="U" oldref="219">[~buddhist]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153781" role="tablecontent" l10n="U" oldref="220">Thai Buddhist Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157969" role="code" l10n="U" oldref="133">[~gengou]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154656" role="tablecontent" l10n="U" oldref="134">Japanese Gengou Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150086" role="code" l10n="U" oldref="131">[~gregorian]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146070" role="tablecontent" l10n="U" oldref="132">Gregorian Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146808" role="code" l10n="U" oldref="221">[~hanja] or [~hanja_yoil]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149207" role="tablecontent" l10n="U" oldref="136">Korean Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150304" role="code" l10n="U" oldref="222">[~hijri]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149238" role="tablecontent" l10n="U" oldref="223">Arabic Islamic Calendar, currently supported for the following locales: ar_EG, ar_LB, ar_SA, and ar_TN</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154903" role="code" l10n="U" oldref="224">[~jewish]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151288" role="tablecontent" l10n="U" oldref="225">Jewish Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166442" role="code" l10n="U" oldref="135">[~ROC]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145587" role="tablecontent" l10n="U" oldref="226">Republic Of China Calendar</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id3152419" xml-lang="en-US" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:
+ <paragraph xml-lang="en-US" id="par_id3152419" role="paragraph" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
<table id="tbl_id3150490">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154194" xml-lang="en-US" l10n="U" oldref="141">Initial Format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149787" xml-lang="en-US" l10n="U" oldref="142">Result Format</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="143">Date + Date</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150292" xml-lang="en-US" l10n="U" oldref="144">Number (Days)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150460" xml-lang="en-US" l10n="U" oldref="145">Date + Number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154371" xml-lang="en-US" l10n="U" oldref="146">Date</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145082" xml-lang="en-US" l10n="U" oldref="147">Date + Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156290" xml-lang="en-US" l10n="U" oldref="148">Date&amp;Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152456" xml-lang="en-US" l10n="U" oldref="149">Date + Date&amp;Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156169" xml-lang="en-US" l10n="U" oldref="150">Number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154527" xml-lang="en-US" l10n="U" oldref="151">Time + Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159625" xml-lang="en-US" l10n="U" oldref="152">Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146802" xml-lang="en-US" l10n="U" oldref="153">Time + Number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146770" xml-lang="en-US" l10n="U" oldref="154">Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155500" xml-lang="en-US" l10n="U" oldref="155">Time + Date&amp;Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155128" xml-lang="en-US" l10n="U" oldref="156">Date&amp;Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152904" xml-lang="en-US" l10n="U" oldref="157">Date&amp;Time + Date&amp;Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159143" xml-lang="en-US" l10n="U" oldref="158">Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148909" xml-lang="en-US" l10n="U" oldref="159">Date&amp;Time + Number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154806" xml-lang="en-US" l10n="U" oldref="160">Date&amp;Time</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151269" xml-lang="en-US" l10n="U" oldref="161">Number + Number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154951" xml-lang="en-US" l10n="U" oldref="162">Number</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154194" role="tablehead" l10n="U" oldref="141">Initial Format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149787" role="tablehead" l10n="U" oldref="142">Result Format</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152993" role="tablecontent" l10n="U" oldref="143">Date + Date</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150292" role="tablecontent" l10n="U" oldref="144">Number (Days)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150460" role="tablecontent" l10n="U" oldref="145">Date + Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154371" role="tablecontent" l10n="U" oldref="146">Date</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145082" role="tablecontent" l10n="U" oldref="147">Date + Time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156290" role="tablecontent" l10n="U" oldref="148">Date&amp;Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152456" role="tablecontent" l10n="U" oldref="149">Date + Date&amp;Time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156169" role="tablecontent" l10n="U" oldref="150">Number</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154527" role="tablecontent" l10n="U" oldref="151">Time + Time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159625" role="tablecontent" l10n="U" oldref="152">Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146802" role="tablecontent" l10n="U" oldref="153">Time + Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146770" role="tablecontent" l10n="U" oldref="154">Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155500" role="tablecontent" l10n="U" oldref="155">Time + Date&amp;Time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155128" role="tablecontent" l10n="U" oldref="156">Date&amp;Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152904" role="tablecontent" l10n="U" oldref="157">Date&amp;Time + Date&amp;Time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159143" role="tablecontent" l10n="U" oldref="158">Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148909" role="tablecontent" l10n="U" oldref="159">Date&amp;Time + Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154806" role="tablecontent" l10n="U" oldref="160">Date&amp;Time</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151269" role="tablecontent" l10n="U" oldref="161">Number + Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154951" role="tablecontent" l10n="U" oldref="162">Number</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="163"><switchinline select="appl"><caseinline select="CALC">The Date&amp;Time format displays the date and time that an entry was made to a cell with this format.
+<paragraph xml-lang="en-US" id="par_id3149174" role="paragraph" l10n="U" oldref="163"><switchinline select="appl"><caseinline select="CALC">The Date&amp;Time format displays the date and time that an entry was made to a cell with this format.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
-<paragraph role="note" id="par_id3143225" xml-lang="en-US" l10n="U" oldref="164">In <item type="productname">%PRODUCTNAME</item>, a date with the value "0" corresponds to Dec 30, 1899.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143225" role="note" l10n="U" oldref="164">In <item type="productname">%PRODUCTNAME</item>, a date with the value "0" corresponds to Dec 30, 1899.</paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3155870" xml-lang="en-US" level="3" l10n="U" oldref="61">Time Formats</paragraph>
-<paragraph role="paragraph" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="62">To display hours, minutes and seconds use the following number format codes.</paragraph>
-<table id="tbl_id3154830">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149158" xml-lang="en-US" l10n="U" oldref="63">Format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="64">Format Code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154557" xml-lang="en-US" l10n="U" oldref="65">Hours as 0-23</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3156348" xml-lang="en-US" l10n="U" oldref="66">h</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3143218" xml-lang="en-US" l10n="U" oldref="67">Hours as 00-23</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3155266" xml-lang="en-US" l10n="U" oldref="68">hh</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U" oldref="69">Minutes as 0-59</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3149588" xml-lang="en-US" l10n="U" oldref="70">m</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150531" xml-lang="en-US" l10n="U" oldref="71">Minutes as 00-59</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="72">mm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="73">Seconds as 0-59</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3156173" xml-lang="en-US" l10n="U" oldref="74">s</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149506" xml-lang="en-US" l10n="U" oldref="75">Seconds as 00-59</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="code" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="76">ss</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3155870" role="heading" level="3" l10n="U"
+ oldref="61">Time Formats</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150108" role="paragraph" l10n="U" oldref="62">To display hours, minutes and seconds use the following number format codes.</paragraph>
+ <table id="tbl_id3154830">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149158" role="tablehead" l10n="U" oldref="63">Format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154341" role="tablehead" l10n="U" oldref="64">Format Code</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154557" role="tablecontent" l10n="U" oldref="65">Hours as 0-23</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156348" role="code" l10n="U" oldref="66">h</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143218" role="tablecontent" l10n="U" oldref="67">Hours as 00-23</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155266" role="code" l10n="U" oldref="68">hh</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150139" role="tablecontent" l10n="U" oldref="69">Minutes as 0-59</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149588" role="code" l10n="U" oldref="70">m</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150531" role="tablecontent" l10n="U" oldref="71">Minutes as 00-59</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147409" role="code" l10n="U" oldref="72">mm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154854" role="tablecontent" l10n="U" oldref="73">Seconds as 0-59</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156173" role="code" l10n="U" oldref="74">s</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149506" role="tablecontent" l10n="U" oldref="75">Seconds as 00-59</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157981" role="code" l10n="U" oldref="76">ss</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="note" id="par_id3156039" xml-lang="en-US" l10n="U" oldref="77">To display seconds as fractions, add the decimal delimiter to your number format code. For example, enter <emph>hh:mm:ss.00</emph> to display the time as "01:02:03.45".<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
-<paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="102">If a time is entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or [HH]:MM:SS<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
-<paragraph role="heading" id="hd_id3158404" xml-lang="en-US" level="2" l10n="U" oldref="169">Displaying Numbers Using Native Characters</paragraph>
-<paragraph role="paragraph" id="par_id3149998" xml-lang="en-US" l10n="U" oldref="170">To display numbers using native number characters, use a [NatNum1], [NatNum2], ... [NatNum11] modifier at the beginning of a number format codes.</paragraph>
-<paragraph role="paragraph" id="par_id3154600" xml-lang="en-US" l10n="U" oldref="171">The [NatNum1] modifier always uses a one to one character mapping to convert numbers to a string that matches the native number format code of the corresponding locale. The other modifiers produce different results if they are used with different locales. A locale can be the language and the territory for which the format code is defined, or a modifier such as [$-yyy] that follows the native number modifier. In this case, yyy is the hexadecimal MS-LCID that is also used in currency format codes. For example, to display a number using Japanese short Kanji characters in an English US locale, use the following number format code:</paragraph>
-<paragraph role="example" id="par_id3152546" xml-lang="en-US" l10n="U" oldref="172">[NatNum1][$-411]0</paragraph>
-<paragraph role="paragraph" id="par_id3147269" xml-lang="en-US" l10n="U" oldref="173">In the following list, the Microsoft Excel [DBNumX] modifier that corresponds to <item type="productname">%PRODUCTNAME</item> [NatNum] modifier is shown. If you want, you can use a [DBNumX] modifier instead of [NatNum] modifier for your locale. Whenever possible, <item type="productname">%PRODUCTNAME</item> internally maps [DBNumX] modifiers to [NatNumN] modifiers.</paragraph>
-<paragraph role="paragraph" id="par_idN11234" xml-lang="en-US" l10n="NEW">Displaying dates using [NatNum] modifiers can have a different effect than displaying other types of numbers. Such effects are indicated by 'CAL: '. For example, 'CAL: 1/4/4' indicates that the year is displayed using the [NatNum1] modifier, while the day and month are displayed using the [NatNum4] modifier. If 'CAL' is not specified, the date formats for that particular modifier are not supported.</paragraph>
-<paragraph role="heading" id="par_id3153111" xml-lang="en-US" level="3" l10n="CHG" oldref="174">[NatNum1] Transliterations</paragraph>
-<table id="tbl_id1136841">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146895" xml-lang="en-US" l10n="U" oldref="175">Chinese: Chinese lower case characters; CAL: 1/7/7 [DBNum1]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152536" xml-lang="en-US" l10n="U" oldref="176">Japanese: short Kanji characters [DBNum1]; CAL: 1/4/4 [DBNum1]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146125" xml-lang="en-US" l10n="U" oldref="177">Korean: Korean lower case characters [DBNum1]; CAL: 1/7/7 [DBNum1]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="178">Thai: Thai characters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153264" xml-lang="en-US" l10n="U" oldref="179">Arabic: Indic characters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148973" xml-lang="en-US" l10n="U" oldref="180">Indic: Indic characters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_idN112A3" xml-lang="en-US" l10n="NEW">Hebrew: Hebrew letters<comment>UFI: api-features "Hebrew numbering"</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147520" xml-lang="en-US" l10n="U" oldref="181">[NatNum2] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155383" xml-lang="en-US" l10n="U" oldref="182">Chinese: Chinese upper case characters; CAL: 2/8/8 [DBNum2]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153931" xml-lang="en-US" l10n="U" oldref="183">Japanese: traditional Kanji characters; CAL: 2/5/5 [DBNum2]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155097" xml-lang="en-US" l10n="U" oldref="184">Korean: Korean upper case characters [DBNum2]; CAL: 2/8/8 [DBNum2]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152976" xml-lang="en-US" l10n="U" oldref="185">[NatNum3] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154353" xml-lang="en-US" l10n="U" oldref="186">Chinese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154669" xml-lang="en-US" l10n="U" oldref="187">Japanese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150472" xml-lang="en-US" l10n="U" oldref="188">Korean: fullwidth Arabic digits [DBNum3]; CAL: 3/3/3 [DBNum3]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157811" xml-lang="en-US" l10n="U" oldref="189">[NatNum4] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154592" xml-lang="en-US" l10n="U" oldref="190">Chinese: lower case text [DBNum1]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="191">Japanese: modern long Kanji text [DBNum2]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="192">Korean: formal lower case text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153546" xml-lang="en-US" l10n="U" oldref="193">[NatNum5] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155612" xml-lang="en-US" l10n="U" oldref="194">Chinese: Chinese upper case text [DBNum2]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155909" xml-lang="en-US" l10n="U" oldref="195">Japanese: traditional long Kanji text [DBNum3]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151304" xml-lang="en-US" l10n="U" oldref="196">Korean: formal upper case text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="197">[NatNum6] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="U" oldref="198">Chinese: fullwidth text [DBNum3]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154114" xml-lang="en-US" l10n="U" oldref="199">Japanese: fullwidth text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155344" xml-lang="en-US" l10n="U" oldref="200">Korean: fullwidth text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155538" xml-lang="en-US" l10n="U" oldref="201">[NatNum7] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145123" xml-lang="en-US" l10n="U" oldref="202">Japanese: modern short Kanji text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149424" xml-lang="en-US" l10n="U" oldref="203">Korean: informal lower case text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153688" xml-lang="en-US" l10n="U" oldref="204">[NatNum8] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="U" oldref="205">Japanese: traditional short Kanji text [DBNum4]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145602" xml-lang="en-US" l10n="U" oldref="206">Korean: informal upper case text</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159228" xml-lang="en-US" l10n="U" oldref="207">[NatNum9] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154644" xml-lang="en-US" l10n="U" oldref="208">Korean: Hangul characters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155396" xml-lang="en-US" l10n="U" oldref="209">[NatNum10] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150878" xml-lang="en-US" l10n="U" oldref="210">Korean: formal Hangul text [DBNum4]; CAL: 9/11/11 [DBNum4]</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149384" xml-lang="en-US" l10n="U" oldref="211">[NatNum11] Transliteration in</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154213" xml-lang="en-US" l10n="U" oldref="212">Korean: informal Hangul text</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3156039" role="note" l10n="U" oldref="77">To display seconds as fractions, add the decimal delimiter to your number format code. For example, enter <emph>hh:mm:ss.00</emph> to display the time as "01:02:03.45".<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148649" role="paragraph" l10n="U" oldref="102">If a time is entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or [HH]:MM:SS<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200911242399" role="paragraph" l10n="NEW">To display hours beyond 24, use the [HH]:MM:SS format. For example, the following formula ="12:34:56"+"14:00:00" displays the time in the form of "26:34:56".</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3158404" role="heading" level="3" l10n="U"
+ oldref="169">Displaying Numbers Using Native Characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149998" role="paragraph" l10n="U" oldref="170">To display numbers using native number characters, use a [NatNum1], [NatNum2], ... [NatNum11] modifier at the beginning of a number format codes.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154600" role="paragraph" l10n="U" oldref="171">The [NatNum1] modifier always uses a one to one character mapping to convert numbers to a string that matches the native number format code of the corresponding locale. The other modifiers produce different results if they are used with different locales. A locale can be the language and the territory for which the format code is defined, or a modifier such as [$-yyy] that follows the native number modifier. In this case, yyy is the hexadecimal MS-LCID that is also used in currency format codes. For example, to display a number using Japanese short Kanji characters in an English US locale, use the following number format code:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152546" role="example" l10n="U" oldref="172">[NatNum1][$-411]0</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147269" role="paragraph" l10n="U" oldref="173">In the following list, the Microsoft Excel [DBNumX] modifier that corresponds to <item type="productname">%PRODUCTNAME</item> [NatNum] modifier is shown. If you want, you can use a [DBNumX] modifier instead of [NatNum] modifier for your locale. Whenever possible, <item type="productname">%PRODUCTNAME</item> internally maps [DBNumX] modifiers to [NatNumN] modifiers.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11234" role="paragraph" l10n="NEW">Displaying dates using [NatNum] modifiers can have a different effect than displaying other types of numbers. Such effects are indicated by 'CAL: '. For example, 'CAL: 1/4/4' indicates that the year is displayed using the [NatNum1] modifier, while the day and month are displayed using the [NatNum4] modifier. If 'CAL' is not specified, the date formats for that particular modifier are not supported.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153111" role="heading" level="3" l10n="CHG"
+ oldref="174">[NatNum1] Transliterations</paragraph>
+ <table id="tbl_id1136841">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146895" role="paragraph" l10n="U" oldref="175">Chinese: Chinese lower case characters; CAL: 1/7/7 [DBNum1]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152536" role="paragraph" l10n="U" oldref="176">Japanese: short Kanji characters [DBNum1]; CAL: 1/4/4 [DBNum1]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146125" role="paragraph" l10n="U" oldref="177">Korean: Korean lower case characters [DBNum1]; CAL: 1/7/7 [DBNum1]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149945" role="paragraph" l10n="U" oldref="178">Thai: Thai characters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153264" role="paragraph" l10n="U" oldref="179">Arabic: Indic characters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148973" role="paragraph" l10n="U" oldref="180">Indic: Indic characters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN112A3" role="paragraph" l10n="NEW">Hebrew: Hebrew letters<comment>UFI: api-features "Hebrew numbering"</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147520" role="paragraph" l10n="U" oldref="181">[NatNum2] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155383" role="paragraph" l10n="U" oldref="182">Chinese: Chinese upper case characters; CAL: 2/8/8 [DBNum2]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153931" role="paragraph" l10n="U" oldref="183">Japanese: traditional Kanji characters; CAL: 2/5/5 [DBNum2]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155097" role="paragraph" l10n="U" oldref="184">Korean: Korean upper case characters [DBNum2]; CAL: 2/8/8 [DBNum2]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152976" role="paragraph" l10n="U" oldref="185">[NatNum3] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154353" role="paragraph" l10n="U" oldref="186">Chinese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154669" role="paragraph" l10n="U" oldref="187">Japanese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150472" role="paragraph" l10n="U" oldref="188">Korean: fullwidth Arabic digits [DBNum3]; CAL: 3/3/3 [DBNum3]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157811" role="paragraph" l10n="U" oldref="189">[NatNum4] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154592" role="paragraph" l10n="U" oldref="190">Chinese: lower case text [DBNum1]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150350" role="paragraph" l10n="U" oldref="191">Japanese: modern long Kanji text [DBNum2]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150930" role="paragraph" l10n="U" oldref="192">Korean: formal lower case text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153546" role="paragraph" l10n="U" oldref="193">[NatNum5] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155612" role="paragraph" l10n="U" oldref="194">Chinese: Chinese upper case text [DBNum2]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155909" role="paragraph" l10n="U" oldref="195">Japanese: traditional long Kanji text [DBNum3]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151304" role="paragraph" l10n="U" oldref="196">Korean: formal upper case text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155075" role="paragraph" l10n="U" oldref="197">[NatNum6] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150214" role="paragraph" l10n="U" oldref="198">Chinese: fullwidth text [DBNum3]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154114" role="paragraph" l10n="U" oldref="199">Japanese: fullwidth text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155344" role="paragraph" l10n="U" oldref="200">Korean: fullwidth text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155538" role="paragraph" l10n="U" oldref="201">[NatNum7] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145123" role="paragraph" l10n="U" oldref="202">Japanese: modern short Kanji text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149424" role="paragraph" l10n="U" oldref="203">Korean: informal lower case text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153688" role="paragraph" l10n="U" oldref="204">[NatNum8] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156122" role="paragraph" l10n="U" oldref="205">Japanese: traditional short Kanji text [DBNum4]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145602" role="paragraph" l10n="U" oldref="206">Korean: informal upper case text</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159228" role="paragraph" l10n="U" oldref="207">[NatNum9] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154644" role="paragraph" l10n="U" oldref="208">Korean: Hangul characters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155396" role="paragraph" l10n="U" oldref="209">[NatNum10] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150878" role="paragraph" l10n="U" oldref="210">Korean: formal Hangul text [DBNum4]; CAL: 9/11/11 [DBNum4]</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149384" role="paragraph" l10n="U" oldref="211">[NatNum11] Transliteration in</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154213" role="paragraph" l10n="U" oldref="212">Korean: informal Hangul text</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05340100.xhp b/helpcontent2/source/text/shared/01/05340100.xhp
index 4049929f3e..64ce51b804 100644
--- a/helpcontent2/source/text/shared/01/05340100.xhp
+++ b/helpcontent2/source/text/shared/01/05340100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,42 +30,36 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row Height</title>
-<filename>/text/shared/01/05340100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:09:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/><!-- HID added by script -->
+ <topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Row Height</title>
+ <filename>/text/shared/01/05340100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RowHeight" id="bm_id3150146" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ROWHEIGHT" id="bm_id3149987" localize="false"/>
-<paragraph role="heading" id="hd_id3154400" xml-lang="en-US" level="1" l10n="U" oldref="1">Row Height</paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="2">
-<variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154400" role="heading" level="1" l10n="U" oldref="1">Row Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="U" oldref="2"><variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl">
-<caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
+ <paragraph xml-lang="en-US" id="par_id3150756" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
-</section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SC_METRICFIELD_RID_SCDLG_ROW_MAN_ED_VALUE" id="bm_id3146946" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE" id="bm_id3083278" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
-<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149962" role="heading" level="2" l10n="U" oldref="3">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144750" role="paragraph" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_ROW_MAN_BTN_DEFVAL" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD" id="bm_id3150445" localize="false"/>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="5"><switchinline select="appl">
-<caseinline select="CALC">Default value
-</caseinline><defaultinline>Automatic</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Automatically adjusts the row height based on the current font.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="2" l10n="CHG"
+ oldref="5">Default value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Adjusts the row height to the size based on the default template. Existing contents may be shown vertically cropped. The height no longer increases automatically when you enter larger contents.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050100.xhp b/helpcontent2/source/text/shared/01/06050100.xhp
index 585459e531..a1b07dac86 100755
--- a/helpcontent2/source/text/shared/01/06050100.xhp
+++ b/helpcontent2/source/text/shared/01/06050100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -58,12 +58,7 @@
<paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050200.xhp b/helpcontent2/source/text/shared/01/06050200.xhp
index 1b0d268cd4..8a1be78291 100755
--- a/helpcontent2/source/text/shared/01/06050200.xhp
+++ b/helpcontent2/source/text/shared/01/06050200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050200.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,38 +30,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Numbering Style</title>
-<filename>/text/shared/01/06050200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-24T14:40:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="numerierungsart">
-<paragraph role="heading" id="hd_id3146807" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
-</section>
+ <topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Numbering Style</title>
+ <filename>/text/shared/01/06050200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="numerierungsart">
+ <paragraph xml-lang="en-US" id="hd_id3146807" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148765" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_SINGLENUM" id="bm_id3153255" localize="false"/>
-<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147000" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152918" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index a1efd7f019..16ec61a88a 100755
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
@@ -45,7 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value>
<bookmark_value>words;wrapping in CTL</bookmark_value>
-</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment>
+</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment>
<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph>
@@ -72,4 +72,4 @@
<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
<paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index dbf316f75e..5bb5d2a70b 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -42,20 +42,22 @@
</meta>
<body>
<section id="passwort">
- <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="2" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="1" l10n="U"
oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
<embed href="text/shared/01/password_main.xhp#password_rules"/>
<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="1" l10n="U"
+<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>
<paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
+<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">Re-enter the password.</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="U" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 5d47d0c2a8..57f3616cde 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -124,7 +124,9 @@
<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>
+ <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="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>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES" id="bm_id113223" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 7e50fc04b7..a0c681a6af 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -49,7 +49,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_DSBROWSER_EXPLORER" id="bm_id6761446" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBrowserExplorer" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/12000000.xhp" name="Explorer On/Off">Explorer On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off </emph>icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off</emph> icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
</section>
<section id="syexplorer">
<table id="tbl_id3153894">
@@ -67,7 +67,7 @@
</section>
<embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their links, queries and tables.</paragraph>
+<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their queries and tables.</paragraph>
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="53">
<emph>Establishing a connection</emph> - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type.</paragraph>
<section id="kontextmenue">
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 8853dde826..a6a8b413c2 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -279,11 +279,11 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression </emph>is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression</emph> is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147130" role="heading" level="2" l10n="U"
oldref="49">Regular expression</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item> <link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154718" role="paragraph" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
<table id="tbl_id3148682">
<tablerow>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..a3345a938c 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
***********************************************************************
*
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase30000000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Adabas D Database</title>
@@ -44,11 +40,10 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
-<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
-<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">The Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
+<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The free Adabas D database is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
<paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
-<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
+<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The free Adabas database is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="97">The name of an Adabas file cannot exceed 8 characters. The path to the Adabas file, including the file name, cannot exceed 30 characters, and must be compliant with the 7-bit ASCII code. Both the path and the file name cannot contain spaces.</paragraph>
<paragraph role="note" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="6">Under Windows, the Adabas setup application adds the DBROOT environment variable that contains the path information for the database. If the setup application finds this variable, it does not install the database.</paragraph>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="37">Create New Adabas Database</paragraph>
@@ -66,76 +61,5 @@
</list>
<paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file.
-</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script.
-</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="94">In the $DBCONFIG$ directory, delete the three files that have the same name as the database, but with different extensions. For example, for a database named "Big", delete the "Big.sys", "Big.trs", and "Big.dat" files in the "C:\Adabas\".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="46">In the $DBCONFIG$\Config directory, delete the file that has the same name as the database, for example, " C:\Adabas\Sql\Config\Big".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="47">In the $DBWORKS$\Wrk directory, delete the directory that has the same name as the database., for example "C:\Adabas\Sql\Wrk\Big".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="2" l10n="U" oldref="71">Starting and Shutting Down an Adabas Database</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147361" xml-lang="en-US" l10n="U" oldref="72">strt -d &lt;DBNAME&gt; -NoDBWindow -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3145298" xml-lang="en-US" l10n="U" oldref="73">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="74">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; shutdown</paragraph>
-<paragraph role="listitem" id="par_id3154965" xml-lang="en-US" l10n="U" oldref="75">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147252" xml-lang="en-US" l10n="U" oldref="76">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; restart</paragraph>
-<paragraph role="listitem" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="77">switches the database to WARM.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="78">stp -d &lt;DBNAME&gt; -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="79">completely shuts down the database</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="2" l10n="U" oldref="61">Error Messages in an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="62">The following is a list of possible error messages and solutions for working with the Adabas D database.</paragraph>
-<paragraph role="heading" id="hd_id3153273" xml-lang="en-US" level="3" l10n="U" oldref="69">The database cannot be shut down / restarted as a user is still connected to it.</paragraph>
-<paragraph role="paragraph" id="par_id3145761" xml-lang="en-US" l10n="U" oldref="70">Close any other open tasks that show the database contents. On multi-user systems, ensure that all users are disconnected from the database, and then restart $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="3" l10n="U" oldref="63">Client unable to establish connection; -813 SERVERDB MUST BE RESTARTED</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="64">This error occurs if you try to access an Adabas D database that has not been started. Ensure that you have defined a Control User for the database, and then start the database.</paragraph>
-<paragraph role="heading" id="hd_id3149529" xml-lang="en-US" level="3" l10n="U" oldref="65">Client unable to establish connection; -8022 USER ALREADY CONNECTED</paragraph>
-<paragraph role="paragraph" id="par_id3153197" xml-lang="en-US" l10n="U" oldref="66">This error occurs if you try to access an Adabas D database more than one time.</paragraph>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="86">Errors occurring when writing the data in the database</paragraph>
-<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="87">Restart $[officename], and then change the database properties.</paragraph>
-<paragraph role="heading" id="hd_id3155582" xml-lang="en-US" level="2" l10n="U" oldref="80">Running an Adabas Server on a Network</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="81">To run Adabas on a network, you need to install the Adabas server on one machine and the client on the workstations that you want to access the database from.</paragraph>
-<paragraph role="note" id="par_id3149337" xml-lang="en-US" l10n="U" oldref="92">You can only create a new database on the server.</paragraph>
-<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="3" l10n="U" oldref="82">Enabling a Remote Connection</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="83">Under Windows, start the xtcpupd.exe support program on both the client and the server, and ensure that "Remote SQL via TCP/IP" is selected in the xtcpupd.exe dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin
-</caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="CHG" oldref="104">Choose <emph>File - New - Database</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="CHG" oldref="88">Click <emph>Connect to an existing database</emph>, and select "Adabas D" in the listbox. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id296334" xml-lang="en-US" l10n="NEW">In the <emph>Name of the Adabas D database </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph>
-</listitem>
-</list>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index b68bb1240f..28477dbd8c 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -47,7 +47,7 @@
<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
<switch select="sys">
<case select="WIN">
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 32f416c834..5be396302c 100755
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -69,7 +69,7 @@
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Default file format and ODF settings</emph> area.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index c0f06f2f30..2a21c5544a 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -79,8 +79,7 @@
<paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
<paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
<paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
-<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index f230251017..01ec536ec0 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,170 +35,173 @@
<meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
-<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
-<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+ <title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+ <filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
-<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
-<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
+ <bookmark_value>import restrictions for Microsoft Office</bookmark_value>
+ <bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
-<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
+<paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="E" oldref="32"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">AutoShapes</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Revision marks</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="9">OLE objects</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="11">Indexes</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="15">Animated characters/text</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="24">Microsoft PowerPoint</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="25">AutoShapes</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="27">Master background graphics</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="28">Grouped objects</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="29">Certain multimedia effects</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150986" xml-lang="en-US" level="2" l10n="U" oldref="16">Microsoft Excel</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="17">AutoShapes</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="18">OLE objects</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="20">Pivot tables</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="21">New chart types</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="22">Conditional formatting</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="23">Some functions/formulas (see below)</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id0811200801491971" xml-lang="en-US" l10n="NEW">One example of differences between Calc and Excel is the handling of boolean values. Enter TRUE to cells A1 and A2. </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id0811200801491973" xml-lang="en-US" l10n="NEW">In Calc, the formula =A1+A2 returns the value 2, and the formula =SUM(A1;A2) returns 2. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
-<paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
-<paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
-<table id="tbl_id4497512">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Microsoft Office format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10ABC" xml-lang="en-US" l10n="NEW">Supported encryption method</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AC3" xml-lang="en-US" l10n="NEW">Word 6.0, Word 95</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AC9" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AD0" xml-lang="en-US" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AD6" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10ADD" xml-lang="en-US" l10n="NEW">Word XP, Word 2003</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AE3" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AEA" xml-lang="en-US" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AF0" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AFD" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10B04" xml-lang="en-US" l10n="NEW">Excel XP, Excel 2003</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10B0A" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200804174819" role="note" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155934" role="paragraph" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="listitem" l10n="U" oldref="7">AutoShapes</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="listitem" l10n="U" oldref="8">Revision marks</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="listitem" l10n="U" oldref="9">OLE objects</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="listitem" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="11">Indexes</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155342" role="listitem" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153541" role="listitem" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154143" role="listitem" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156117" role="listitem" l10n="U" oldref="15">Animated characters/text</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="U"
+ oldref="24">Microsoft PowerPoint</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154365" role="listitem" l10n="U" oldref="25">AutoShapes</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156424" role="listitem" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="27">Master background graphics</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159151" role="listitem" l10n="U" oldref="28">Grouped objects</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156282" role="listitem" l10n="U" oldref="29">Certain multimedia effects</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3150986" role="heading" level="2" l10n="U"
+ oldref="16">Microsoft Excel</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="17">AutoShapes</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="18">OLE objects</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148943" role="listitem" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="20">Pivot tables</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152361" role="listitem" l10n="U" oldref="21">New chart types</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156343" role="listitem" l10n="U" oldref="22">Conditional formatting</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="CHG" oldref="23">Some functions/formulas (see below)</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0811200801491971" role="paragraph" l10n="NEW">One example of differences between Calc and Excel is the handling of boolean values. Enter TRUE to cells A1 and A2. </paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0811200801491973" role="paragraph" l10n="NEW">In Calc, the formula =A1+A2 returns the value 2, and the formula =SUM(A1;A2) returns 2. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0811200801491972" role="paragraph" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3150439" role="note" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A9F" role="heading" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8699606" role="paragraph" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
+ <table id="tbl_id4497512">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AB6" role="tablehead" l10n="NEW">Microsoft Office format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10ABC" role="tablehead" l10n="NEW">Supported encryption method</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AC3" role="tablecontent" l10n="NEW">Word 6.0, Word 95</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AC9" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AD0" role="tablecontent" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AD6" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10ADD" role="tablecontent" l10n="NEW">Word XP, Word 2003</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AE3" role="tablecontent" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AEA" role="tablecontent" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AF0" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AF7" role="tablecontent" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10B04" role="tablecontent" l10n="NEW">Excel XP, Excel 2003</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10B0A" role="tablecontent" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Starting from OpenOffice.org 3.2 or StarOffice 9.2, Microsoft Office files that are encrypted by AES128 can be opened. Other encryption methods are not supported.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 0ba1818bd2..e538b6facf 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -106,7 +106,7 @@
<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
+<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index b04d3b4ad5..f930114343 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,124 +35,125 @@
<meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include">
-<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
-<filename>/text/shared/guide/paintbrush.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="paintbrush">
+ <topic id="textsharedguidepaintbrushxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
+ <filename>/text/shared/guide/paintbrush.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="paintbrush">
<bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
-<bookmark_value>formatting;copying</bookmark_value>
-<bookmark_value>copying;formatting</bookmark_value>
+ <bookmark_value>formatting;copying</bookmark_value>
+ <bookmark_value>copying;formatting</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
+<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
-<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">Icon</alt>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">You can use the Format Paintbrush tool to copy formatting from a text selection or from an object and apply the formatting to another text selection or object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id101920091122570" role="note" l10n="NEW">In Calc, the Format Paintbrush only applies to cell formatting.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106DD" role="paragraph" l10n="NEW">Select the text or object whose formatting you want to copy.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered" startwith="2">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
-<table id="tbl_id599688">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
+ <table id="tbl_id599688">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="tablehead" l10n="NEW">Type of Selection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10697" role="tablehead" l10n="NEW">Comment</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1069E" role="tablecontent" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="tablecontent" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106AB" role="tablecontent" l10n="NEW">Text is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B1" role="tablecontent" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="tablecontent" l10n="NEW">Object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106CB" role="tablecontent" l10n="NEW">Copies the object formatting that is defined in the <item type="menuitem">Format - Graphics</item> or <item type="menuitem">Format - Drawing Object</item> dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D2" role="tablecontent" l10n="NEW">Form control is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D8" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Text within drawing object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">In Impress and Draw, paragraph and character formatting can be copied from and to text selections. Not Supported in Calc and Writer</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106EC" role="tablecontent" l10n="CHG">Text within Calc cells is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="tablecontent" l10n="NEW">Writer table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106FF" role="tablecontent" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the <item type="menuitem">Format - Table</item> dialog. The paragraph and character formatting are also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10706" role="tablecontent" l10n="NEW">Calc table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1070C" role="tablecontent" l10n="NEW">Copies the formatting that is specified in the <item type="menuitem">Format - Cells</item> dialog as well as the formatting of the cell contents</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 1fc3d0f77a..959eaa2b00 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: scripting.xhp,v $
- * $Revision: 1.17.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,200 +35,198 @@
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
-<filename>/text/shared/guide/scripting.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidescriptingxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Scripting %PRODUCTNAME</title>
+ <filename>/text/shared/guide/scripting.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id5277565"><bookmark_value>assigning scripts</bookmark_value>
-<bookmark_value>programming;scripting</bookmark_value>
-<bookmark_value>form controls;assigning macros</bookmark_value>
-<bookmark_value>pictures;assigning macros</bookmark_value>
-<bookmark_value>hyperlinks;assigning macros</bookmark_value>
-<bookmark_value>shortcut keys;assigning macros</bookmark_value>
-<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
-<bookmark_value>menus;assigning macros</bookmark_value>
-<bookmark_value>events;assigning scripts</bookmark_value>
+ <bookmark_value>programming;scripting</bookmark_value>
+ <bookmark_value>form controls;assigning macros</bookmark_value>
+ <bookmark_value>pictures;assigning macros</bookmark_value>
+ <bookmark_value>hyperlinks;assigning macros</bookmark_value>
+ <bookmark_value>shortcut keys;assigning macros</bookmark_value>
+ <bookmark_value>controls;assigning macros (Basic)</bookmark_value>
+ <bookmark_value>menus;assigning macros</bookmark_value>
+ <bookmark_value>events;assigning scripts</bookmark_value>
</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment>
-<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+<paragraph xml-lang="en-US" id="par_idN1070A" role="heading" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">JavaScript</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1091F" xml-lang="en-US" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1093D" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10770" xml-lang="en-US" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10778" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10783" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10787" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A61" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A65" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A69" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A71" xml-lang="en-US" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
-<paragraph role="paragraph" id="par_idN10A74" xml-lang="en-US" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A78" xml-lang="en-US" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1078A" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1078E" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A16" xml-lang="en-US" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A9E" xml-lang="en-US" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAA" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAE" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB9" xml-lang="en-US" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ABD" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEB" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEF" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10798" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1079C" xml-lang="en-US" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B15" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B19" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B21" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079F" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A3" xml-lang="en-US" l10n="NEW">Select the graphic in your document. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3B" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3F" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107A6" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a form control</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107AA" xml-lang="en-US" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B59" xml-lang="en-US" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B5D" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B61" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107AD" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107B1" xml-lang="en-US" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B7F" xml-lang="en-US" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B87" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B8B" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10728" role="paragraph" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">%PRODUCTNAME Basic</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">JavaScript</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1073D" role="paragraph" l10n="CHG">BeanShell</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10758" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1093D" role="paragraph" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10770" role="paragraph" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="paragraph" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="heading" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10787" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A61" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A65" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A69" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A71" role="paragraph" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A74" role="paragraph" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A78" role="paragraph" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1078A" role="heading" level="2" l10n="NEW">To assign a script to an event</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A16" role="paragraph" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A9E" role="paragraph" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AA6" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAA" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAE" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AB6" role="paragraph" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AB9" role="paragraph" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ABD" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AE7" role="paragraph" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEB" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEF" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AF7" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10798" role="heading" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1079C" role="paragraph" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B15" role="paragraph" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B19" role="paragraph" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B21" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1079F" role="heading" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107A3" role="paragraph" l10n="NEW">Select the graphic in your document. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3B" role="paragraph" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3F" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107A6" role="heading" level="2" l10n="NEW">To assign a script to a form control</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107AA" role="paragraph" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B59" role="paragraph" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B5D" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B61" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107AD" role="heading" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B1" role="paragraph" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B7F" role="paragraph" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B87" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B8B" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index 083922ca93..8830bcdd7e 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -49,7 +49,13 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
<paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:ImpressButton" id="bm_id102220091057270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DBButton" id="bm_id102220091057437" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:MathButton" id="bm_id1022200910575575" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW"><ahelp hid=".">The document icons each open a new document of the specified type.</ahelp></paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104978" role="paragraph" l10n="NEW">
@@ -76,8 +82,12 @@
<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:TemplateButton" id="bm_id1022200910584084" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011855" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Templates icon opens the Templates and Documents dialog.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
- <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
+<paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/main0212.xhp b/helpcontent2/source/text/shared/main0212.xhp
index 5e87e71c59..677c5d006c 100644
--- a/helpcontent2/source/text/shared/main0212.xhp
+++ b/helpcontent2/source/text/shared/main0212.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0212.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,83 +30,82 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Data Bar</title>
-<filename>/text/shared/main0212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-11T14:46:11">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="datenbank">
-<paragraph role="heading" id="hd_id3147102" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
-<embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="E">
-<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153896" xml-lang="en-US">Icon</alt>
+ <topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Data Bar</title>
+ <filename>/text/shared/main0212.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="datenbank">
+ <paragraph xml-lang="en-US" id="hd_id3147102" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
+ <embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="paragraph" l10n="E">
+<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="CHG" oldref="13">Save Record</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
-<embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
-<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154123" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="CHG" oldref="13">Save Record</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
+ <embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
+ <embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="E">
+<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="14">Undo: Data Input</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/12100200.xhp#findrecord"/>
-<embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
-<embed href="text/shared/02/12050000.xhp#aktualisieren"/>
-<embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
-<embed href="text/shared/02/12100100.xhp#sortorder"/>
-<embed href="text/shared/00/00000450.xhp#sysortieren"/>
-<embed href="text/shared/02/12010000.xhp#aufsteigend"/>
-<embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
-<embed href="text/shared/02/12020000.xhp#absteigend"/>
-<embed href="text/shared/02/12020000.xhp#syabsteigend"/>
-<embed href="text/shared/02/12030000.xhp#autofilter"/>
-<embed href="text/shared/02/12030000.xhp#syautofilter"/>
-<embed href="text/shared/02/12120000.xhp#filteranwenden"/>
-<embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
-<embed href="text/shared/02/12090000.xhp#standardfilter1"/>
-<embed href="text/shared/02/12090000.xhp#systandardfilter"/>
-<embed href="text/shared/02/12040000.xhp#filterentfernen"/>
-<embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151382" role="paragraph" l10n="U" oldref="14">Undo: Data Input</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/12100200.xhp#findrecord"/>
+ <embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
+ <embed href="text/shared/02/12050000.xhp#aktualisieren"/>
+ <embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
+ <embed href="text/shared/02/12100100.xhp#sortorder"/>
+ <embed href="text/shared/00/00000450.xhp#sysortieren"/>
+ <embed href="text/shared/02/12010000.xhp#aufsteigend"/>
+ <embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
+ <embed href="text/shared/02/12020000.xhp#absteigend"/>
+ <embed href="text/shared/02/12020000.xhp#syabsteigend"/>
+ <embed href="text/shared/02/12030000.xhp#autofilter"/>
+ <embed href="text/shared/02/12030000.xhp#syautofilter"/>
+ <embed href="text/shared/02/12120000.xhp#filteranwenden"/>
+ <embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
+ <embed href="text/shared/02/12090000.xhp#standardfilter1"/>
+ <embed href="text/shared/02/12090000.xhp#systandardfilter"/>
+ <embed href="text/shared/02/12040000.xhp#filterentfernen"/>
+ <embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBInsertColumns" id="bm_id5734733" localize="false"/>
-<paragraph role="head2" id="par_idN10744" xml-lang="en-US" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
-<paragraph role="paragraph" id="par_idN10753" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/12070000.xhp#sydatenintext"/>
-<embed href="text/shared/02/12080000.xhp#dateninfelder"/>
-<embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
-<paragraph role="head2" id="par_idN10780" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US" l10n="NEW">Starts the Mail Merge Wizard to create form letters.</paragraph>
-<embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
-<embed href="text/shared/02/12140000.xhp#aktdokdat"/>
-<embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
-<embed href="text/shared/02/12000000.xhp#explorer"/>
-<embed href="text/shared/02/12000000.xhp#syexplorer"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10744" role="head2" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10753" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
+ <embed href="text/shared/02/12070000.xhp#sydatenintext"/>
+ <embed href="text/shared/02/12080000.xhp#dateninfelder"/>
+ <embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id0928200901513623" localize="false"/><comment>Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder</comment>
+<paragraph xml-lang="en-US" id="par_idN10780" role="head2" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1078F" role="paragraph" l10n="NEW"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters.</ahelp></paragraph>
+ <embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
+ <embed href="text/shared/02/12140000.xhp#aktdokdat"/>
+ <embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
+ <embed href="text/shared/02/12000000.xhp#explorer"/>
+ <embed href="text/shared/02/12000000.xhp#syexplorer"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index 8a7fe55cdb..bf02b8b7c4 100755
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -1,8 +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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.16 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,78 +32,83 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:49:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/optionen/01010600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155450"><bookmark_value>opening; dialog settings</bookmark_value>
-<bookmark_value>saving; dialog settings</bookmark_value>
-<bookmark_value>Open/Save dialogs</bookmark_value>
-<bookmark_value>years; 2-digit options</bookmark_value>
-<bookmark_value>Help Agent;options</bookmark_value>
-<bookmark_value>Help;style sheets</bookmark_value>
-</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E" oldref="42" localize="false"/>
-<section id="allg">
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#allg"/>
-</section>
+ <bookmark_value>saving; dialog settings</bookmark_value>
+ <bookmark_value>years; 2-digit options</bookmark_value>
+ <bookmark_value>Help Agent;options</bookmark_value>
+ <bookmark_value>Help;style sheets</bookmark_value>
+</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment><comment>removed index "Open/Save dialogs", see i105788</comment>
+<paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
+ localize="false"/>
+ <section id="allg">
+ <paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#allg"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE" id="bm_id3151385" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MISC_NF_YEARVALUE" id="bm_id6075624" localize="false"/>
-<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
-<section id="jahreszahlen">
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="CHG" oldref="25">Help</paragraph>
-<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153561" role="heading" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
+ <section id="jahreszahlen">
+ <paragraph xml-lang="en-US" id="par_id3156343" role="paragraph" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="2" l10n="CHG"
+ oldref="25">Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153525" role="paragraph" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP" id="bm_id3539841" localize="false"/>
-<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">Tips</paragraph>
-<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106DB" role="heading" level="3" l10n="NEW">Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="paragraph" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_EXTHELP" id="bm_id1425519" localize="false"/>
-<paragraph role="heading" id="par_idN106F6" xml-lang="en-US" level="3" l10n="NEW">Extended tips</paragraph>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT" id="bm_id3125863" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT" id="bm_id1998657" localize="false"/>
-<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="CHG" oldref="26">Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
+ oldref="26">Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id3154684" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="30">Reset Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="2" l10n="U" oldref="43">$[officename] Help formatting</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
+ oldref="30">Reset Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159252" role="heading" level="2" l10n="U"
+ oldref="43">$[officename] Help formatting</paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET" id="bm_id3150488" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
-<paragraph role="heading" id="hd_id3150011" xml-lang="en-US" level="3" l10n="U" oldref="44">Style sheet</paragraph>
-<paragraph role="paragraph" id="par_id3153366" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152577" xml-lang="en-US" level="2" l10n="CHG" oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150011" role="heading" level="3" l10n="U"
+ oldref="44">Style sheet</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153366" role="paragraph" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
+ oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG" id="bm_id3147348" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_FILEDLG" id="bm_id7715994" localize="false"/>
-<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Use $[officename] dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3" l10n="CHG"
+ oldref="35">Use $[officename] dialogs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
<switch select="sys">
<case select="WIN">
-<paragraph role="warning" id="par_idN10856" xml-lang="en-US" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10856" 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 role="paragraph" id="par_id3153138" xml-lang="en-US" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
-<paragraph role="heading" id="hd_id3148617" xml-lang="en-US" level="2" l10n="U" oldref="39">Document status</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2" l10n="U"
+ oldref="39">Document status</paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3147126" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
-<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="40">Printing sets "document modified" status</paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
+ oldref="40">Printing sets "document modified" status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index d584516981..e27db33561 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -117,9 +117,16 @@
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10AD4" role="heading" level="3" l10n="NEW">Use hardware acceleration</paragraph>
<paragraph xml-lang="en-US" id="par_idN10AD8" role="paragraph" l10n="NEW"><ahelp hid=".">Directly accesses hardware features of the graphical display adapter to improve the screen display.</ahelp> The support for hardware acceleration is not available for all operating systems and platform distributions of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/810517573" id="bm_id1208200812001940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" id="bm_id1019200910503048" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1208200812004470" role="heading" level="3" l10n="NEW">Use Anti-Aliasing</paragraph>
<paragraph xml-lang="en-US" id="par_id1208200812004444" role="paragraph" l10n="NEW"><ahelp hid=".">When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id101920091058114" role="heading" level="2" l10n="NEW">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_SELECTION" id="bm_id1019200910494637" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581166" role="heading" level="3" l10n="NEW">Transparency</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581186" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the text selection in Writer and the cell selection in Calc will be shown using a transparent color. If not enabled, the selection will be shown by inverted colors.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:OFA_TP_VIEW:MF_SELECTION" id="bm_id101920091057065" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581266" role="heading" level="3" l10n="NEW">Transparency level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581220" role="paragraph" l10n="NEW"><ahelp hid=".">Select the transparency level for transparent selections. The default value is 75%. You can select values from 10% to 90%.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id3147167" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3166432" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index a7787f91f5..aec7c8d486 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -117,7 +117,7 @@
<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
-<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 8e12eb1056..7d63d5c6cf 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060500.xhp,v $
- * $Revision: 1.15 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,194 +32,201 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculate</title>
-<filename>/text/shared/optionen/01060500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T13:17:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="berechnen">
+ <topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Calculate</title>
+ <filename>/text/shared/optionen/01060500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="berechnen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149399"><bookmark_value>references; iterative (Calc)</bookmark_value>
-<bookmark_value>calculating;iterative references (Calc)</bookmark_value>
-<bookmark_value>iterative references in spreadsheets</bookmark_value>
-<bookmark_value>recursions in spreadsheets</bookmark_value>
-<bookmark_value>dates; default (Calc)</bookmark_value>
-<bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
-<bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
-<bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
-<bookmark_value>numbers; decimal places (Calc)</bookmark_value>
-<bookmark_value>decimal places displayed (Calc)</bookmark_value>
-<bookmark_value>precision as shown (Calc)</bookmark_value>
-<bookmark_value>values; rounded as shown (Calc)</bookmark_value>
-<bookmark_value>rounding precision (Calc)</bookmark_value>
-<bookmark_value>search criteria for database functions in cells</bookmark_value>
-<bookmark_value>Excel; search criteria</bookmark_value>
-</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment>
+ <bookmark_value>calculating;iterative references (Calc)</bookmark_value>
+ <bookmark_value>iterative references in spreadsheets</bookmark_value>
+ <bookmark_value>recursions in spreadsheets</bookmark_value>
+ <bookmark_value>dates; default (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
+ <bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
+ <bookmark_value>decimal places displayed (Calc)</bookmark_value>
+ <bookmark_value>precision as shown (Calc)</bookmark_value>
+ <bookmark_value>values; rounded as shown (Calc)</bookmark_value>
+ <bookmark_value>rounding precision (Calc)</bookmark_value>
+ <bookmark_value>search criteria for database functions in cells</bookmark_value>
+ <bookmark_value>Excel; search criteria</bookmark_value>
+</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/HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
-<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" 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>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#exopbe"/>
-</section>
-<paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Iterative references</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
+<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>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#exopbe"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2" l10n="U" oldref="3">Iterative references</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
-<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="5">Iterations</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
-<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="CHG" oldref="7">
-<emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153061" xml-lang="en-US" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149669">
-<tablerow>
-<tablecell colspan="" rowspan="">
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="9">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="10">B</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11">5</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="12">Selling Price</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="13">100</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="14">6</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="15">Net</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="16">=B5-B7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="17">7</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="18">Tax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="19">=B6*0,15</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3154142" role="heading" level="3" l10n="U" oldref="5">Iterations</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148686" role="paragraph" l10n="CHG" oldref="7">
+ <emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156155" role="listitem" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="listitem" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153061" role="listitem" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="listitem" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
+ </listitem>
+ </list>
+ <table id="tbl_id3149669">
+ <tablerow>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="9">A</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145606" role="paragraph" l10n="U" oldref="10">B</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="11">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="12">Selling Price</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="13">100</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="14">6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="paragraph" l10n="U" oldref="15">Net</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147348" role="paragraph" l10n="U" oldref="16">=B5-B7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="U" oldref="17">7</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="18">Tax</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="19">=B6*0,15</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
-<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="22">Steps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145750" role="heading" level="3" l10n="U"
+ oldref="22">Steps</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="24">Minimum Change</paragraph>
-<paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147125" xml-lang="en-US" level="2" l10n="U" oldref="45">Date</paragraph>
-<paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153728" role="heading" level="3" l10n="U"
+ oldref="24">Minimum Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147125" role="heading" level="2" l10n="U"
+ oldref="45">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155416" role="paragraph" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
-<paragraph role="heading" id="hd_id3147396" xml-lang="en-US" level="3" l10n="U" oldref="47">12/30/1899 (default)</paragraph>
-<paragraph role="paragraph" id="par_id3145646" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147396" role="heading" level="3" l10n="U"
+ oldref="47">12/30/1899 (default)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
-<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156283" role="heading" level="3" l10n="U"
+ oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
-<paragraph role="heading" id="hd_id3156181" xml-lang="en-US" level="3" l10n="U" oldref="51">01/01/1904</paragraph>
-<paragraph role="paragraph" id="par_id3153948" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156181" role="heading" level="3" l10n="U"
+ oldref="51">01/01/1904</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
-<paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="2" l10n="U" oldref="26">Case sensitive</paragraph>
-<paragraph role="paragraph" id="par_id3146793" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="28">
-<emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
-<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153838" role="heading" level="2" l10n="U"
+ oldref="26">Case sensitive</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="28">
+ <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
-<paragraph role="heading" id="hd_id3145231" xml-lang="en-US" level="2" l10n="U" oldref="53">Decimal places</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145231" role="heading" level="2" l10n="U"
+ oldref="53">Decimal places</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
-<paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="2" l10n="U" oldref="30">Precision as shown</paragraph>
-<paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+ oldref="30">Precision as shown</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="2" l10n="U" oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
-<table id="tbl_id3149814">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="34">.* in following position:</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="35">Search result:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="36">win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153782" xml-lang="en-US" l10n="U" oldref="38">win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151278" xml-lang="en-US" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155506" xml-lang="en-US" l10n="U" oldref="40">.*win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150886" xml-lang="en-US" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="42">.*win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
+ oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+ <table id="tbl_id3149814">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">.* in following position:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156139" role="tablehead" l10n="U" oldref="35">Search result:</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="36">win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159239" role="tablecontent" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151278" role="tablecontent" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">.*win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150886" role="tablecontent" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">.*win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152985" role="tablecontent" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX" id="bm_id3154419" localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2" l10n="U" oldref="58">Enable regular expressions in formulas</paragraph>
-<paragraph role="paragraph" id="par_id3155092" xml-lang="en-US" 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="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.
</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 role="heading" id="hd_id3156199" xml-lang="en-US" level="2" l10n="U" oldref="55">Automatically find column and row labels</paragraph>
-<paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" 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 role="paragraph" id="par_id3151242" xml-lang="en-US" 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>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
+ oldref="55">Automatically find column and row labels</paragraph>
+ <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>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index 69f8c5eaa0..d21aa1b372 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.13.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,65 +35,70 @@
<meta>
-<topic id="textsharedoptionen01130100xml" indexer="include">
-<title id="tit" xml-lang="en-US">VBA Properties</title>
-<filename>/text/shared/optionen/01130100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="office">
+ <topic id="textsharedoptionen01130100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">VBA Properties</title>
+ <filename>/text/shared/optionen/01130100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="office">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>Microsoft Office; importing/exporting VBA code</bookmark_value>
-<bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
-<bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
-<bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
+ <bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="1" l10n="U" oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#etsofi"/>
-</section>
-<paragraph role="heading" id="hd_id3145582" xml-lang="en-US" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174017" id="bm_id0523200811471179" localize="false"/><comment>Help IDs got changed, but are not updated in hid.lst. So only numeric IDs here</comment>
-<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
+<paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="1" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#etsofi"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3145582" role="heading" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149762" role="paragraph" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE" id="bm_id1012200910594212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE" id="bm_id101220091104572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE" id="bm_id1012200911053796" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155420" role="heading" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159399" role="paragraph" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174018" id="bm_id052320081146569" localize="false"/>
-<paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
-<section id="origtext">
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with it in an unchanged form.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174019" id="bm_id0523200811462736" localize="false"/>
-<paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="11">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174020" id="bm_id0523200811460569" localize="false"/>
-<paragraph role="heading" id="hd_id0523200811475727" xml-lang="en-US" level="3" l10n="NEW">Executable code</paragraph>
-<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174021" id="bm_id0523200811454459" localize="false"/>
-<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="3" l10n="U" oldref="12">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174022" id="bm_id0523200811451458" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="15">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174023" id="bm_id0523200811435766" localize="false"/>
-<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="16">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG" id="bm_id1012200911004150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG" id="bm_id1012200911020741" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG" id="bm_id1012200911024686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
+ <section id="origtext">
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with the code in an unchanged form.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="paragraph" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154072" role="heading" level="3" l10n="U"
+ oldref="11">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL" id="bm_id1012200911063630" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0523200811475727" role="heading" level="3" l10n="NEW">Executable code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0523200811475733" role="paragraph" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151211" role="heading" level="3" l10n="U"
+ oldref="12">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U"
+ oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="3" l10n="U"
+ oldref="15">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+ <paragraph xml-lang="en-US" id="hd_id3145419" role="heading" level="3" l10n="U"
+ oldref="16">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp
index f06b372c8c..33923e6965 100755
--- a/helpcontent2/source/text/shared/tree_strings.xhp
+++ b/helpcontent2/source/text/shared/tree_strings.xhp
@@ -58,7 +58,7 @@
<paragraph role="paragraph" id="par_id3166461" l10n="U" xml-lang="en-US" oldref="10">&lt;node id=&quot;0205&quot; title=&quot;Tables in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155136" l10n="U" xml-lang="en-US" oldref="11">&lt;node id=&quot;0206&quot; title=&quot;Objects in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155629" l10n="U" xml-lang="en-US" oldref="12">&lt;node id=&quot;0207&quot; title=&quot;Sections and Frames in Text Documents&quot;&gt;</paragraph>
- <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Content and Indexes&quot;&gt;</paragraph>
+ <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Contents and Indexes&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3153349" l10n="U" xml-lang="en-US" oldref="14">&lt;node id=&quot;0209&quot; title=&quot;Fields in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3145120" l10n="U" xml-lang="en-US" oldref="15">&lt;node id=&quot;0210&quot; title=&quot;Navigating Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3159400" l10n="U" xml-lang="en-US" oldref="16">&lt;node id=&quot;0211&quot; title=&quot;Calculating in Text Documents&quot;&gt;</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/02120000.xhp b/helpcontent2/source/text/simpress/01/02120000.xhp
index 4facd03491..57d0d8b36c 100644
--- a/helpcontent2/source/text/simpress/01/02120000.xhp
+++ b/helpcontent2/source/text/simpress/01/02120000.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02120000.xhp,v $
- * $Revision: 1.6.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,66 +35,74 @@
<meta>
-<topic id="textsimpress0102120000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Duplicate</title>
-<filename>/text/simpress/01/02120000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsimpress0102120000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Duplicate</title>
+ <filename>/text/simpress/01/02120000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/SID_COPYOBJECTS" id="bm_id5589802" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CopyObjects" id="bm_id3149943" localize="false"/>
-<paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1" l10n="U" oldref="1">Duplicate</paragraph>
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
+<paragraph xml-lang="en-US" id="hd_id3148868" role="heading" level="1" l10n="U" oldref="1">Duplicate</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148604" role="paragraph" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/simpress/00/00000402.xhp#badpz"/>
-</section>
-<embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
+ <section id="howtoget">
+ <embed href="text/simpress/00/00000402.xhp#badpz"/>
+ </section>
+ <embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
<bookmark xml-lang="en-US" branch="hid/SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" id="bm_id3153813" localize="false"/>
-<paragraph role="heading" id="hd_id3146962" xml-lang="en-US" level="2" l10n="U" oldref="3">Number of copies</paragraph>
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146962" role="heading" level="2" l10n="U" oldref="3">Number of copies</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153075" role="paragraph" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA" id="bm_id3147300" localize="false"/>
-<paragraph role="heading" id="hd_id3150431" xml-lang="en-US" level="2" l10n="U" oldref="25">Values from selection</paragraph>
-<table id="tbl_id3150395">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="E">
-<image id="img_id3157870" src="res/sc10350.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157870" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3150431" role="heading" level="2" l10n="U"
+ oldref="25">Values from selection</paragraph>
+ <table id="tbl_id3150395">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150534" role="paragraph" l10n="E">
+<image id="img_id3157870" src="res/sc10350.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3157870">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150744" role="paragraph" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="2" l10n="U" oldref="5">Placement</paragraph>
-<paragraph role="paragraph" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153932" role="heading" level="2" l10n="U" oldref="5">Placement</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150860" role="paragraph" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" id="bm_id3153110" localize="false"/>
-<paragraph role="heading" id="hd_id3153084" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
-<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positd object to the right and negatd object to the left.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153084" role="heading" level="3" l10n="U" oldref="7">X axis</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153564" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3154507" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
-<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154507" role="heading" level="3" l10n="U" oldref="9">Y axis</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149882" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" id="bm_id3153731" localize="false"/>
-<paragraph role="heading" id="hd_id3150022" xml-lang="en-US" level="3" l10n="U" oldref="11">Angle</paragraph>
-<paragraph role="paragraph" id="par_id3153738" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145296" xml-lang="en-US" level="2" l10n="U" oldref="13">Enlargement</paragraph>
-<paragraph role="paragraph" id="par_id3156065" xml-lang="en-US" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150022" role="heading" level="3" l10n="U"
+ oldref="11">Angle</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153738" role="paragraph" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145296" role="heading" level="2" l10n="U"
+ oldref="13">Enlargement</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156065" role="paragraph" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" id="bm_id3150568" localize="false"/>
-<paragraph role="heading" id="hd_id3148769" xml-lang="en-US" level="3" l10n="U" oldref="15">Width</paragraph>
-<paragraph role="paragraph" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148769" role="heading" level="3" l10n="U"
+ oldref="15">Width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150267" role="paragraph" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" id="bm_id3153046" localize="false"/>
-<paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="17">Height</paragraph>
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154866" xml-lang="en-US" level="2" l10n="U" oldref="19">Colors</paragraph>
-<paragraph role="paragraph" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150930" role="heading" level="3" l10n="U"
+ oldref="17">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157970" role="paragraph" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154866" role="heading" level="2" l10n="U"
+ oldref="19">Colors</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150474" role="paragraph" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_START_COLOR" id="bm_id3155372" localize="false"/>
-<paragraph role="heading" id="hd_id3155819" xml-lang="en-US" level="3" l10n="U" oldref="21">Start</paragraph>
-<paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155819" role="heading" level="3" l10n="U"
+ oldref="21">Start</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155987" role="paragraph" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_END_COLOR" id="bm_id3155405" localize="false"/>
-<paragraph role="heading" id="hd_id3156258" xml-lang="en-US" level="3" l10n="U" oldref="23">End</paragraph>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#standard"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156258" role="heading" level="3" l10n="U"
+ oldref="23">End</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#standard"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/smath/01/03090000.xhp b/helpcontent2/source/text/smath/01/03090000.xhp
index 7e09e0b41e..5e99a8c484 100755
--- a/helpcontent2/source/text/smath/01/03090000.xhp
+++ b/helpcontent2/source/text/smath/01/03090000.xhp
@@ -50,7 +50,7 @@
</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>
- <paragraph xml-lang="en-US" id="par_id3148699" role="paragraph" l10n="CHG" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations. You can find more examples in the <emph>Samples - Formulas</emph> folder of the <emph>Templates and Documents</emph> window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148699" role="paragraph" l10n="CHG" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151244" role="paragraph" l10n="U" oldref="6">The selection window is divided into two parts. Clicking a symbol at the top of the window displays its subordinate symbols in the lower half of the window.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153250" role="paragraph" l10n="U" oldref="7">You can access the same functions in submenus through the context menu of the <emph>Commands</emph> window.</paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 66da064bd8..9e143f2345 100755
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -74,18 +74,18 @@
<table id="tbl_id3153537">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="CHG" oldref="19">TRUE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153677" role="tablecontent" l10n="CHG" oldref="19">TRUE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152960" role="tablecontent" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155900" role="paragraph" l10n="CHG" oldref="21">FALSE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155900" role="tablecontent" l10n="CHG" oldref="21">FALSE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154191" role="paragraph" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154191" role="tablecontent" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -114,26 +114,26 @@
<table id="tbl_id3155867">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147417" role="paragraph" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147417" role="tablecontent" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147500" role="paragraph" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147500" role="tablecontent" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145259" role="paragraph" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145259" role="tablecontent" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150551" role="paragraph" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150551" role="tablecontent" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147749" role="paragraph" l10n="U" oldref="36">sinx == 0</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147749" role="tablecontent" l10n="U" oldref="36">sinx == 0</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146345" role="paragraph" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146345" role="tablecontent" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -142,20 +142,20 @@
<table id="tbl_id3148855">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151078" role="paragraph" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151078" role="tablecontent" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150162" role="paragraph" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150162" role="tablecontent" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153301" role="paragraph" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156120" role="paragraph" l10n="U" oldref="90">or</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156133" role="paragraph" l10n="U" oldref="42">!x or NOT x</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153301" role="tablecontent" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156120" role="tablecontent" l10n="U" oldref="90">or</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156133" role="tablecontent" l10n="U" oldref="42">!x or NOT x</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156112" role="paragraph" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156112" role="tablecontent" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -168,130 +168,130 @@
<table id="tbl_id3153139">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149632" role="paragraph" l10n="U" oldref="130">Variable</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149632" role="tablehead" l10n="U" oldref="130">Variable</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150662" role="paragraph" l10n="U" oldref="131">Meaning</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150662" role="tablehead" l10n="U" oldref="131">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154026" role="paragraph" l10n="U" oldref="98">user_firstname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154026" role="tablecontent" l10n="U" oldref="98">user_firstname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="U" oldref="99">First name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149953" role="tablecontent" l10n="U" oldref="99">First name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147272" role="paragraph" l10n="U" oldref="100">user_lastname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147272" role="tablecontent" l10n="U" oldref="100">user_lastname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149601" role="paragraph" l10n="U" oldref="101">Last name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149601" role="tablecontent" l10n="U" oldref="101">Last name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150770" role="paragraph" l10n="U" oldref="102">user_initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150770" role="tablecontent" l10n="U" oldref="102">user_initials</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155529" role="paragraph" l10n="U" oldref="103">Initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="103">Initials</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148705" role="paragraph" l10n="U" oldref="104">user_company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148705" role="tablecontent" l10n="U" oldref="104">user_company</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148728" role="paragraph" l10n="U" oldref="105">Company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148728" role="tablecontent" l10n="U" oldref="105">Company</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="106">user_street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="106">user_street</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="107">Street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154222" role="tablecontent" l10n="U" oldref="107">Street</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145108" role="paragraph" l10n="U" oldref="108">user_country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="108">user_country</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146885" role="paragraph" l10n="U" oldref="109">Country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146885" role="tablecontent" l10n="U" oldref="109">Country</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="110">user_zipcode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149580" role="tablecontent" l10n="U" oldref="110">user_zipcode</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156241" role="paragraph" l10n="U" oldref="111">Zip code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156241" role="tablecontent" l10n="U" oldref="111">Zip code</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="112">user_city</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="tablecontent" l10n="U" oldref="112">user_city</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148945" role="paragraph" l10n="U" oldref="113">City</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148945" role="tablecontent" l10n="U" oldref="113">City</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156053" role="paragraph" l10n="U" oldref="114">user_title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156053" role="tablecontent" l10n="U" oldref="114">user_title</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph" l10n="U" oldref="115">Title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159219" role="tablecontent" l10n="U" oldref="115">Title</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156435" role="paragraph" l10n="U" oldref="116">user_position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156435" role="tablecontent" l10n="U" oldref="116">user_position</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145178" role="paragraph" l10n="U" oldref="117">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145178" role="tablecontent" l10n="U" oldref="117">Position</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150797" role="paragraph" l10n="U" oldref="118">user_tel_work</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150797" role="tablecontent" l10n="U" oldref="118">user_tel_work</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150820" role="paragraph" l10n="U" oldref="119">Business telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150820" role="tablecontent" l10n="U" oldref="119">Business telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150894" role="paragraph" l10n="U" oldref="120">user_tel_home</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="120">user_tel_home</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155320" role="paragraph" l10n="U" oldref="121">Home telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155320" role="tablecontent" l10n="U" oldref="121">Home telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154400" role="paragraph" l10n="U" oldref="122">user_fax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154400" role="tablecontent" l10n="U" oldref="122">user_fax</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153363" role="paragraph" l10n="U" oldref="123">Fax number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153363" role="tablecontent" l10n="U" oldref="123">Fax number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153390" role="paragraph" l10n="U" oldref="124">user_email</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent" l10n="U" oldref="124">user_email</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="U" oldref="125">E-mail address</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent" l10n="U" oldref="125">E-mail address</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145603" role="paragraph" l10n="U" oldref="126">user_state</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145603" role="tablecontent" l10n="U" oldref="126">user_state</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150129" role="paragraph" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150129" role="tablecontent" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
</tablecell>
</tablerow>
</table>
@@ -351,13 +351,15 @@
<paragraph xml-lang="en-US" id="par_id3159247" role="note" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153891" role="paragraph" l10n="U" oldref="55">Example: Hiding an Empty Database Field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153891" role="heading" level="3" l10n="U"
+ oldref="55">Example: Hiding an Empty Database Field</paragraph>
<paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150067" role="paragraph" l10n="CHG" oldref="57">Select the <emph>Hidden Paragraph</emph> list entry, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
<paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
<paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
<paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and enable the <emph>Fields: Hidden </emph>
+ <emph>paragraphs</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
oldref="59">Examples of Conditions in Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0b2f4eff8d..2f9ee0a09f 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -47,9 +47,8 @@
<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" id="bm_id6627657" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id5004119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><comment>UFI: moved DSBFormLetter ID to shared/main0212</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index f46ea279bf..a6f67a2a3c 100755
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -94,7 +94,7 @@
<paragraph xml-lang="en-US" id="par_id3151220" role="listitem" l10n="U" oldref="7">Click the <emph>Custom Quotes</emph> tab</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="U" oldref="25">Clear the “Replace” check box(es).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="CHG" oldref="25">Clear the "Replace" check box(es).</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3155076" role="heading" level="2" l10n="U" oldref="8">To Stop Capitalizing the First Letter of a Sentence</paragraph>
@@ -106,7 +106,7 @@
<paragraph xml-lang="en-US" id="par_id3155123" role="listitem" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="U" oldref="26">Clear the “Capitalize first letter of every sentence<emph>”</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="CHG" oldref="26">Clear the "Capitalize first letter of every sentence" check box.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3155401" role="heading" level="2" l10n="U"
@@ -120,7 +120,7 @@
<paragraph xml-lang="en-US" id="par_id3155463" role="listitem" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155488" role="listitem" l10n="U" oldref="27">Clear the “Apply border<emph>”</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155488" role="listitem" l10n="U" oldref="27">Clear the "Apply border" check box.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/search_regexp.xhp b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
index 5d1d14e71c..e418f92685 100755
--- a/helpcontent2/source/text/swriter/guide/search_regexp.xhp
+++ b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,63 +35,63 @@
<meta>
-<topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Using Wildcards in Text Searches</title>
-<filename>/text/swriter/guide/search_regexp.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Using Wildcards in Text Searches</title>
+ <filename>/text/swriter/guide/search_regexp.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150099"><bookmark_value>wildcards, see regular expressions</bookmark_value>
-<bookmark_value>searching; with wildcards</bookmark_value>
-<bookmark_value>regular expressions;searching</bookmark_value>
-<bookmark_value>examples for regular expressions</bookmark_value>
-<bookmark_value>characters;finding all</bookmark_value>
-<bookmark_value>invisible characters;finding</bookmark_value>
+ <bookmark_value>searching; with wildcards</bookmark_value>
+ <bookmark_value>regular expressions;searching</bookmark_value>
+ <bookmark_value>examples for regular expressions</bookmark_value>
+ <bookmark_value>characters;finding all</bookmark_value>
+ <bookmark_value>invisible characters;finding</bookmark_value>
</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment>
<paragraph xml-lang="en-US" id="hd_id3150099" role="heading" level="1" l10n="U"
-oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
+ oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
</variable></paragraph>
-<paragraph xml-lang="en-US" id="par_id0509200916345516" role="paragraph" l10n="NEW">Wildcards or placeholders can be used to search for some unspecified or even invisible characters.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Edit - Find &amp; Replace</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id2142399" role="listitem" l10n="NEW">Click <item type="menuitem">More Options</item> to expand the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="41">Select the <item type="menuitem">Regular expressions</item> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Search for</item> box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="51">Click <item type="menuitem">Find</item> or <item type="menuitem">Find All</item>.</paragraph>
-</listitem>
-</list>
-<paragraph xml-lang="en-US" id="hd_id3153401" role="heading" level="2" l10n="U"
- oldref="52">Regular Expression Examples</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149641" role="listitem" oldref="44">The wildcard for a single character is a period (.).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3153136" role="listitem" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149609" role="listitem" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149854" role="listitem" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id0509200916345545" role="listitem" l10n="NEW">The wildcard for a tab character is \t.</paragraph>
-</listitem>
-</list>
-<paragraph xml-lang="en-US" id="par_id3153414" role="note" l10n="CHG" oldref="49">You can only search for regular expressions within the same paragraph. That is, you cannot search for one term in a paragraph and a different term in the next paragraph.</paragraph>
-<section id="relatedtopics">
-<paragraph xml-lang="en-US" id="par_id3149875" role="paragraph" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
-</section>
-</body>
+ <paragraph xml-lang="en-US" id="par_id0509200916345516" role="paragraph" l10n="NEW">Wildcards or placeholders can be used to search for some unspecified or even invisible characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Edit - Find &amp; Replace</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2142399" role="listitem" l10n="NEW">Click <item type="menuitem">More Options</item> to expand the dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="41">Select the <item type="menuitem">Regular expressions</item> check box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Search for</item> box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="51">Click <item type="menuitem">Find</item> or <item type="menuitem">Find All</item>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153401" role="heading" level="2" l10n="U"
+ oldref="52">Regular Expression Examples</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" oldref="44">The wildcard for a single character is a period (.).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149609" role="listitem" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149854" role="listitem" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0509200916345545" role="listitem" l10n="NEW">The wildcard for a tab character is \t.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153414" role="note" l10n="CHG" oldref="49">A search using a regular expression will work only within one paragraph. To search using a regular expression in more than one paragraph, do a separate search in each paragraph.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149875" role="paragraph" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
+ </section>
+ </body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/tablemode.xhp b/helpcontent2/source/text/swriter/guide/tablemode.xhp
index 389dd53ce1..a321d0213e 100755
--- a/helpcontent2/source/text/swriter/guide/tablemode.xhp
+++ b/helpcontent2/source/text/swriter/guide/tablemode.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -42,33 +42,27 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155856"><bookmark_value>table mode selection</bookmark_value>
- <bookmark_value>proportional distribution of tables</bookmark_value>
- <bookmark_value>relative distribution of table cells</bookmark_value>
- <bookmark_value>tables; adapting the width by keyboard</bookmark_value>
- <bookmark_value>cells; adapting the width by keyboard</bookmark_value>
- <bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
- <bookmark_value>behavior of rows/columns</bookmark_value>
+<bookmark_value>proportional distribution of tables</bookmark_value>
+<bookmark_value>relative distribution of table cells</bookmark_value>
+<bookmark_value>tables; adapting the width by keyboard</bookmark_value>
+<bookmark_value>cells; adapting the width by keyboard</bookmark_value>
+<bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
+<bookmark_value>behavior of rows/columns</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG"
- oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link>
+<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149835" role="paragraph" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <item type="menuitem">Behavior of rows/columns</item> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with fixed row and column dimensions if space permits.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item>
- <emph/>options for tables in text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item>
- <emph/>Bar. There are three display modes for tables:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="CHG" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Table</item>. There are three display modes for tables:</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9">
-<emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9"><emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10">
-<emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10"><emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11">
-<emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11"><emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/template_default.xhp b/helpcontent2/source/text/swriter/guide/template_default.xhp
index 1d881647ae..430bac38db 100755
--- a/helpcontent2/source/text/swriter/guide/template_default.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_default.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -62,14 +62,13 @@
<paragraph xml-lang="en-US" id="par_id3149283" role="listitem" l10n="U" oldref="106">In the <emph>New Template</emph> box, type a name for the new template.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153409" role="listitem" l10n="CHG" oldref="114">In the <item type="menuitem">Categories</item>
- <emph/>list, select "My Templates", and then click <item type="menuitem">OK</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153409" role="listitem" l10n="CHG" oldref="114">In the <item type="menuitem">Categories</item> list, select "My Templates", and then click <item type="menuitem">OK</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="107">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">In the category list, double-click the "My Templates" folder.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">In the <item type="menuitem">Templates</item> list, double-click the "My Templates" folder.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="105">Right-click the template that you created, and choose <emph>Set as Default Template</emph>.</paragraph>
@@ -85,8 +84,7 @@
<paragraph xml-lang="en-US" id="par_id3145102" role="listitem" l10n="U" oldref="110">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="111">Right-click a folder in the category list, choose<emph/>
- <item type="menuitem">Reset Default Template - Text Document</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="111">Right-click a text file in any of the two lists, choose <item type="menuitem">Reset Default Template - Text Document</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3156245" role="listitem" l10n="U" oldref="112">Click <emph>Close</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
index 61b47f8df9..76bb788de3 100644
--- a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,41 +48,41 @@
<bookmark_value>weekdays; automatically completing</bookmark_value>
<bookmark_value>months; automatically completing</bookmark_value>
</bookmark><comment>mw copied two entries from word_completion.xhp and created three new entries</comment>
-<paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link>
+<paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link>
</variable></paragraph><comment>MW created this guide by splitting word_completion.xhp</comment>
-<paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behavior. If you want, you can also save the current list of collected words so that it can be used in the next session. </paragraph>
- <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <item type="menuitem">Tools – AutoCorrect Options - Word Completion</item> and select any of the following options: </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW"> To Insert an Additional Space Character </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW"> Select <emph>Append space</emph>. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW"> The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW"> To Define the Accept Key </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW"> Choose the key to accept the suggested word using the <emph>Accept with</emph> list box. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW"> To Select the Minimum Number of Characters </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW"> Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW"> To Select the Scope of Collected Words </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="NEW"> Select <emph>When closing a document, save the list for later use in other documents</emph>. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW"> Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="NEW"> If you do not select the checkbox, the list is only valid as long as the current document is open. </paragraph>
+<paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behavior. If you want, you can also save the current list of collected words so that it can be used in the next session.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <item type="menuitem">Tools – AutoCorrect Options - Word Completion</item> and select any of the following options:</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW">To Insert an Additional Space Character</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW">Select <emph>Append space</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW">The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW">To Define the Accept Key</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW">Choose the key to accept the suggested word using the <emph>Accept with</emph> list box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW">To Select the Minimum Number of Characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW">Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW">To Select the Scope of Collected Words</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="CHG">Disable the option <emph>When closing a document, remove the words collected from it from the list</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW">Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="CHG">If you enable the checkbox, the list is only valid as long as the current document is open.</paragraph>
<paragraph xml-lang="en-US" id="par_id2634968" role="paragraph" l10n="NEW">If you want the word list to exist longer than the current %PRODUCTNAME session, save it as a document, as described in the following section.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW"> To Use the Word List for Further Sessions</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW"> If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW"> Use the word list to always start with a defined set of technical terms for the word completion feature. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW">To Use the Word List for Further Sessions</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW">Use the word list to always start with a defined set of technical terms for the word completion feature.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10BA7" role="listitem" l10n="NEW"> Open the text document that contains the terms that you want to use for word completion. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BAB" role="listitem" l10n="NEW"> The word completion feature collects the words. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BA7" role="listitem" l10n="NEW">Open the text document that contains the terms that you want to use for word completion.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BAB" role="listitem" l10n="NEW">The word completion feature collects the words.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW"> Select all or some of the words in the list. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW">Select all or some of the words in the list.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW"> Use <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BC6" role="listitem" l10n="NEW"> Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW">Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BC6" role="listitem" l10n="NEW">Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion </link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion</link></paragraph>
<paragraph xml-lang="en-US" id="par_id5458845" role="paragraph" l10n="NEW"><link href="text/swriter/guide/word_completion.xhp">Using Word Completion</link></paragraph>
</section>
</body>