summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-11-24 18:50:17 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-11-24 18:50:17 +0100
commit0271fb16bc7aaa2b07af9a8f833da1fb66ddfc1f (patch)
tree7fb807dfa1a22861a736a86badf5335f41b87644 /helpcontent2/source/text/shared
parent9c8421f0731cccab2ff5f92287806a3ca67c4b32 (diff)
parentec2479e6193f9760937e3fbe0b3bcdc953bd8f21 (diff)
merge with DEV300_m94
Diffstat (limited to 'helpcontent2/source/text/shared')
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000200.xhp123
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000202.xhp60
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000203.xhp62
-rw-r--r--helpcontent2/source/text/shared/00/00000204.xhp108
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000205.xhp64
-rw-r--r--helpcontent2/source/text/shared/00/00000208.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000212.xhp60
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000213.xhp84
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000214.xhp62
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp14
-rw-r--r--helpcontent2/source/text/shared/00/00040501.xhp24
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/01/01100600.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/02180000.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp20
-rw-r--r--helpcontent2/source/text/shared/01/06140500.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/digitalsignatures.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp10
-rw-r--r--helpcontent2/source/text/shared/02/10100000.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/02/colortoolbar.xhp6
-rw-r--r--helpcontent2/source/text/shared/autopi/01130000.xhp2
-rw-r--r--helpcontent2/source/text/shared/autopi/01170000.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170300.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp16
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp12
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp1
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_barformat.xhp18
-rwxr-xr-xhelpcontent2/source/text/shared/guide/copytable2application.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01030000.xhp8
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01090100.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160201.xhp9
39 files changed, 320 insertions, 656 deletions
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index 789e8a457c..287341b8dd 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -56,13 +56,13 @@
</bookmark>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">About Import and Export Filters</paragraph>
<paragraph role="paragraph" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="2">In $[officename], apart from its own <link href="text/shared/00/00000021.xhp" name="XML formats">XML formats</link> you can also open and save many foreign XML formats.</paragraph>
-<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
+<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
</caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="3" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">
</caseinline><caseinline select="DRAW">
@@ -82,7 +82,6 @@
</caseinline><defaultinline>It is also possible to import and export <link href="text/shared/00/00000005.xhp#rtf" name="RTF">RTF</link> files. This file format can be used to exchange formatted texts across various applications and platforms. In this way, many formats read by most programs will be transferred without a problem. The clipboard uses RTF format when you insert part of a spreadsheet from $[officename] Calc through <link href="text/shared/00/00000005.xhp" name="DDE">DDE</link> into $[officename] Writer.</defaultinline></switchinline></paragraph>
<paragraph role="tip" id="par_id3151378" xml-lang="en-US" l10n="U" oldref="237">The filter <emph>Text Encoded</emph> helps you open and save text documents with another encoding font. The filter opens a dialog that enables you to select character set, default fonts, language and paragraph break.</paragraph>
<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Importing and Exporting in HTML Format </paragraph>
-<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="12">When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.<comment>still true? this para is very old.</comment></paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
@@ -101,7 +100,7 @@
</list>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="CHG" oldref="14">If MS Internet Explorer or $[officename] Writer are set as the export option, the sizes of the control field and their internal margins are exported as styles (print formats). CSS1 size properties are based on "width" and "height" values. The "Margin" property is used to set equal margins on all sides of the page. To allow different margins, the "Margin-Left", "Margin-Right", "Margin-Top" and "Margin-Bottom" properties are used.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="CHG" oldref="15">The distances of graphics and Plug-Ins to the content can be set individually for export to $[officename] Writer and MS Internet Explorer. If the top/bottom or right/left margin is set differently, the distances are exported in a "STYLE" option for the corresponding tag as CSS1 size properties "Margin-Top", "Margin-Bottom", "Margin-Left" and "Margin-Right".</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
@@ -184,7 +183,7 @@
<paragraph role="paragraph" id="par_id3144441" xml-lang="en-US" l10n="U" oldref="106">When you import an EPS file, a preview of the graphic is displayed in the document. If a preview is not available, a placeholder corresponding to the size of the graphic is displayed in the document. Under Unix and Microsoft Windows you can print the imported file by using a PostScript printer. <switchinline select="sys"><caseinline select="UNIX">
</caseinline><defaultinline>If a different printer is used the preview will be printed.</defaultinline></switchinline> When exporting EPS graphics, a preview is created and has the TIFF or EPSI format. If an EPS graphic together with other graphics is exported in the EPS format then this file will be embedded unchanged in the new file.</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="222">Multipage-TIFFs are allowed when graphics are imported or exported in TIFF format. The graphics are retrieved as a set of individual pictures in a single file, for example, the individual pages of a fax.</paragraph>
-<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="109">Some $[officename] Draw and $[officename] Impress options can be accessed through <emph>File - Export</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="CHG" oldref="109">Some $[officename] Draw and $[officename] Impress options can be accessed through <emph>File - Export</emph>. See <link href="text/shared/00/00000200.xhp" name="Graphics Export Options">Graphics Export Options</link> for more information.</paragraph>
<paragraph role="heading" id="hd_id3153213" xml-lang="en-US" level="3" l10n="U" oldref="228">PostScript</paragraph>
<paragraph role="paragraph" id="par_id3156444" xml-lang="en-US" l10n="U" oldref="229">To export a document or graphic in PostScript format:</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/00/00000200.xhp b/helpcontent2/source/text/shared/00/00000200.xhp
new file mode 100755
index 0000000000..4079f9f663
--- /dev/null
+++ b/helpcontent2/source/text/shared/00/00000200.xhp
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************-->
+<helpdocument version="1.0">
+<meta>
+<topic id="textshared0000000200xml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">Graphics Export Options</title>
+<filename>/text/shared/00/00000200.xhp</filename>
+</topic>
+</meta>
+<body>
+
+<paragraph role="heading" level="1" id="hd_id3150127" l10n="NEW" xml-lang="en-US">Graphics Export Options</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3160463" xml-lang="en-US"><ahelp hid="." visibility="visible">Defines graphics export options.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#exportgraphic"/>
+</section>
+<paragraph role="paragraph" id="par_id1" l10n="NEW" xml-lang="en-US">When you export graphical elements to a file, you can select the file type. For most supported file types a dialog opens where you can setup export options.</paragraph>
+<paragraph role="paragraph" id="par_id2" l10n="NEW" xml-lang="en-US">The following file types do not show an options dialog: PWP, RAS, SVG, TIFF, XPM.</paragraph>
+<paragraph role="paragraph" id="par_id3" l10n="NEW" xml-lang="en-US">The other file types show options dialogs where you can set the width and height of the exported image.</paragraph>
+<paragraph role="paragraph" id="par_id4" l10n="NEW" xml-lang="en-US">Depending on the file type, you can specify some more options. Press Shift+F1 and hover over the control to see an extended help text.</paragraph>
+
+<comment>Common controls</comment>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT:LB_SIZEX" id="bm_id31523978" localize="false"/>
+<paragraph l10n="NEW" role="paragraph" id="par_id388" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies the measurement units.</ahelp></paragraph>
+<bookmark branch="hid/svtools:MetricField:DLG_EXPORT:MF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="NEW" xml-lang="en-US">Width</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3154561" xml-lang="en-US"><ahelp hid="." visibility="visible">Specifies the width.</ahelp></paragraph>
+<bookmark branch="hid/svtools:MetricField:DLG_EXPORT:MF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="NEW" xml-lang="en-US">Height</paragraph>
+<paragraph l10n="NEW" role="paragraph" id="par_id3147226" xml-lang="en-US"><ahelp hid="." visibility="visible">Specifies the height.</ahelp></paragraph>
+
+<comment>Resolution controls</comment>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT:NF_RESOLUTION" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT:LB_RESOLUTION" id="bm_id3153778" localize="false"/>
+<paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="NEW">Resolution</paragraph>
+<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the image resolution. Select the measurement units from the list box.</ahelp></paragraph>
+
+<paragraph role="heading" id="hd_id3143534" xml-lang="en-US" level="3" l10n="NEW">More options</paragraph>
+<comment>JPEG controls</comment>
+<paragraph role="paragraph" id="par_id10" l10n="NEW" xml-lang="en-US">For JPEG files you can set the color depth and the quality.</paragraph>
+
+<bookmark branch="hid/svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH" xml-lang="en-US" id="bm_id3134024841"/>
+<paragraph l10n="NEW" role="paragraph" id="par_id435923952" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the color depth from 8 bit grayscale or 24 bit true color.</ahelp></paragraph>
+
+<bookmark branch="hid/svtools:NumericField:DLG_EXPORT:NF_COMPRESSION" xml-lang="en-US" id="bm_id315974841"/><comment>Unfortunately, the compression and quality sliders now share the same Help ID. Was UX on vacation?</comment>
+<paragraph l10n="NEW" role="paragraph" id="par_id355152952" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the compression and quality for the export. Choose from a low quality with minimal file size, up to a high quality and big file size. A high compression means a low quality, a low compression means a high quality.</ahelp></paragraph>
+
+<comment>BMP controls</comment>
+<paragraph role="paragraph" id="par_id11" l10n="NEW" xml-lang="en-US">For BMP files you can set the compression and the RLE encoding.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING" id="bm_id3154372" localize="false"/>
+<paragraph role="paragraph" id="par_id312346798" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies RLE (Run Length Encoding) to the BMP graphics.</ahelp></paragraph>
+
+<comment>PBM PGM PPM controls</comment>
+<paragraph role="paragraph" id="par_id12" l10n="NEW" xml-lang="en-US">For PBM, PGM, and PPM files you can set the encoding.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_BINARY" id="bm_id702536" localize="false"/>
+<paragraph role="paragraph" id="par_id344441" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Exports the file in binary format. The resulting file is smaller than a text file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_TEXT" id="bm_id5302591" localize="false"/>
+<paragraph role="paragraph" id="par_id3555783" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Exports the file in ASCII text format. The resulting file is larger than a binary file.</ahelp></paragraph>
+
+<comment>PNG controls</comment>
+<paragraph role="paragraph" id="par_id13" l10n="NEW" xml-lang="en-US">For PNG files you can set the compression and the interlaced mode.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_INTERLACED" id="bm_id5866924" localize="false"/>
+<paragraph role="paragraph" id="par_id35674840" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
+
+<comment>GIF controls</comment>
+<paragraph role="paragraph" id="par_id14" l10n="NEW" xml-lang="en-US">For GIF files you can set the transparency and the interlaced mode.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY" id="bm_id676692504" localize="false"/>
+<paragraph role="paragraph" id="par_id31456456938" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
+
+<comment>EPS controls</comment>
+<paragraph role="paragraph" id="par_id15" l10n="NEW" xml-lang="en-US">For EPS files you can set the preview, the color format, the compression, and the version.</paragraph>
+<paragraph role="paragraph" id="par_id3147779948" xml-lang="en-US" l10n="NEW"><switchinline select="sys">
+<caseinline select="WIN">You must print an EPS file with a PostScript printer. Other printers will only print the embedded preview.</caseinline></switchinline></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF" id="bm_id993153884" localize="false"/>
+<paragraph role="paragraph" id="par_id993155271" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI" id="bm_id993155069" localize="false"/>
+<paragraph role="paragraph" id="par_id993144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file. This format only contains printable characters from the 7-bit ASCII code.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1" id="bm_id993150040" localize="false"/>
+<paragraph role="paragraph" id="par_id993150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="." visibility="hidden">Compression is not available at this level. Select the Level 1 option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2" id="bm_id993149640" localize="false"/>
+<paragraph role="paragraph" id="par_id993159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="." visibility="hidden">Select the Level 2 option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1" id="bm_id319953049" localize="false"/>
+<paragraph role="paragraph" id="par_id319947250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="." visibility="hidden">Exports the file in color.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2" id="bm_id399153346" localize="false"/>
+<paragraph role="paragraph" id="par_id993147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="." visibility="hidden">Exports the file in grayscale tones.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW" id="bm_id315799863" localize="false"/>
+<paragraph role="paragraph" id="par_id399153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE" id="bm_id319947653" localize="false"/>
+<paragraph role="paragraph" id="par_id319952780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Specifies that you do not wish to use compression.</ahelp></paragraph>
+
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="NEW">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000202.xhp b/helpcontent2/source/text/shared/00/00000202.xhp
deleted file mode 100755
index 1014fe03e3..0000000000
--- a/helpcontent2/source/text/shared/00/00000202.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000202xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">JPEG Options</title>
-<filename>/text/shared/00/00000202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149741" xml-lang="en-US" oldref="2"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" visibility="visible">Defines the settings for the import/export of files in JPEG format.</ahelp></paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#jpegspeichern"/>
-</section>
- <paragraph role="heading" level="2" id="hd_id3154689" l10n="U" xml-lang="en-US" oldref="3">Quality</paragraph>
- <paragraph role="paragraph" id="par_id3149877" l10n="U" xml-lang="en-US" oldref="4">Specifies the desired graphic quality.</paragraph>
- <bookmark branch="hid/svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3152952" xml-lang="en-US" oldref="6"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" visibility="visible">Sets the quality for the import/export. The value 1 denotes minimum quality and minimal file size, 100 denotes maximum quality and file size.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3150431" l10n="U" xml-lang="en-US" oldref="7">Color resolution</paragraph>
- <paragraph role="paragraph" id="par_id3155599" l10n="U" xml-lang="en-US" oldref="8">Specifies the desired color resolution.</paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3146938" xml-lang="en-US" oldref="10"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" visibility="visible">Specifies whether to export or import a graphic object in a grayscale.</ahelp></paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149525" xml-lang="en-US" oldref="12"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" visibility="visible">Specifies whether to retain the original colors of the JPEG file when importing or exporting.</ahelp></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153539" xml-lang="en-US" oldref="13">For more details about filters, see <link href="text/shared/00/00000020.xhp" name="Information about Import/Export Filters">Information about Import/Export Filters</link></paragraph>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000203.xhp b/helpcontent2/source/text/shared/00/00000203.xhp
deleted file mode 100755
index bfe46acab4..0000000000
--- a/helpcontent2/source/text/shared/00/00000203.xhp
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000203xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">SVM/WMF/PICT/MET Options</title>
-<filename>/text/shared/00/00000203.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3160463" xml-lang="en-US" oldref="9"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" visibility="visible">Defines the settings for SVM/WMF/PICT/MET export options.</ahelp></paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#svmspeichern"/>
-</section>
- <paragraph role="heading" level="2" id="hd_id3143206" l10n="U" xml-lang="en-US" oldref="2">Mode</paragraph>
- <paragraph role="paragraph" id="par_id3154400" l10n="U" xml-lang="en-US" oldref="10">Specifies the mode for file export.</paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3145356" xml-lang="en-US" oldref="11"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" visibility="visible">Retains the original size.</ahelp></paragraph>
- <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3148983" xml-lang="en-US" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" visibility="visible">Specifies whether to modify size.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3156183" l10n="U" xml-lang="en-US" oldref="5">Size</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3149525" l10n="U" oldref="13">Defines the width and height. This is only active if the <emph>Size</emph> option has been selected.</paragraph>
- <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154561" xml-lang="en-US" oldref="14"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" visibility="visible">Specifies the width.</ahelp></paragraph>
- <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147226" xml-lang="en-US" oldref="15"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" visibility="visible">Specifies the height.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="U" oldref="8">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000204.xhp b/helpcontent2/source/text/shared/00/00000204.xhp
deleted file mode 100644
index a7ca9ba42d..0000000000
--- a/helpcontent2/source/text/shared/00/00000204.xhp
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000204xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">BMP Options</title>
-<filename>/text/shared/00/00000204.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T12:49:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
-<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">BMP Options</paragraph>
-<paragraph role="paragraph" id="par_id3149662" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX">Defines the import/export settings for files in BMP format.</ahelp></paragraph>
-<embed href="text/shared/00/00000401.xhp#bmpexport"/>
-<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="2" l10n="U" oldref="2">Color Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3151253" xml-lang="en-US" l10n="U" oldref="11">Specifies the color resolution of the BMP file to be exported.</paragraph>
-<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="22">The <emph>Color Resolution</emph> command also appears on the context menu of a BMP graphic that has been loaded in <item type="productname">%PRODUCTNAME</item> Draw.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS" id="bm_id3153070" localize="false"/>
-<paragraph role="heading" id="hd_id3149200" xml-lang="en-US" level="3" l10n="U" oldref="18">Color Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3150402" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">In the <emph>Color Resolution</emph> list you will find the following color resolution variants:</ahelp></paragraph>
-<paragraph role="heading" id="par_id3150379" xml-lang="en-US" level="4" l10n="U" oldref="37">Original</paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">Retains the original color resolution.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitThreshold" id="bm_id3113193" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitThreshold" id="bm_id3146067" localize="false"/>
-<paragraph role="heading" id="par_id3151299" xml-lang="en-US" level="4" l10n="U" oldref="23">1-Bit Threshold</paragraph>
-<paragraph role="paragraph" id="par_id3148998" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:ConvertTo1BitThreshold">Converts the object to black and white. All brightness levels below the middle value become black, while all above the middle value become white.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitMatrix" id="bm_id1956773" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo1BitMatrix" id="bm_id3153668" localize="false"/>
-<paragraph role="heading" id="par_id3146938" xml-lang="en-US" level="4" l10n="U" oldref="25">1 Bit Dithered</paragraph>
-<paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid=".uno:ConvertTo1BitMatrix">Allows the object to be converted to a grid of black and white dots.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitGrays" id="bm_id4234587" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitGrays" id="bm_id3147285" localize="false"/>
-<paragraph role="heading" id="par_id3154497" xml-lang="en-US" level="4" l10n="U" oldref="27">4-Bit Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:ConvertTo4BitGrays">Allows the object to be converted to a palette of 16 gray scale tones corresponding to the brightness of the original.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitColors" id="bm_id3377324" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo4BitColors" id="bm_id3152372" localize="false"/>
-<paragraph role="heading" id="par_id3146109" xml-lang="en-US" level="4" l10n="U" oldref="29"> 4-Bit Color Palette </paragraph>
-<paragraph role="paragraph" id="par_id3157991" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:ConvertTo4BitColors">Allows the object to be converted to a palette of 16 colors that match the original colors as closely as possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitGrays" id="bm_id1763441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitGrays" id="bm_id3147557" localize="false"/>
-<paragraph role="heading" id="par_id3147226" xml-lang="en-US" level="4" l10n="U" oldref="31">8-Bit Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:ConvertTo8BitGrays">Allows the object to be converted to a palette of 256 gray scale tones corresponding to the brightness of the original.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitColors" id="bm_id3787923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertTo8BitColors" id="bm_id3153527" localize="false"/>
-<paragraph role="heading" id="par_id3145211" xml-lang="en-US" level="4" l10n="U" oldref="33">8-Bit Color Palette</paragraph>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:ConvertTo8BitColors">Allows the object to be converted to a palette of 256 colors that match the original colors as closely as possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id7877625" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id3154823" localize="false"/>
-<paragraph role="heading" id="par_id3155338" xml-lang="en-US" level="4" l10n="U" oldref="35">24-Bit True Colors</paragraph>
-<paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:ConvertToTrueColor">Allows the object to be converted to a palette of approximately 16 million colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE" id="bm_id3145072" localize="false"/>
-<paragraph role="heading" id="par_id3145313" xml-lang="en-US" level="4" l10n="U" oldref="20">RLE Encoding</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE">Applies RLE (Run Length Encoding) to the BMP graphics</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
-<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="12">Determines the type of export mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
-<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="4">Original</paragraph>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX">Retains the original mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX" id="bm_id3153698" localize="false"/>
-<paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="U" oldref="5">Resolution</paragraph>
-<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX">Allows you to define the resolution for an image. Select the desired DPI from the <emph>Resolution</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
-<paragraph role="heading" id="hd_id3152910" xml-lang="en-US" level="3" l10n="U" oldref="6">Size</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX">Allows you modify the image size by a given measurement.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
-<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
-<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX">Specifies the image width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="8">Height</paragraph>
-<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX">Specifies the image height.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="9">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000205.xhp b/helpcontent2/source/text/shared/00/00000205.xhp
deleted file mode 100755
index b7bac24c75..0000000000
--- a/helpcontent2/source/text/shared/00/00000205.xhp
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000205xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">GIF Options</title>
-<filename>/text/shared/00/00000205.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T10:55:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145759"><bookmark_value>transparency; saving</bookmark_value>
-<bookmark_value>GIF format</bookmark_value>
-</bookmark>
-<!-- removed HID VCL:MODALDIALOG:DLG_EXPORT_GIF -->
-<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">GIF Options</paragraph>
-<paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="VCL:MODALDIALOG:DLG_EXPORT_GIF">In the<emph> GIF Options </emph>dialog, you can select the settings for the export of files in GIF format.</ahelp></paragraph>
-<embed href="text/shared/00/00000401.xhp#gifexport"/>
-<paragraph role="heading" id="hd_id3149877" xml-lang="en-US" level="2" l10n="U" oldref="2">Mode</paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED -->
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id9410382" localize="false"/>
-<paragraph role="heading" id="hd_id3153272" xml-lang="en-US" level="3" l10n="U" oldref="3">Interlaced</paragraph>
-<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED">Specifies whether to use interlaced mode for saving the GIF image.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="2" l10n="U" oldref="8">Drawing objects</paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT -->
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
-<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="3" l10n="U" oldref="10">Save transparency</paragraph>
-<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US" l10n="U" oldref="4">For more information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000208.xhp b/helpcontent2/source/text/shared/00/00000208.xhp
index f4171df4ec..fe47971b17 100644
--- a/helpcontent2/source/text/shared/00/00000208.xhp
+++ b/helpcontent2/source/text/shared/00/00000208.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,6 +53,14 @@
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="45">Import</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET">Specifies the character set to be used in the imported file.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG" id="bm_id315593499" localize="false"/><paragraph role="heading" id="hd_id315478899" xml-lang="en-US" level="3" l10n="NEW">Language</paragraph>
+<paragraph role="paragraph" id="par_id314949588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Determines how the number strings are imported.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id314949587" xml-lang="en-US" l10n="NEW">If Language is set to Default (for CSV import) or Automatic (for HTML import), Calc will use the globally set language. If Language is set to a specific language, that language will be used when importing numbers.</paragraph>
+<paragraph role="paragraph" id="par_id314949586" xml-lang="en-US" l10n="NEW">When importing an HTML document, the Language selection can conflict with the global HTML option <link href="text/shared/optionen/01030500.xhp" name="Use">Use 'English (USA)' locale for numbers</link>. The global HTML option is effective only when the Automatic language option is selected. If you select a specific language in the HTML Import Options dialog, the global HTML option is ignored.</paragraph>
+
+
<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW">Specifies the row where you want to start the import.</ahelp> The rows are visible in the preview window at the bottom of the dialog.</paragraph>
<paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Separator Options</paragraph>
@@ -76,6 +84,23 @@
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE">Combines consecutive delimiters and removes blank data fields.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP">Select a character to delimit text data. You can can also enter a character in the text box.</ahelp></paragraph>
+
+
+
+<paragraph role="heading" id="hd_id315538811" xml-lang="en-US" level="2" l10n="NEW">Other options</paragraph>
+<paragraph role="paragraph" id="par_id315366511" xml-lang="en-US" l10n="NEW">Sets some other import options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_QUOTED_AS_TEXT" id="bm_id315790911" localize="false"/>
+<paragraph role="heading" id="hd_id314847411" xml-lang="en-US" level="3" l10n="NEW">Quoted fields as text</paragraph>
+<paragraph role="paragraph" id="par_id314995711" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, fields or cells whose values are quoted in their entirety (the first and last characters of the value equal the text delimiter) are imported as text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_DETECT_SPECIAL_NUMBER" id="bm_id315790922" localize="false"/>
+<paragraph role="heading" id="hd_id314847422" xml-lang="en-US" level="3" l10n="NEW">Detect special numbers</paragraph>
+<paragraph role="paragraph" id="par_id314995722" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, Calc will automatically detect all number formats, including special number formats such as dates, time, and scientific notation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id314995723" xml-lang="en-US" l10n="NEW">The selected language influences how such special numbers are detected, since different languages and regions many have different conventions for such special numbers.</paragraph>
+<paragraph role="paragraph" id="par_id314995724" xml-lang="en-US" l10n="NEW">When this option is disabled, Calc will detect and convert only decimal numbers. The rest, including numbers formatted in scientific notation, will be imported as text. A decimal number string can have digits 0-9, thousands separators, and a decimal separator. Thousands separators and decimal separators may vary with the selected language and region.</paragraph>
+
+
+
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000212.xhp b/helpcontent2/source/text/shared/00/00000212.xhp
deleted file mode 100755
index 4c5fc36826..0000000000
--- a/helpcontent2/source/text/shared/00/00000212.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">PNG options</title>
-<filename>/text/shared/00/00000212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T10:51:34">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3146060" xml-lang="en-US" level="1" l10n="U" oldref="1">PNG options</paragraph>
-<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="2">Specifies the compression rate and the interlaced mode for saving the image as a <link href="text/shared/00/00000005.xhp#png" name="PNG">PNG</link> file.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#pngspeichern"/>
-</section>
-<paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="2" l10n="U" oldref="7">Mode</paragraph>
-<!-- removed HID VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION -->
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
-<paragraph role="heading" id="hd_id3150672" xml-lang="en-US" level="3" l10n="U" oldref="3">Compression 0..9</paragraph>
-<paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION">Specifies the compression setting from 0 (no compression) to 9 (maximum compression). The calculation time increases with the compression value, while the resulting file is smaller in bytes.</ahelp></paragraph>
-<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED -->
-<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id5851924" localize="false"/>
-<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="3" l10n="U" oldref="5">Interlaced</paragraph>
-<paragraph role="paragraph" id="par_id3154840" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000213.xhp b/helpcontent2/source/text/shared/00/00000213.xhp
deleted file mode 100755
index 4eef472d89..0000000000
--- a/helpcontent2/source/text/shared/00/00000213.xhp
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000213xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">EPS Export Options</title>
-<filename>/text/shared/00/00000213.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-17T14:58:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3149976" xml-lang="en-US" level="1" l10n="U" oldref="1">EPS Export Options</paragraph>
-<paragraph role="paragraph" id="par_id3156045" xml-lang="en-US" l10n="U" oldref="2">Defines several export options for EPS files.</paragraph>
-<paragraph role="paragraph" id="par_id3149948" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys">
-<caseinline select="WIN">You must print an EPS file with a PostScript printer. Other printers will only print the embedded preview.
-</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#epsexport"/>
-</section>
-<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="3">Preview</paragraph>
-<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Specifies options for embedded preview for the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
-<paragraph role="heading" id="hd_id3145348" xml-lang="en-US" level="3" l10n="U" oldref="5">Image preview (TIFF)</paragraph>
-<paragraph role="paragraph" id="par_id3155271" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
-<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="3" l10n="U" oldref="29">Interchange (EPSI)</paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file.</ahelp> This format only contains printable characters from the 7-bit ASCII code.</paragraph>
-<paragraph role="heading" id="hd_id3159224" xml-lang="en-US" level="2" l10n="U" oldref="9">Version</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="10">Determines the PostScript level for exporting the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
-<paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="3" l10n="U" oldref="11">Level 1</paragraph>
-<paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1">Compression is not available at this level. Select the<emph> Level 1 </emph>option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
-<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="3" l10n="U" oldref="13">Level 2</paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2">Select the<emph> Level 2 </emph>option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147261" xml-lang="en-US" level="2" l10n="U" oldref="15">Color format</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="16">The <emph>Color format</emph> option gives you the choice between exporting in color or in grayscale.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="3" l10n="U" oldref="17">Color</paragraph>
-<paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR">Exports the file in color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="19">Grayscale</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE">Exports the file in grayscale tones.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="21">Compression</paragraph>
-<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="22">Specifies whether the data is exported with compression.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
-<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="23">LZW encoding</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm invented by Abraham Lempel, Jacob Ziv, and Terry Welch. If you choose to activate this, select the<emph> LZW encoding </emph>option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
-<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="25">None</paragraph>
-<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE">Specifies that you do not wish to use compression.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000214.xhp b/helpcontent2/source/text/shared/00/00000214.xhp
deleted file mode 100755
index 570cde3d5f..0000000000
--- a/helpcontent2/source/text/shared/00/00000214.xhp
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0000000214xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">PBM/PPM/PGM Options</title>
-<filename>/text/shared/00/00000214.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-06T11:01:02">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3156116" xml-lang="en-US" level="1" l10n="U" oldref="1">PBM/PPM/PGM Options</paragraph>
-<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="2">Select the file format for the file to be exported. This dialog appears when exporting in the <emph>Portable Bitmap (PBM)</emph>, <emph>Portable Pixelmap (PPM)</emph> and <emph>Portable Graymap (PGM)</emph> format.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#pbmppmpgm"/>
-</section>
-<paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="3">File format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW" id="bm_id9971617" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW" id="bm_id9391460" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW" id="bm_id702536" localize="false"/>
-<paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="3" l10n="U" oldref="5">Binary</paragraph>
-<paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Exports the file in binary format. The resulting file is smaller than a (ASCII) text file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII" id="bm_id3917661" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII" id="bm_id1909543" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII" id="bm_id5302591" localize="false"/>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
-<paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid=".">Exports the file in the ASCII text format. This file type is larger than a binary.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 54f65d415c..215a3c45d0 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -247,14 +247,6 @@
</table>
</section>
-<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="78"><variable id="gifspeichern">Choose <emph>File - Save As</emph>, if GIF selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically
-</variable></paragraph>
<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard
@@ -269,11 +261,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens
+<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="NEW"><variable id="exportgraphic">Choose <emph>File - Export</emph>, select a graphics file type, dialog opens automatically
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154901" xml-lang="en-US" l10n="U" oldref="58"><variable id="saveall">Choose <emph>File - Save All</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 6e26a5989c..3e5793730b 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,35 +29,31 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0000040501xml" indexer="exclude" status="PUBLISH">
<title id="tit" xml-lang="en-US">Format Menu</title>
<filename>/text/shared/00/00040501.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-19T12:25:31">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<paragraph role="paragraph" id="par_id3150156" xml-lang="en-US" l10n="CHG" oldref="94"><variable id="aupitab">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field.
+<paragraph role="paragraph" id="par_id3150156" xml-lang="en-US" l10n="CHG" oldref="94"><variable id="aupitab">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154408" xml-lang="en-US" l10n="CHG" oldref="119"><variable id="aupitab1">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. No database connection in current form is allowed.
+<paragraph role="paragraph" id="par_id3154408" xml-lang="en-US" l10n="CHG" oldref="119"><variable id="aupitab1">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. No database connection in current form is allowed.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="120"><variable id="aupitab2">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. Database connection must exist.
+<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="120"><variable id="aupitab2">Open <emph>Form Controls</emph> toolbar, click <emph>More Controls</emph> icon, click <emph>Table Control</emph> icon and drag mouse to generate field. Database connection must exist.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="CHG" oldref="95"><variable id="aupikomli">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form.
+<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="CHG" oldref="95"><variable id="aupikomli">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148825" xml-lang="en-US" l10n="CHG" oldref="121"><variable id="aupikomli1">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 1.
+<paragraph role="paragraph" id="par_id3148825" xml-lang="en-US" l10n="CHG" oldref="121"><variable id="aupikomli1">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 1.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="CHG" oldref="122"><variable id="aupikomli2">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 2.
+<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="CHG" oldref="122"><variable id="aupikomli2">Open Form Controls toolbar, click <emph>Combo Box</emph> or <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 2.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="123"><variable id="aupikomli3a">Open Form Controls toolbar, click <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
+<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="123"><variable id="aupikomli3a">Open Form Controls toolbar, click <emph>List Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="CHG" oldref="124"><variable id="aupikomli3b">Open Form Controls toolbar, click <emph>Combo Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
+<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="CHG" oldref="124"><variable id="aupikomli3b">Open Form Controls toolbar, click <emph>Combo Box</emph> icon and drag mouse to generate field. Database connection must exist in the form: Wizard - Page 3.
</variable></paragraph>
<section id="kontroll">
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="CHG" oldref="2">Open <emph>Toolbox</emph> bar in Basic dialog editor, click</paragraph>
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index 098d531d6e..9c8aef8002 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -55,17 +55,11 @@ XHPFILES = \
00000020.xhp \
00000021.xhp \
00000099.xhp \
- 00000202.xhp \
- 00000203.xhp \
- 00000204.xhp \
- 00000205.xhp \
+ 00000200.xhp \
00000206.xhp \
00000207.xhp \
00000208.xhp \
00000210.xhp \
- 00000212.xhp \
- 00000213.xhp \
- 00000214.xhp \
00000215.xhp \
00000401.xhp \
00000402.xhp \
diff --git a/helpcontent2/source/text/shared/01/01100600.xhp b/helpcontent2/source/text/shared/01/01100600.xhp
index 5e05bd2909..f9b55e439d 100644
--- a/helpcontent2/source/text/shared/01/01100600.xhp
+++ b/helpcontent2/source/text/shared/01/01100600.xhp
@@ -56,22 +56,27 @@
<comment>
<paragraph role="heading" id="hd_id31499" xml-lang="en-US" level="2" l10n="NEW">File encryption</paragraph>
<paragraph role="paragraph" id="hd_id31499A" xml-lang="en-US" l10n="NEW">The password to open the current document can be set in the Properties dialog on the Security tab page. You can also set a password to open the document when you save the document. Check the Save with password option on the Save As dialog, and enter the password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN" id="bm_id31540239" localize="false"/>
<paragraph role="heading" id="par_idN106AA1" xml-lang="en-US" level="3" l10n="NEW">Enter password to open</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502B" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN" id="bm_id092822204190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA2" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100E" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options</paragraph>
<paragraph role="paragraph" id="hd_id31499F" xml-lang="en-US" l10n="NEW">The password to edit the current document can be set in the Properties dialog on the Security tab page. Currently this option is evaluated for documents in some Microsoft file formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY" id="bm_id3151240239" localize="false"/>
<paragraph role="heading" id="par_idN106AA3" xml-lang="en-US" level="3" l10n="NEW">Enter password to allow editing</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502H" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id0923337190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA4" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100J" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY" id="bm_id09553676" localize="false"/>
</comment>
<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY" id="bm_id8295846" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 71dadfdd8b..c68e45bfdd 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">List of Regular Expressions</title>
@@ -337,6 +337,11 @@
</table>
<paragraph xml-lang="en-US" id="hd_id5311441" role="heading" level="2" l10n="NEW">Examples</paragraph>
+
+<paragraph xml-lang="en-US" id="par_id956834773" role="paragraph" l10n="NEW">e([:digit:])? -- finds 'e' followed by zero or one digit. Note that currently all named character classes like [:digit:] must be enclosed in parentheses.<comment>issue 64368 and 113035</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id952368773" role="paragraph" l10n="NEW">^([:digit:])$ -- finds lines or cells with exactly one digit.</paragraph>
+
+
<paragraph xml-lang="en-US" id="par_id9568773" role="paragraph" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
<paragraph xml-lang="en-US" id="hd_id71413" role="heading" level="3" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id2924283" role="code" l10n="NEW">^[:digit:]{3}$</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index ec7439049a..a984a1ada5 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -60,6 +60,15 @@
<paragraph xml-lang="en-US" id="par_id3143270" role="note" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10646" role="paragraph" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+
+<switch select="sys">
+<case select="WIN">
+<paragraph xml-lang="en-US" id="par_idN1099856" role="warning" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
+</case>
+</switch>
+
+
+
<paragraph xml-lang="en-US" id="hd_id3155503" role="heading" level="2" l10n="U" oldref="3">Source file</paragraph>
<paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155449" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 180c4128b3..13d020487f 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
@@ -60,13 +60,13 @@
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
oldref="20">Optimal</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
oldref="22">Fit width and height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
@@ -75,6 +75,7 @@
<paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
@@ -91,6 +92,8 @@
<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
+
<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index a0bc05f9d8..a712322b4b 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0104160500xml" indexer="include" status="PUBLISH">
@@ -46,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id9760166" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id3153136" localize="false"/>
<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Floating Frame</paragraph>
-<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".uno:InsertObjectFloatingFra">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file. Floating frames are not supported by Netscape Navigator 4.x.</ahelp>
+<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index ac9959af27..b953e4c145 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105340300xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
@@ -50,7 +50,7 @@
<embed href="text/shared/00/00040503.xhp#fozelaus"/>
</section>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
-<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="54">Horizontal</paragraph>
+<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="2" l10n="U" oldref="54">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="57">Aligns numbers to the right, and text to the left.</paragraph>
@@ -78,10 +78,10 @@
<paragraph role="heading" id="par_idN1079C" xml-lang="en-US" level="3" l10n="NEW">Filled</paragraph>
<paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
-<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="3" l10n="U" oldref="41">Indent</paragraph>
+<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="41">Indent</paragraph>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
-<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="66">Vertical</paragraph>
+<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="66">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Aligns the cell contents to the bottom of the cell.</ahelp></paragraph><comment>UFI: removed two help ids</comment>
@@ -105,7 +105,7 @@
</variable></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00000004.xhp#syvertikalmitte"/>
-<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="U" oldref="51">Text Direction</paragraph>
+<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="CHG" oldref="51">Text orientation</paragraph>
<paragraph role="paragraph" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:AlignVCenter">Sets the text orientation of the cell contents.</ahelp></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/scalc/guide/text_rotate.xhp#text_rotate"/>
@@ -114,7 +114,7 @@
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
-<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="U" oldref="45">Angle</paragraph>
+<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="CHG" oldref="45">Degrees</paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
<paragraph role="heading" id="hd_id3150497" xml-lang="en-US" level="3" l10n="U" oldref="75">Reference edge</paragraph>
@@ -140,7 +140,7 @@
<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
<paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="U" oldref="43">Text flow</paragraph>
+<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="CHG" oldref="43">Properties</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
<paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp
index 3de74ac52f..4d80ae6b95 100644
--- a/helpcontent2/source/text/shared/01/06140500.xhp
+++ b/helpcontent2/source/text/shared/01/06140500.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -55,10 +55,15 @@
<paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVX_MACRO_LB_EVENT" id="bm_id1800286" localize="false"/><paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid="40000">The big list box lists the events and the assigned macros. After you selected the location in the <emph>Save In</emph> list box, select an event in the big list box. Then click <emph>Assign Macro</emph>.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN" id="bm_id755672891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/>
+<paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN">Opens the <link href="text/shared/01/06130000.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE" id="bm_id9109164341" localize="false"/>
+<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE">Deletes the macro assignment for the selected event.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/05060700.xhp" name="List of events">List of events</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index 9b4ff2c6f0..5d98da224d 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Digital Signatures</title>
@@ -56,9 +56,9 @@
<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
<paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
- </image> indicates a valid digital signature, while the Exclamation mark icon
+ </image> indicates a valid digital signature, while the Exclamation mark icon
<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
</image> indicates an invalid digital signature.</paragraph>
<paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
@@ -66,7 +66,7 @@
<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
<paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Sign Document</paragraph>
<paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 9fb107b460..d45a6806fd 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -46,6 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
+
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
oldref="65">Password</paragraph>
@@ -53,12 +54,17 @@
<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
+
<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
oldref="66">Confirm</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
oldref="68">Undoing password protection</paragraph>
<paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE" id="bm_id09233676" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id31323250502" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to show or hide the file sharing password options.</ahelp></paragraph>
+
+
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 345add3b07..9eac0c77ee 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -58,7 +58,7 @@
</section>
<paragraph xml-lang="en-US" id="hd_id746482" role="heading" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="2" l10n="CHG"
- oldref="2">Pages</paragraph>
+ oldref="2">Range</paragraph>
<paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL" id="bm_id1033967" localize="false"/>
@@ -67,7 +67,7 @@
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE" id="bm_id2618793" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter:Edit:RID_PDF_TAB_GENER:ED_PAGES" id="bm_id2676778" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="U" oldref="6">Range</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="CHG" oldref="6">Pages</paragraph>
<paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION -->
@@ -121,13 +121,17 @@
<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
<paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+ <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES" id="bm_id3992267" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
<paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES -->
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
<paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS" id="bm_id50656619" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3954548" role="heading" level="2" l10n="NEW">Embed standard fonts</paragraph>
+<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
<paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index e0f1bd7cf9..c2a7edc0f4 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0210100000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Close</title>
+<title id="tit" xml-lang="en-US">Close Window</title>
<filename>/text/shared/02/10100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-18T16:14:34">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schliessen">
<bookmark xml-lang="en-US" branch="hid/.uno:CloseWin" id="bm_id8159155" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CloseWin" id="bm_id3148520" localize="false"/>
-<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/10100000.xhp" name="Close">Close</link></paragraph>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
+<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/10100000.xhp" name="Close Window">Close Window</link></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close Window</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="5">If additional views of the current document were opened by <emph>Window - New Window</emph>, this command will close only the current view.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/02/colortoolbar.xhp b/helpcontent2/source/text/shared/02/colortoolbar.xhp
index 848abad730..f8607e3ce3 100755
--- a/helpcontent2/source/text/shared/02/colortoolbar.xhp
+++ b/helpcontent2/source/text/shared/02/colortoolbar.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared02colortoolbarxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Color</title>
-<filename>text/shared/02/colortoolbar.xhp</filename>
+<filename>/text/shared/02/colortoolbar.xhp</filename>
</topic>
<history>
<created date="2005-07-19T14:02:35">Color toolbar from Picture bar</created>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 6331b326ca..e7e0b4e325 100644
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -48,7 +48,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
</section>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from older versions, as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
+<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="3">The wizard converts binary documents and templates from older versions, as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4">The Document Converter Wizard contains the following pages:</paragraph>
<embed href="text/shared/autopi/01130100.xhp#seite1"/>
<embed href="text/shared/autopi/01130200.xhp#seite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 62e7a7dff3..7a303915a7 100644
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -54,8 +54,8 @@
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="9">Please select the type of your external address book</paragraph>
<paragraph role="paragraph" id="par_id5782036" xml-lang="en-US" l10n="NEW">Not all types are available on all systems.</paragraph>
<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/>
-<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
-<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option if you already use an address book in Mozilla or Netscape.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Seamonkey / Netscape</paragraph>
+<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option if you already use an address book in Seamonkey or Netscape.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD" id="bm_id611896" localize="false"/>
<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Thunderbird.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170300.xhp b/helpcontent2/source/text/shared/autopi/01170300.xhp
index 1a4020031d..bf5677dfec 100755
--- a/helpcontent2/source/text/shared/autopi/01170300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170300.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,22 +27,18 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01170300xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Select Table</title>
<filename>/text/shared/autopi/01170300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-21T15:39:49">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="tabauswahl">
<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/autopi/01170300.xhp" name="Select Table">Select Table</link></paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies a table from the Mozilla / Netscape 6.x address book source that is used as the address book in $[officename].</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Specifies a table from the Seamonkey / Netscape address book source that is used as the address book in $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#addressimport3"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 01ad9af773..94a4cb08cd 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -49,7 +49,7 @@
<paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-
+ <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_AS_BEFORE_CORRELATION_NAME" id="bm_id6617777328" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
<paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
@@ -93,8 +93,16 @@
<paragraph xml-lang="en-US" id="par_id3837397" role="paragraph" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
<paragraph xml-lang="en-US" id="hd_id0909200811170166" role="heading" level="2" l10n="NEW">Ignore currency field information</paragraph>
<paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
-<!-- removed HID 39067 -->
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ESCAPE_DATETIME" id="bm_id4743451355" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2" l10n="NEW">Use ODBC conformant date/time literals</paragraph>
- <paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Check to use ODBC conformant date/time literals.</ahelp></paragraph>
- </body>
+<paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="CHG"><ahelp hid=".">Use date/time literals that conform to ODBC standard.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PRIMARY_KEY_SUPPORT" id="bm_id47434523231355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id04092009442139524" role="heading" level="2" l10n="NEW">Supports primary keys</paragraph>
+<paragraph xml-lang="en-US" id="par_id04096620092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Enable to overrule Base's heuristics used to detect whether the database supports primary keys.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id66841631" role="paragraph" l10n="NEW">When connecting to a database using a generic API like ODBC, JDBC, or ADO, Base currently applies heuristics to determine whether this database supports primary keys. None of those APIs has dedicated support to retrieve this information.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841632" role="paragraph" l10n="NEW">The heuristics sometimes fails. This tri-state check box by default is set to the undetermined state, which means "apply the heuristics". If the check box is enabled, primary key support is assumed. If the check box is disabled, no primary key support is assumed.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841633" role="paragraph" l10n="NEW">Note that if this option is just for overruling the heuristics. If you enable the check box for a database which actually does not support primary keys, you will see some errors.</paragraph>
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index ebb3976810..74143f558d 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Wizard</title>
@@ -52,14 +52,14 @@
<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US" l10n="NEW">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
</section>
<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph>
-<list type="ordered">
+<list type="unordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW">If you create a new database file, the wizard contains two steps.</paragraph>
</listitem>
</list>
<embed href="text/shared/explorer/database/dabawiz01.xhp#dabaselection"/>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
-<list type="ordered">
+<list type="unordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 604e7083fa..598b98e938 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Selection</title>
@@ -66,7 +66,7 @@
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
-<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Mozilla database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
+<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US" l10n="NEW">The next wizard page is one of the following pages:</paragraph>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index a154988d03..75e98c6bd6 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -39,6 +39,7 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
+<bookmark_value>Oracle Report Builder</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index cdf29addb4..bdc5f5746e 100755
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,15 +40,15 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>charts; bars with textures</bookmark_value>
<bookmark_value>textures;on chart bars</bookmark_value>
<bookmark_value>inserting;textures on chart bars</bookmark_value>
</bookmark>
<comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="1"><variable id="chart_barformat"><link href="text/shared/guide/chart_barformat.xhp" name="Adding Texture to Chart Bars">Adding Texture to Chart Bars</link>
+ <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="1"><variable id="chart_barformat"><link href="text/shared/guide/chart_barformat.xhp" name="Adding Texture to Chart Bars">Adding Texture to Chart Bars</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3156136" role="paragraph" l10n="U" oldref="3">You can add texture to the bars in a graph or chart (instead of the default colors) via bitmap graphics:</paragraph>
<list type="ordered">
@@ -56,8 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3153748" role="listitem" l10n="U" oldref="4">Enter edit mode by double-clicking on the chart.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149182" role="listitem" l10n="CHG" oldref="5">Double-click on any bar of the bar series you want to edit. All bars of this series are now selected.</paragraph>
- <paragraph xml-lang="en-US" id="par_id720847" role="listitem" l10n="NEW">If you want to edit only one bar, double-click again on that bar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149182" role="listitem" l10n="CHG" oldref="5">Click on any bar of the bar series you want to edit. All bars of this series are now selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id720847" role="listitem" l10n="CHG">If you want to edit only one bar, click again on that bar.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3147275" role="listitem" l10n="U" oldref="6">In the context menu choose <emph>Object Properties</emph>. Then choose the <emph>Area</emph> tab.</paragraph>
@@ -67,11 +67,11 @@
</listitem>
</list>
<section id="relatedtopics">
-
+
<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
<embed href="text/shared/guide/chart_title.xhp#chart_title"/>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 53c48ed5ba..7a1715a469 100755
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidecopytable2applicationxml" indexer="include" status="PUBLISH">
@@ -59,10 +59,10 @@
<paragraph role="listitem" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="11">To copy a cell range into a text document, select the cell range in the sheet and then use either the clipboard or drag-and-drop to insert the cells into the text document. You will then find an OLE object in the text document, which you can edit further.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="12">If you drag cells to the normal view of a presentation document, the cells will be inserted there as an OLE object. If you drag cells into the outline view, each cell will form a line of the outline view. If you just drag the cells you will move the cells. The cells will only be copied if you press the Shift key when dragging.</paragraph>
+<paragraph role="listitem" id="par_id3146957" xml-lang="en-US" l10n="CHG" oldref="12">If you drag cells to the normal view of a presentation document, the cells will be inserted there as an OLE object. If you drag cells into the outline view, each cell will form a line of the outline view.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="13">When you copy a cell range from $[officename] Calc to the clipboard, the drawing objects, OLE objects and charts within this range are also copied. They are also copied when you start a drag-and-drop action. However, the objects will be inserted only if you drop them within the same document.</paragraph>
+<paragraph role="listitem" id="par_id3148538" xml-lang="en-US" l10n="CHG" oldref="13">When you copy a cell range from $[officename] Calc to the clipboard, the drawing objects, OLE objects and charts within this range are also copied.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="14">If you insert a cell range with an enclosed chart, the chart will keep its link to the source cell range only if you copied the chart and the source cell range together.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index f57b9f4824..b4a4b91431 100755
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -52,12 +52,8 @@
<case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
</case>
</switch>
-<switch select="sys">
-<case select="MAC">
-</case>
-<default><embed href="text/shared/optionen/01020300.xhp#email"/>
-</default>
-</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index e734f5ed4b..9bc9fa77bb 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -36,10 +36,6 @@
<title id="tit" xml-lang="en-US">HTML compatibility</title>
<filename>/text/shared/optionen/01030500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:59:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="html">
@@ -100,7 +96,7 @@
<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -->
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="28">Print layout</paragraph>
-<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename] as well as Netscape Navigator from 4.0 and above and by MS Internet Explorer from 4.0 and above.</paragraph>
+<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid=".">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename], Netscape Navigator, and MS Internet Explorer.</paragraph>
<paragraph role="note" id="par_id3156276" xml-lang="en-US" l10n="U" oldref="41">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated.</paragraph>
<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF -->
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 57af9486b8..0a864a28e2 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Calculate</title>
@@ -56,7 +56,7 @@
</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Defines the calculation settings for spreadsheets.</ahelp> Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#exopbe"/>
@@ -217,7 +217,7 @@
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX" id="bm_id3154419" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
oldref="58">Enable regular expressions in formulas</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+ <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
</caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
@@ -225,5 +225,11 @@
<paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
<emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
- </body>
+
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC" id="bm_id315342901" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id315442901" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id315634199" role="heading" level="2" l10n="NEW">Limit decimals for general number format</paragraph>
+<paragraph xml-lang="en-US" id="par_id315343818" role="paragraph" l10n="NEW"><ahelp hid=".">You can specify the maximum number of decimal places that are shown by default for cells with General number format. If not enabled, cells with General number format show as many decimal places as the column width allows.</ahelp></paragraph>
+
+</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index 57567c6a35..8a851d271e 100644
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -75,7 +75,13 @@
<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
<paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM">Reduces or enlarges the size of the printed formula by a specified enlargement factor.</ahelp> Type the desired enlargement factor directly in the <emph>Scaling</emph> control, or set the value using the arrow buttons.</paragraph>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="19">Other options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Ignore ~ and ' at the end of the line</paragraph>
<paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING">Specifies that these space wildcards will be removed if they are at the end of a line.</ahelp> In earlier versions of $[officename], adding such characters at the end of a line prevented the right edge of the formula from being cut off during printing.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/tobeannounced" id="bm_id34459152" localize="false"/><paragraph role="heading" id="hd_id31567808" xml-lang="en-US" level="3" l10n="NEW">Embed only used symbols (smaller file size)</paragraph>
+<paragraph role="paragraph" id="par_id3789203" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves only those symbols which each formula that are used in that formula.</ahelp> In earlier versions of $[officename], all symbols were saved with each formula.</paragraph>
+
+
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp
index 7dc925d156..963fe57b6d 100755
--- a/helpcontent2/source/text/shared/optionen/01160201.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160201.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,17 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01160201xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Database Link</title>
<filename>/text/shared/optionen/01160201.xhp</filename>
</topic>
-<history>
-<created date="2004-07-29T11:07:57">UFI: Create/Edit Database Link dialog</created>
-<lastedited date="2005-05-12T10:38:24">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Database Link</paragraph>
+<comment>should be New Database Link or Edit Database Link, respective to the button that was clicked</comment>
<paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">Creates or edits an entry in the <link href="text/shared/optionen/01160200.xhp">Databases</link> tab page.</paragraph>
<paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="2" l10n="NEW">Database file</paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter the path and the file name of the database file. The name of the file must end with the *.odb extension.</paragraph>