summaryrefslogtreecommitdiff
path: root/helpcontent2
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2010-03-05 09:47:33 +0100
committerUwe Fischer <ufi@openoffice.org>2010-03-05 09:47:33 +0100
commitfb403a47daba6f4a3e9540a3bce180ec1970b0d4 (patch)
tree63e58a20ac8246b4e3486a6c60ddf2ebc57547a2 /helpcontent2
parentbc7d1a933d988c07ea20cb770c22e5f629611dff (diff)
hcshared25: intermediate commit
Diffstat (limited to 'helpcontent2')
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03050500.xhp18
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03080502.xhp8
-rw-r--r--helpcontent2/source/text/scalc/01/func_eomonth.xhp8
-rw-r--r--helpcontent2/source/text/scalc/01/func_minute.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/04/01020000.xhp22
-rw-r--r--helpcontent2/source/text/schart/01/three_d_view.xhp29
-rwxr-xr-xhelpcontent2/source/text/sdraw/04/01020000.xhp12
-rw-r--r--helpcontent2/source/text/sdraw/guide/join_objects3d.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/05030600.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/05040200.xhp72
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200200.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/06140000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/06140100.xhp22
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140101.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140102.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/06140200.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140400.xhp19
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140402.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/01/mediaplayer.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01130000.xhp9
-rw-r--r--helpcontent2/source/text/shared/autopi/01150000.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170000.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp34
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fontwork.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp3
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp5
-rw-r--r--helpcontent2/source/text/simpress/02/10090000.xhp10
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/3d_create.xhp31
-rw-r--r--helpcontent2/source/text/swriter/01/02110100.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/04090004.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120213.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120221.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120227.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030800.xhp13
-rw-r--r--helpcontent2/source/text/swriter/01/05040600.xhp11
-rw-r--r--helpcontent2/source/text/swriter/01/06090000.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/main0210.xhp6
37 files changed, 279 insertions, 224 deletions
diff --git a/helpcontent2/source/text/sbasic/shared/03050500.xhp b/helpcontent2/source/text/sbasic/shared/03050500.xhp
index 8f3e819c92..ea569f24d2 100755
--- a/helpcontent2/source/text/sbasic/shared/03050500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsbasicshared03050500xml" indexer="include" status="PUBLISH">
@@ -51,14 +51,14 @@
<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="2">Enables an error-handling routine after an error occurs, or resumes program execution.</paragraph>
</section>
<paragraph role="heading" id="hd_id3151212" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="4">On {Error GoTo Labelname | GoTo 0 | Resume Next}</paragraph>
+<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="4">On {[Local] Error GoTo Labelname | GoTo 0 | Resume Next}</paragraph>
<paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="5">Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="7">
-<emph>GoTo Labelname:</emph> If an error occurs, enables the error-handling routine that starts at the line "Labelname".</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Resume Next:</emph> If an error occurs, program execution continues with the statement that follows the statement in which the error occurred.</paragraph>
-<paragraph role="paragraph" id="par_id3149482" xml-lang="en-US" l10n="U" oldref="9">
-<emph>GoTo 0: </emph>Disables the error handler in the current procedure.</paragraph>
+<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="7"><emph>GoTo Labelname:</emph> If an error occurs, enables the error-handling routine that starts at the line "Labelname".</paragraph>
+<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="8"><emph>Resume Next:</emph> If an error occurs, program execution continues with the statement that follows the statement in which the error occurred.</paragraph>
+<paragraph role="paragraph" id="par_id3149482" xml-lang="en-US" l10n="U" oldref="9"><emph>GoTo 0:</emph> Disables the error handler in the current procedure.</paragraph>
+
+<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="9"><emph>Local:</emph> "On error" is global in scope, and remains active until canceled by another "On error" statement. "On Local error" is local to the routine which invokes it. Local error handling overrides any previous global setting. When the invoking routine exits, the local error handling is canceled automatically, and any previous global setting is restored.</paragraph>
+
<paragraph role="paragraph" id="par_id3148619" xml-lang="en-US" l10n="U" oldref="10">The On Error GoTo statement is used to react to errors that occur in a macro. The statement must be inserted at the start of a procedure (in a local error-handling routine) or at the start of a module.</paragraph>
<paragraph role="heading" id="hd_id3146985" xml-lang="en-US" level="2" l10n="U" oldref="11">Example:</paragraph>
<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="42">Sub ExampleReset</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03080502.xhp b/helpcontent2/source/text/sbasic/shared/03080502.xhp
index 4bb43398a9..c654999833 100755
--- a/helpcontent2/source/text/sbasic/shared/03080502.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080502.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -60,9 +60,9 @@
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:</paragraph>
<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="10">sub ExampleINT</paragraph>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="CHG" oldref="11">Print Int(3.99) REM returns the value 3.0</paragraph>
-<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="CHG" oldref="12">Print Int(0) REM returns the value 0.0</paragraph>
-<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="CHG" oldref="13">Print Int(-3.14159) REM returns the value -4.0</paragraph>
+<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="CHG" oldref="11">Print Int(3.99) REM returns the value 3</paragraph>
+<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="CHG" oldref="12">Print Int(0) REM returns the value 0</paragraph>
+<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="CHG" oldref="13">Print Int(-3.14159) REM returns the value -4</paragraph>
<paragraph role="paragraph" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="14">end sub</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/func_eomonth.xhp b/helpcontent2/source/text/scalc/01/func_eomonth.xhp
index bcbb83d362..b0f81f7d2c 100644
--- a/helpcontent2/source/text/scalc/01/func_eomonth.xhp
+++ b/helpcontent2/source/text/scalc/01/func_eomonth.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,9 @@
<emph>Months</emph> is the number of months before (negative) or after (positive) the start date.</paragraph>
<paragraph role="heading" id="hd_id3156335" xml-lang="en-US" level="3" l10n="U" oldref="237">Example</paragraph>
<paragraph role="paragraph" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="238">What is the last day of the month that falls 6 months after September 14 2001?</paragraph>
-<paragraph role="paragraph" id="par_id3156143" xml-lang="en-US" l10n="U" oldref="239">
-<item type="input">=EOMONTH(9.14.2001;6)</item> returns 3.31.2002.</paragraph>
+
+<paragraph role="paragraph" id="par_id3156143" xml-lang="en-US" l10n="U" oldref="239"><item type="input">=EOMONTH(DATE(2001;9;14);6)</item> returns the serial number 37346. Formatted as a date, this is 2002-03-31.</paragraph>
+<paragraph role="paragraph" id="par_id3156144" xml-lang="en-US" l10n="U" oldref="239"><item type="input">=EOMONTH("2001-09-14";6)</item> works as well. If the date is given as string, it has to be in ISO format.</paragraph>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/func_minute.xhp b/helpcontent2/source/text/scalc/01/func_minute.xhp
index ba3957343d..4d0bdaceb2 100644
--- a/helpcontent2/source/text/scalc/01/func_minute.xhp
+++ b/helpcontent2/source/text/scalc/01/func_minute.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MINUTE" id="bm_id3148616" localize="false"/><paragraph role="heading" id="hd_id3149803" xml-lang="en-US" level="2" l10n="U" oldref="66"><variable id="minute"><link href="text/scalc/01/func_minute.xhp">MINUTE</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_FUNC_MINUTE">Calculates the minute for an internal time value</ahelp> The minute is returned as a number between 0 and 59.</paragraph>
+<paragraph role="paragraph" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_FUNC_MINUTE">Calculates the minute for an internal time value.</ahelp> The minute is returned as a number between 0 and 59.</paragraph>
<paragraph role="heading" id="hd_id3154343" xml-lang="en-US" level="3" l10n="U" oldref="68">Syntax</paragraph>
<paragraph role="code" id="par_id3148660" xml-lang="en-US" l10n="U" oldref="69">MINUTE(Number)</paragraph>
<paragraph role="paragraph" id="par_id3154611" xml-lang="en-US" l10n="U" oldref="70">
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 5babb060de..934bef74de 100755
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,11 +51,11 @@
</variable></paragraph>
<embed href="text/shared/00/00000099.xhp#keys"/>
</section>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="3">To fill a selected cell range with the formula that you entered on the <emph>Input line</emph>, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter. Hold down <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="3">To fill a selected cell range with the formula that you entered on the <emph>Input line</emph>, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter. Hold down <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter+Shift to apply the cell format of the input cell to the entire cell range.</paragraph>
<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="U" oldref="84">To create a matrix in which all the cells contain the same information as what you entered on the <emph>Input line</emph>, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. You cannot edit the components of the matrix.</paragraph>
-<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="4">To select multiple cells in different areas of a sheet, hold down <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="4">To select multiple cells in different areas of a sheet, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag in the different areas.</paragraph>
<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="127">To select multiple sheets in a spreadsheet, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then click the name tabs at the lower edge of the workspace. To select only one sheet in a selection, hold down Shift, and then click the name tab of the sheet.</paragraph>
<paragraph role="paragraph" id="par_id3166432" xml-lang="en-US" l10n="U" oldref="129">To insert a manual line break in a cell, click in the cell, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
@@ -164,7 +164,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146885" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3146885" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Page Up</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -173,7 +173,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149013" xml-lang="en-US" l10n="U" oldref="115"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3149013" xml-lang="en-US" l10n="U" oldref="115"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Page Down</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -335,7 +335,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5</paragraph>
+<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27">Shift+F7</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153179" xml-lang="en-US" l10n="U" oldref="28">Traces precedents.</paragraph>
@@ -447,7 +447,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151264" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3151264" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -456,7 +456,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151297" xml-lang="en-US" l10n="U" oldref="119"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3151297" xml-lang="en-US" l10n="U" oldref="119"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -465,7 +465,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155997" xml-lang="en-US" l10n="U" oldref="121"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3155997" xml-lang="en-US" l10n="U" oldref="121"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Right Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -474,7 +474,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154046" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="tablecontent" id="hd_id3154046" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> + Left Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/schart/01/three_d_view.xhp b/helpcontent2/source/text/schart/01/three_d_view.xhp
index fa0a69850a..64f4098ada 100644
--- a/helpcontent2/source/text/schart/01/three_d_view.xhp
+++ b/helpcontent2/source/text/schart/01/three_d_view.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textschart01three_d_viewxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">3D View </title>
@@ -54,7 +54,7 @@
</section>
<embed href="text/shared/00/00000001.xhp#ShiftF1"/>
<paragraph xml-lang="en-US" id="par_id6942045" role="paragraph" l10n="NEW">The chart preview responds to the new settings that you enter in the dialog. </paragraph>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">When you leave the dialog with OK, the settings are applied permanently. </paragraph>
</listitem>
@@ -64,7 +64,7 @@
</list>
<paragraph xml-lang="en-US" id="par_id8081911" role="paragraph" l10n="NEW">For a 3D chart you can choose <item type="menuitem">Format - 3D View</item> to set perspective, appearance and illumination.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2924283" role="heading" level="2" l10n="NEW">Perspective</paragraph>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id5781731" role="paragraph" l10n="NEW">Enter the values for rotation of the chart on the three axes and for a perspective view.</paragraph>
</listitem>
@@ -90,13 +90,13 @@
<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE" id="bm_id3808404" localize="false"/>
<paragraph xml-lang="en-US" id="par_id6070436" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Mark the Perspective box to view the chart as through a camera lens. Use the spin button to set the percentage. With a high percentage nearer objects look bigger than more distant objects.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id7564012" role="heading" level="2" l10n="NEW">Appearance</paragraph>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id1186254" role="paragraph" l10n="NEW">Select a scheme from the list box.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id7432477" role="paragraph" l10n="NEW">By selecting a scheme, the check boxes and the light sources are set accordingly.</paragraph>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id7141026" role="paragraph" l10n="NEW">If you mark or unmark a combination of check boxes that is not given by the Realistic or Simple scheme, you create a Custom scheme.</paragraph>
</listitem>
@@ -106,7 +106,7 @@
<paragraph xml-lang="en-US" id="par_id5901058" role="paragraph" l10n="NEW">The Gouraud method applies gradients for a smoother, more realistic look.<comment>Regina: Need an external article on web, which describes the 3D engine in detail. Till that, the user should get some information on Gouraud and Flat.</comment></paragraph>
</listitem>
</list>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW">Mark <emph>Object Borders</emph> to draw lines along the edges.</paragraph>
</listitem>
@@ -124,7 +124,7 @@
<paragraph xml-lang="en-US" id="par_id9607226" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Edges are rounded by 5%.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id1939451" role="heading" level="2" l10n="NEW">Illumination</paragraph>
<paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW">Set the light sources for the 3D view.</paragraph>
- <list type="ordered">
+ <list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id6531266" role="paragraph" l10n="NEW">Click any of the eight buttons to switch a directed light source on or off.</paragraph>
<paragraph xml-lang="en-US" id="par_id6173894" role="paragraph" l10n="NEW">By default, the second light source is switched on. It is the first of seven "normal", uniform light sources. The light source number one projects a specular light with highlights.</paragraph>
@@ -142,11 +142,14 @@
<paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Use the Ambient light list box to define the ambient light which shines with a uniform intensity from all directions.</paragraph>
</listitem>
</list><comment>preview right bar</comment>
-<!-- removed HID 34145 -->
+<!-- removed HID 34145 33796 -->
+
<paragraph xml-lang="en-US" id="par_id2423780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the right slider to set the vertical height and direction of the selected light source.</ahelp></paragraph><comment>preview bottom bar</comment>
-<!-- removed HID 34144 -->
+<!-- removed HID 34144 33794 -->
+
<paragraph xml-lang="en-US" id="par_id2569658" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the bottom slider to set the horizontal position and direction of the selected light source.</ahelp></paragraph><comment>preview right bottom button</comment>
-<!-- removed HID 34146 -->
+<!-- removed HID 34146 33795 -->
+
<paragraph xml-lang="en-US" id="par_id6394238" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to switch between an illumination model of a sphere or a cube.</ahelp></paragraph><comment>Light source</comment>
<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1" id="bm_id2334665" localize="false"/>
<paragraph xml-lang="en-US" id="par_id533768" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to enable or disable the specular light source with highlights.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
index c5bfee3520..d90382c5f5 100755
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsdraw0401020000xml" indexer="include">
<title xml-lang="en-US" id="tit">Shortcut Keys for Drawings</title>
@@ -313,7 +313,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AF2" role="tablecontent" l10n="NEW">Switch to next layer</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Switch to previous layer</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -322,7 +322,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Switch to previous layer</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AF2" role="tablecontent" l10n="NEW">Switch to next layer</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp b/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
index 2ce9240ecb..d4cdd73a9a 100644
--- a/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
+++ b/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,17 +30,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsdrawguidejoin_objects3dxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Assembling 3D Objects</title>
<filename>/text/sdraw/guide/join_objects3d.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-09-05T13:27:03">FPE: Deleted screenshot.</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154014"><bookmark_value>3D objects; assembling</bookmark_value>
@@ -51,7 +47,7 @@
<paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="E" oldref="37" localize="false"/>
<paragraph role="heading" id="hd_id3156442" xml-lang="en-US" level="1" l10n="U" oldref="29"><variable id="join_objects3d"><link href="text/sdraw/guide/join_objects3d.xhp" name="Assembling 3D Objects">Assembling 3D Objects</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="30">You can combine two or more 3D objects into a single object.</paragraph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="30">3D objects that each form a 3D scene can be combined into a single 3D scene.</paragraph>
<paragraph role="heading" id="hd_id3150042" xml-lang="en-US" level="3" l10n="U" oldref="41">To combine 3D objects:</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/01/05030600.xhp b/helpcontent2/source/text/shared/01/05030600.xhp
index 01ce3305d6..1219a7b00c 100644
--- a/helpcontent2/source/text/shared/01/05030600.xhp
+++ b/helpcontent2/source/text/shared/01/05030600.xhp
@@ -67,7 +67,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_BGDCOLORSET" id="bm_id3159414" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="3" l10n="U" oldref="8">Color Background</paragraph>
<paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
- <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+
<embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
<embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 82982c3e3b..e63065b1f9 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Page</title>
@@ -100,6 +100,37 @@
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
<paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="13">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Page Layout</defaultinline></switchinline></paragraph>
@@ -138,38 +169,9 @@
<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
<paragraph role="heading" id="hd_id3083281" xml-lang="en-US" level="3" l10n="CHG" oldref="27">Format</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 4a1fd63aa7..f6bf3d51f0 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105200200xml" indexer="include">
<title id="tit" xml-lang="en-US">Line Styles</title>
@@ -76,7 +76,7 @@
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD">Creates a new line style using the current settings.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_NAME:EDT_STRING" id="bm_id3145313" localize="false"/>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="19">Name</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING">Enter a name for the new line style.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="">Enter a name.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY" id="bm_id3147011" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
<paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140000.xhp b/helpcontent2/source/text/shared/01/06140000.xhp
index e471c3fea3..75303d6776 100644
--- a/helpcontent2/source/text/shared/01/06140000.xhp
+++ b/helpcontent2/source/text/shared/01/06140000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Configuration</title>
+<title id="tit" xml-lang="en-US">Customize</title>
<filename>/text/shared/01/06140000.xhp</filename>
</topic>
</meta>
diff --git a/helpcontent2/source/text/shared/01/06140100.xhp b/helpcontent2/source/text/shared/01/06140100.xhp
index ce5d696e08..d22b6e87bc 100644
--- a/helpcontent2/source/text/shared/01/06140100.xhp
+++ b/helpcontent2/source/text/shared/01/06140100.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -90,11 +90,15 @@
<paragraph role="heading" id="par_idN106F9" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN106FD" xml-lang="en-US" l10n="NEW">Deletes the selected menu or menu entry.</paragraph>
<paragraph role="note" id="par_idN10910" xml-lang="en-US" l10n="NEW">You can only delete custom menus and custom menu entries.</paragraph>
-<!-- removed HID HID_MENUCONFIG_LISTBOX --><paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
+<!-- removed HID HID_MENUCONFIG_LISTBOX -->
+<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
<paragraph role="paragraph" id="par_id3150999" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_MENUCONFIG_LISTBOX">Displays a list of the available menu commands for the selected menu in the current application or document.</ahelp></paragraph>
<section id="updown">
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="39">To rearrange the order of menu entries, select an entry, and then click the up or down arrow button.</paragraph>
-<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP --><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP" id="bm_id16574620" localize="false"/>
+
+<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
<paragraph role="paragraph" id="par_id3153585" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP">Moves the selected item up one position.</ahelp></paragraph>
<table id="tbl_id3154897">
<tablerow>
@@ -108,7 +112,9 @@
</tablecell>
</tablerow>
</table>
-<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN --><paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN" id="bm_id16574640" localize="false"/>
+<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN">Moves the selected item down one position.</ahelp></paragraph>
<table id="tbl_id3149795">
<tablerow>
@@ -124,7 +130,13 @@
</table>
</section>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
-<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid="705499974">Opens the Add Commands dialog. Select the command that you want to add to the menu, and then click <emph>Add</emph>. You can also drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_CATEGORIES" id="bm_id1657465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_COMMANDS" id="bm_id1657467" localize="false"/>
+<paragraph role="paragraph" id="par_idN40723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+
<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
<paragraph role="paragraph" id="par_idN107FD" xml-lang="en-US" l10n="NEW"><ahelp hid="705507646">Opens a menu that contains additional commands.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10800" xml-lang="en-US" level="3" l10n="NEW">Add Submenu</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140101.xhp b/helpcontent2/source/text/shared/01/06140101.xhp
index a1481027e4..4a5f52c899 100755
--- a/helpcontent2/source/text/shared/01/06140101.xhp
+++ b/helpcontent2/source/text/shared/01/06140101.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,25 +30,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140101xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">New Menu</title>
<filename>/text/shared/01/06140101.xhp</filename>
</topic>
-<history>
-<created date="2004-07-12T14:32:22">UFI: New Menu dialog of Customize dialog</created>
-<lastedited date="2004-09-21T09:40:43">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">New Menu</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#menuenew"/>
</section>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME" id="bm_id1657461" localize="false"/>
<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu name</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</ahelp></paragraph>
+
<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
<embed href="text/shared/01/06140100.xhp#updown"/>
diff --git a/helpcontent2/source/text/shared/01/06140102.xhp b/helpcontent2/source/text/shared/01/06140102.xhp
index 491f4d2bd6..d2137cbfb3 100755
--- a/helpcontent2/source/text/shared/01/06140102.xhp
+++ b/helpcontent2/source/text/shared/01/06140102.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,25 +30,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140102xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Move Menu</title>
<filename>/text/shared/01/06140102.xhp</filename>
</topic>
-<history>
-<created date="2004-07-12T14:47:43">UFI: Move Menu dialog from Customize dialog</created>
-<lastedited date="2004-09-21T09:40:29">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">Move Menu</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#menuemove"/>
</section>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CONFIG_MENU_LISTBOX" id="bm_id16574660" localize="false"/>
+
<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the selected menu entry up one position or down one position in the menu when you click an arrow button.</ahelp></paragraph>
<embed href="text/shared/01/06140100.xhp#updown"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 9eb893fb84..0b92da87ee 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0106140200xml" indexer="include">
<title id="tit" xml-lang="en-US">Keyboard</title>
@@ -59,14 +59,16 @@
<paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="29">Avoid assigning shortcut keys that are currently used by your operating system.</paragraph>
</section>
<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" id="bm_id393425" localize="false"/>
<paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE">Displays shortcut keys that are common to all $[officename] applications.</ahelp></paragraph>
<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE -->
-<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
-</caseinline><caseinline select="CALC">Calc
-</caseinline><caseinline select="IMPRESS">Impress
-</caseinline><caseinline select="DRAW">Draw
-</caseinline><caseinline select="MATH">Math
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" id="bm_id315425" localize="false"/>
+<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
+</caseinline><caseinline select="CALC">Calc
+</caseinline><caseinline select="IMPRESS">Impress
+</caseinline><caseinline select="DRAW">Draw
+</caseinline><caseinline select="MATH">Math
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE">Displays shortcut keys for the current $[officename] application.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/>
@@ -81,20 +83,26 @@
<paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
<paragraph role="paragraph" id="par_id3159148" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CONFIGFUNCTION_ACC_LISTBOX">Select a function that you want to assign a shortcut key to, click a key combination in the <emph>Shortcut keys</emph> list, and then click <emph>Modify</emph>. If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list.</ahelp></paragraph>
<!-- removed HID SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY -->
+
<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY">Displays the shortcut keys that are assigned to the selected function.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" id="bm_id31593425" localize="false"/>
<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE">Assigns the key combination selected in the <emph>Shortcut keys</emph> list to the command selected in the <emph>Function </emph>list.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" id="bm_id31593424" localize="false"/>
<paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" id="bm_id31593423" localize="false"/>
<paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD">Replaces the shortcut key configuration with one that was previously saved.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" id="bm_id31593422" localize="false"/>
<paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
<paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
<!-- removed HID sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" id="bm_id31593421" localize="false"/>
<paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
<section id="relatedtopics">
<embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
diff --git a/helpcontent2/source/text/shared/01/06140400.xhp b/helpcontent2/source/text/shared/01/06140400.xhp
index 110971a23a..b7d8dcc573 100755
--- a/helpcontent2/source/text/shared/01/06140400.xhp
+++ b/helpcontent2/source/text/shared/01/06140400.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,9 +53,15 @@
</section>
<paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW">Select the toolbar you want to edit.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
-<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the <link href="text/shared/01/06140101.xhp">Name</link> dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/><paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
+
+<paragraph role="paragraph" id="par_idN106011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name of a new toolbar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the location of the new toolbar.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/>
+<paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Toolbar button opens a submenu</ahelp> with the following commands:</paragraph>
<paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
<paragraph role="paragraph" id="par_idN10624" xml-lang="en-US" l10n="NEW">Opens the <emph>Name</emph> dialog, where you enter a new name for the selected toolbar.</paragraph>
@@ -73,8 +79,9 @@
<paragraph role="paragraph" id="par_idN1065E" xml-lang="en-US" l10n="NEW">Shows icons and text.</paragraph>
<paragraph role="heading" id="par_idN10661" xml-lang="en-US" level="2" l10n="NEW">Commands</paragraph>
<paragraph role="paragraph" id="par_idN10664" xml-lang="en-US" l10n="NEW">Displays a list of commands for the selected toolbar of the current application or document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/><paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/>
+<paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR_ITEM" id="bm_id3650929" localize="false"/><paragraph role="heading" id="par_idN10675" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Modify button opens a submenu</ahelp> with the following commands:</paragraph>
<paragraph role="heading" id="par_idN1067B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140402.xhp b/helpcontent2/source/text/shared/01/06140402.xhp
index b348c2c52c..c18cb0a4c7 100755
--- a/helpcontent2/source/text/shared/01/06140402.xhp
+++ b/helpcontent2/source/text/shared/01/06140402.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,13 @@
</meta>
<body>
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW">Change Icon</paragraph>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="NEW">Buttons</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="CHG">Icons</paragraph>
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">Displays the available icons in %PRODUCTNAME. To replace the icon that you selected in the <link href="text/shared/01/06140400.xhp">Customize</link> dialog, click an icon, then click the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="note" id="par_idN10575" xml-lang="en-US" l10n="NEW">You can only import icons that are in the PNG file format and that are 16x16 or 26x26 pixels in size.</paragraph>
-<!-- removed HID svx_PushButton_MD_ICONSELECTOR_BTN_REMOVE --><comment>just guessing the help id</comment><paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE" id="bm_id1383799" localize="false"/>
+<paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 04c1e0b814..46a7b93392 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Media Player</title>
@@ -48,7 +48,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10550" role="heading" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#mediaplayer"/>
@@ -78,7 +78,7 @@
<paragraph xml-lang="en-US" id="par_idN105A8" role="paragraph" l10n="NEW">Turns sound off and on.</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Volume slider</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="NEW">Adjusts the volume.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="NEW">Zoom</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="CHG">View</paragraph>
<paragraph xml-lang="en-US" id="par_idN105B6" role="paragraph" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
<paragraph xml-lang="en-US" id="par_idN105B9" role="heading" level="2" l10n="NEW">Position slider</paragraph>
<paragraph xml-lang="en-US" id="par_idN105BD" role="paragraph" l10n="NEW">Moves to a different position in the file.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 12227de0d4..76f8d0d9aa 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedautopi01130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Document Converter</title>
@@ -43,6 +43,7 @@
<body><comment>mw deleted all index entries because of guide import_ms.xhp</comment>
<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDHELP" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_DIALOG" id="bm_id3150478" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/macro:///ImportWizard.Main.Main" id="bm_id4087038" localize="false"/>
<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="9">Document Converter</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="ms"><ahelp hid=".">Copies and converts documents into the OpenDocument XML format used by $[officename].</ahelp>
diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp
index 4e180daa23..e2735e910c 100644
--- a/helpcontent2/source/text/shared/autopi/01150000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01150000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01150000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Euro Converter Wizard</title>
@@ -50,7 +49,9 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_EURO_CONVERTER" id="bm_id7067290" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id3150476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/><paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGCONVERT_DIALOG" id="bm_id3150477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/>
+<paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="2"><variable id="eurokonv"><ahelp hid=".uno:EuroConverter">Converts the currency amounts found in $[officename] Calc documents and in fields and tables of $[officename] Writer documents into euros.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="54">Only closed files are converted. It is possible, however, to use the Euro Converter in an open $[officename] Calc document. In this case, a separate dialog opens. This dialog is described <link href="text/shared/autopi/01150000.xhp" name="at the end of this section">at the end of this section</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 7c28be8667..f1543fdf97 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedautopi01170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Address Data Source</title>
@@ -44,6 +44,7 @@
<section id="adressdatenquelle">
<bookmark xml-lang="en-US" branch="hid/extensions:TabPage:RID_PAGE_SELECTABTYPE" id="bm_id2237617" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10934" id="bm_id3581347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT" id="bm_id3581348" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/>
<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".">This wizard registers an existing address book as a data source in $[officename].</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 5611fbcb06..7527178451 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,11 +47,11 @@
<bookmark_value>collaboration</bookmark_value>
</bookmark>
<comment>MW changed the index entries to one level entries.</comment>
- <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
+ <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph>
<comment>Tools - Share Document menu</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
<paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
<comment>Share Document dialog - Share this spreadsheet with other users</comment>
@@ -86,23 +86,23 @@
</listitem>
</list>
<comment>Resolve Conflicts dialog</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
<paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph>
<comment>Keep Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
<paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph>
<comment>Keep Other</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph>
<comment>Keep All Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
<paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph>
<comment>Keep All Others</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
<paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph>
@@ -123,6 +123,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph>
+
<paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph>
<paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph>
<paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph>
@@ -140,10 +141,23 @@
<paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph>
</listitem>
</list>
+
+ <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph>
+
<section id="relatedtopics">
-
+
<paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index 8dc43440c8..1dc6550687 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -70,10 +70,10 @@
<listitem>
<bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
-<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index 0618ec04d6..afca74c3b0 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -57,8 +57,9 @@
<bookmark_value>converters; XML</bookmark_value>
<bookmark_value>Document Converter Wizard</bookmark_value>
<bookmark_value>wizards; document converter</bookmark_value>
+ <bookmark_value>converters; document converter</bookmark_value>
<bookmark_value>files, see also documents</bookmark_value>
-</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment>
<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index 24108d2ac2..2e626a0250 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01030500xml" indexer="include" status="PUBLISH">
@@ -47,6 +47,7 @@
<body>
<section id="html">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>$[officename] Basic scripts in HTML documents</bookmark_value>
+<bookmark_value>HTML;compatibility settings</bookmark_value>
</bookmark>
<!-- removed HID OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT -->
<paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030500.xhp" name="HTML compatibility">HTML compatibility</link></paragraph>
diff --git a/helpcontent2/source/text/simpress/02/10090000.xhp b/helpcontent2/source/text/simpress/02/10090000.xhp
index bc012c6d98..e57521a780 100644
--- a/helpcontent2/source/text/simpress/02/10090000.xhp
+++ b/helpcontent2/source/text/simpress/02/10090000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,17 +30,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0210090000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">3D Objects</title>
<filename>/text/simpress/02/10090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-19T12:17:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150208"><bookmark_value>toolbars;3D objects</bookmark_value>
@@ -61,7 +57,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_DRAWTBX_3D_OBJECTS" id="bm_id8169159" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Objects3DToolbox" id="bm_id3152994" localize="false"/>
<paragraph role="heading" id="hd_id3159238" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/10090000.xhp" name="3D Objects">3D Objects</link></paragraph>
-<paragraph role="paragraph" id="par_id3152900" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Objects3DToolbox">Open the <emph>3D Objects</emph> toolbar, where you can add 3D shapes to the current slide.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152900" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Objects3DToolbox">Opens the <emph>3D Objects</emph> toolbar. The objects are three dimensional, with depth, illumination, and reflection.</ahelp> Each inserted object initially forms a 3D scene. You can press F3 to enter the scene. For these 3D objects, you can open the 3D Effects dialog to edit the properties.</paragraph>
</section>
<section id="syobjekte">
<table id="tbl_id3153248">
diff --git a/helpcontent2/source/text/simpress/guide/3d_create.xhp b/helpcontent2/source/text/simpress/guide/3d_create.xhp
index a04219d019..5866dd773e 100755
--- a/helpcontent2/source/text/simpress/guide/3d_create.xhp
+++ b/helpcontent2/source/text/simpress/guide/3d_create.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,24 +30,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpressguide3d_createxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Converting 2D Objects to Curves, Polygons, and 3D Objects</title>
<filename>/text/simpress/guide/3d_create.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-07T09:41:50">FPE: Deleted screenshots</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150207"><bookmark_value>3D rotation objects; generating</bookmark_value>
<bookmark_value>3D objects; generating</bookmark_value>
+<bookmark_value>3D scenes; creating</bookmark_value>
<bookmark_value>converting; to curves, polygons, 3D</bookmark_value>
<bookmark_value>extrusion objects</bookmark_value>
-</bookmark>
+</bookmark><comment>added 3D scenes, issue 109330</comment>
<paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="1" l10n="U" oldref="32"><variable id="3d_create"><link href="text/simpress/guide/3d_create.xhp" name="Converting 2D Objects to Curves, Polygons, and 3D Objects">Converting 2D Objects to Curves, Polygons, and 3D Objects</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="33">You can convert two dimensional (2D) objects to create different shapes. $[officename] can convert 2D objects to the following object types:</paragraph>
@@ -65,6 +62,18 @@
<paragraph role="listitem" id="par_id3149873" xml-lang="en-US" l10n="U" oldref="52">3D rotation object with shading and a light source</paragraph>
</listitem>
</list>
+
+<paragraph role="heading" id="hd_id31490481" xml-lang="en-US" level="3" l10n="NEW">Two types of 3D objects</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id31472951" xml-lang="en-US" l10n="NEW">The Status bar displays "3D scene selected". The 3D scenes are built from objects which have dimensions in x, y, and z coordinates. Examples are the objects inserted by the 3D Objects toolbar, and rectangles, ellipses, or text that got created by the Rectangle, Ellipse, or Text icons left on the Drawing toolbar, or any Custom Shapes, and that got converted to 3D by using the context menu "Convert - To 3D". These 3D scenes can be entered (for example, by pressing F3), and the objects can be rotated in 3D. Microsoft Office doesn't know these real 3D objects. When exporting these 3D scenes to Microsoft Office formats, a snapshot of the current view will be exported as a bitmap. 3D bars in charts are of this type, too.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id31506541" xml-lang="en-US" l10n="NEW">The Status bar displays "Shape selected". The Custom Shapes can be viewed in a 2D mode or in a 3D mode. At any time, you can switch the view between the two modes. You use the Basic Shapes, Symbol Shapes, and the following icons on the Drawing toolbar to create Custom Shapes. The Custom Shapes can be changed using the 3D Settings toolbar. They do not form a 3D scene, they cannot be illuminated by more than one light source, they show no reflections, and there are some more limitations. You can convert them to a 3D scene, but then they are no longer Custom Shapes. Custom Shapes in 2D or 3D mode can be exported to and imported from Microsoft Office formats.</paragraph>
+</listitem>
+</list>
+
+
<paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="3" l10n="U" oldref="34">To convert an object to a curved shape:</paragraph>
<list type="ordered">
<listitem>
@@ -74,7 +83,7 @@
<paragraph role="listitem" id="par_id3150654" xml-lang="en-US" l10n="CHG" oldref="54">Right-click the object and choose <emph>Convert - To Curve</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="55">To modify the shape of the object, click the <emph>Points</emph> icon
+<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="55">To modify the shape of the object, click the <emph>Points</emph> icon
<image id="img_id1027558" src="svx/res/cd015.png" width="0.222inch" height="0.222inch"><alt id="alt_id1027558" xml-lang="en-US">Icon</alt>
</image> on the <emph>Drawing</emph> toolbar, and drag the handles of the object. You can also drag the control points of a handle to modify the shape of the curve.</paragraph>
<paragraph role="heading" id="hd_id3153738" xml-lang="en-US" level="3" l10n="U" oldref="56">To convert a 2D object to a polygon:</paragraph>
@@ -87,7 +96,7 @@
</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="39">To modify the shape of the object, click the <emph>Points</emph> icon
+<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="39">To modify the shape of the object, click the <emph>Points</emph> icon
<image id="img_id7219458" src="svx/res/cd015.png" width="0.2201inch" height="0.2201inch"><alt id="alt_id7219458" xml-lang="en-US">Icon</alt>
</image> on the <emph>Drawing</emph> toolbar, and drag the handles of the object.</paragraph>
<paragraph role="heading" id="hd_id3153919" xml-lang="en-US" level="3" l10n="U" oldref="60">To convert a 2D object to a 3D object:</paragraph>
@@ -96,13 +105,13 @@
<paragraph role="listitem" id="par_id3147172" xml-lang="en-US" l10n="CHG" oldref="62">Select a 2D object on the slide or page.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_idN1088B" xml-lang="en-US" l10n="NEW">Click the <emph>Extrusion On/Off</emph> icon
+<paragraph role="listitem" id="par_idN1088B" xml-lang="en-US" l10n="NEW">Click the <emph>Extrusion On/Off</emph> icon
<image id="img_id2490920" src="res/commandimagelist/sc_extrusiontoggle.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2490920" xml-lang="en-US">Icon</alt>
</image> on the <emph>Drawing</emph> bar, or right-click the object and choose <emph>Convert - To 3D</emph>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3148828" xml-lang="en-US" l10n="CHG" oldref="41">To edit the properties of the 3D object, use the <emph>Line and Filling</emph> toolbar and the <emph>3D Settings</emph> toolbar.</paragraph>
-<paragraph role="tip" id="par_idN108C5" xml-lang="en-US" l10n="NEW">To convert a text object to 3D, use the <emph>Fontwork</emph> icon
+<paragraph role="tip" id="par_idN108C5" xml-lang="en-US" l10n="NEW">To convert a text object to 3D, use the <emph>Fontwork</emph> icon
<image id="img_id3821222" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3821222" xml-lang="en-US">Icon</alt>
</image> on the <emph>Drawing</emph> toolbar.</paragraph>
<paragraph role="heading" id="hd_id3145410" xml-lang="en-US" level="3" l10n="U" oldref="65">To convert a 2D object to a 3D rotation object:</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp
index 1cb8aacc89..ca550bfdcf 100644
--- a/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0102110100xml" indexer="include" status="PUBLISH">
@@ -59,7 +59,7 @@
<paragraph role="paragraph" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="6">Open the <emph>Navigation</emph> toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NAVI_VS" id="bm_id3154622" localize="false"/>
<paragraph role="paragraph" id="par_id3153141" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_NAVI_VS">Click the icon for the type of objects you want to browse through. Then click one of the "Previous Object" or "Next Object" arrow buttons. The names of these buttons indicate the type of object you have selected. The text cursor is placed on whichever object you have selected.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Configuration"><emph>Tools - Configuration</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
+<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Customize"><emph>Tools - Customize</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155338"><bookmark_value>searching; repeating a search</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="2" l10n="U" oldref="8">Repeat Search</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp
index e8248bdeda..7e07cadcc1 100644
--- a/helpcontent2/source/text/swriter/01/04090004.xhp
+++ b/helpcontent2/source/text/swriter/01/04090004.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0104090004xml" indexer="include">
<title id="tit" xml-lang="en-US">DocInformation</title>
@@ -80,10 +80,10 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Description</paragraph>
+<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Comments</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comment as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
+<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comments as entered in the <emph>Description</emph> tab page of the <emph>Properties</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04120213.xhp b/helpcontent2/source/text/swriter/01/04120213.xhp
index ca38e773a0..2c53bfa6ea 100755
--- a/helpcontent2/source/text/swriter/01/04120213.xhp
+++ b/helpcontent2/source/text/swriter/01/04120213.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0104120213xml" indexer="include" status="PUBLISH">
@@ -101,7 +101,7 @@
<paragraph role="paragraph" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="19">If you select "Caption Text", the punctuation and the space at the beginning of the caption does not appear in the index entry.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES" id="bm_id3155857" localize="false"/>
-<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object name</paragraph>
+<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object names</paragraph>
<paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMOBJECTNAMES">Creates index entries from object names.</ahelp> You can view object names in the Navigator, for example, and change them in the context menu.</paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04120221.xhp b/helpcontent2/source/text/swriter/01/04120221.xhp
index bcc1a7a4a4..a1e9647545 100755
--- a/helpcontent2/source/text/swriter/01/04120221.xhp
+++ b/helpcontent2/source/text/swriter/01/04120221.xhp
@@ -103,7 +103,7 @@
<paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:COMBOBOX:TP_TOX_ENTRY:CB_FILLCHAR">Select the tab leader that you want use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TOX_ENTRY:MF_TABPOS" id="bm_id3155871" localize="false"/><paragraph role="heading" id="hd_id3155859" xml-lang="en-US" level="3" l10n="U" oldref="27">Tab stop position</paragraph>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:METRICFIELD:TP_TOX_ENTRY:MF_TABPOS">Enter the distance to leave between the left page margin and the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="U" oldref="29">To right margin</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Align right</paragraph>
<paragraph role="paragraph" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_AUTORIGHT">Aligns the tab stop to the right page margin.</ahelp></paragraph>
</section>
<section id="formatierung">
diff --git a/helpcontent2/source/text/swriter/01/04120227.xhp b/helpcontent2/source/text/swriter/01/04120227.xhp
index 13f12083c2..0d4a544cfa 100755
--- a/helpcontent2/source/text/swriter/01/04120227.xhp
+++ b/helpcontent2/source/text/swriter/01/04120227.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,12 +44,12 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120227.xhp" name="Entries (bibliography)">Entries (bibliography)</link></paragraph>
-<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries.
+<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#verz37"/>
</section>
-<embed href="text/swriter/01/04120221.xhp#ebene"/>
+<paragraph role="heading" id="hd_id31544970" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="3">The types that are displayed depend on the different literature sources.</paragraph>
<embed href="text/swriter/01/04120221.xhp#aufbau"/>
<embed href="text/swriter/01/04120221.xhp#tabulator"/>
diff --git a/helpcontent2/source/text/swriter/01/05030800.xhp b/helpcontent2/source/text/swriter/01/05030800.xhp
index 1be997e10e..0a62fbb405 100755
--- a/helpcontent2/source/text/swriter/01/05030800.xhp
+++ b/helpcontent2/source/text/swriter/01/05030800.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0105030800xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Outline &amp; Numbering</title>
@@ -61,11 +61,12 @@
<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_NUMPARA_LB_OUTLINE_LEVEL" id="bm_id1209200804144764" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2" l10n="NEW">Outline level</paragraph>
<paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="CHG"
oldref="3">Numbering Style</paragraph>
<paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
+
<paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="7">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2" l10n="U" oldref="8">Restart at this paragraph</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040600.xhp b/helpcontent2/source/text/swriter/01/05040600.xhp
index 30c269e70d..51d1c9f8b6 100644
--- a/helpcontent2/source/text/swriter/01/05040600.xhp
+++ b/helpcontent2/source/text/swriter/01/05040600.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0105040600xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Footnote</title>
@@ -56,9 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3147514" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154099" role="heading" level="2" l10n="U" oldref="7">Maximum Footnote Height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT">Sets a maximum height for the footnote area. Select this check box, and then enter the height.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid=".">Sets a maximum height for the footnote area. Enable this option, then enter the height.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154470" role="heading" level="2" l10n="U" oldref="9">Maximum Footnote Height</paragraph>
<paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT">Enter the maximum height for the footnote area.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151318" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index cb5b82f02f..778bba78a0 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0106090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Convert Text to Table</title>
@@ -74,9 +74,11 @@
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN" id="bm_id3154273" localize="false"/>
<paragraph role="heading" id="hd_id3147508" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Equal width for all columns</paragraph>
<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN">Creates columns of equal width, regardless of the position of the column marker.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
-<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoCorrect</paragraph>
-<embed href="text/swriter/01/04150000.xhp#autoformattext"/>
+<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="CHG" oldref="14">AutoFormat</paragraph>
+<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp></paragraph>
+
<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
<paragraph role="heading" id="hd_id3149802" xml-lang="en-US" level="3" l10n="U" oldref="23">Heading</paragraph>
diff --git a/helpcontent2/source/text/swriter/main0210.xhp b/helpcontent2/source/text/swriter/main0210.xhp
index 2fd571e078..ad442705d7 100755
--- a/helpcontent2/source/text/swriter/main0210.xhp
+++ b/helpcontent2/source/text/swriter/main0210.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswritermain0210xml" indexer="include" status="PUBLISH">
@@ -68,6 +68,6 @@
<embed href="text/swriter/02/10030000.xhp#previewzoom"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<embed href="text/shared/00/00000403.xhp#syfullscreen"/>
-<embed href="text/shared/02/10100000.xhp#schliessen"/>
+
</body>
</helpdocument>