summaryrefslogtreecommitdiff
path: root/helpcontent2
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2009-10-16 08:59:46 +0000
committerUwe Fischer <ufi@openoffice.org>2009-10-16 08:59:46 +0000
commitf93153f617a109f1249802a49ce747b64faaeab4 (patch)
tree3af5a25aa24bbaefd895db2fcab112d7507ab2f4 /helpcontent2
parent62b032f16a72f9c8f24f4ad81324839464e3337d (diff)
Zwischenstand
Diffstat (limited to 'helpcontent2')
-rw-r--r--helpcontent2/source/text/scalc/01/04060106.xhp8
-rw-r--r--helpcontent2/source/text/scalc/01/04060109.xhp1
-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
-rw-r--r--helpcontent2/source/text/scalc/guide/numbers_text.xhp13
-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/shared/00/00000021.xhp6
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05340100.xhp63
-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/scripting.xhp390
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010600.xhp125
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp361
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp127
-rwxr-xr-xhelpcontent2/source/text/smath/01/03090000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04090200.xhp104
-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
26 files changed, 984 insertions, 1054 deletions
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 0774564c79..d8bcbea6f3 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -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/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/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/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/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index a4b810299a..cb699afc17 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -226,7 +226,7 @@
<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">to be announced</paragraph>
+ <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>
@@ -234,10 +234,10 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent" l10n="NEW">ODF 1.2 enhanced</paragraph>
+ <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">to be announced</paragraph>
+ <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>
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/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 3c61a0231a..f8045f39ba 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -49,8 +49,8 @@
<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>
+ <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 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>
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/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/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/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/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/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/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>