summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/guide
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/guide')
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp24
-rw-r--r--helpcontent2/source/text/shared/guide/line_intext.xhp59
-rwxr-xr-xhelpcontent2/source/text/shared/guide/lineend_define.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/guide/linestyle_define.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/protection.xhp223
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp14
7 files changed, 187 insertions, 195 deletions
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 8bbd2ce403..851d823829 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideautocorr_urlxml" indexer="include">
<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
<filename>/text/shared/guide/autocorr_url.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-21T12:50:32">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
@@ -58,7 +54,7 @@
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
</listitem>
@@ -73,7 +69,7 @@
<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 5bfa517ce1..001bd5d320 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: line_intext.xhp,v $
- * $Revision: 1.13 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideline_intextxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideline_intextxml" indexer="include">
<title id="tit" xml-lang="en-US">Drawing Lines in Text</title>
<filename>/text/shared/guide/line_intext.xhp</filename>
</topic>
@@ -57,54 +55,57 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="39">To define the line attributes and direction, use the <emph>Line</emph> drawing object as follows:</paragraph>
<table id="tbl_id3153031">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.222inch" height="0.222inch"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="66">1.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="CHG" oldref="41">On the Standard bar, click the <emph>Show Draw Functions </emph>icon to open the <emph>Drawing </emph>toolbar, and click the <emph>Line</emph> icon. The mouse pointer changes to a cross-hair symbol with a line beside it.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="67">2.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152472" xml-lang="en-US" l10n="U" oldref="42">In your document, click where the line should begin. Hold down the mouse button and drag to the point where you want the line to end. If you also hold down the Shift key, you can draw only horizontal, vertical, and diagonal lines.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="68">3.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153361" xml-lang="en-US" l10n="CHG" oldref="43">Release the mouse button once the line has the desired direction and length. You can then draw more lines. End this function by pressing the Esc key or by clicking the <emph>Select</emph> icon from the <emph>Drawing </emph>bar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="69">4.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="44">After clicking the <emph>Select</emph> icon, you can select all of the lines at the same time by clicking each line while holding down the Shift key. This multiple selection enables you to assign all of them a common color, width or other attribute.</paragraph>
</tablecell>
</tablerow>
</table>
-<list type="unordered">
+
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="38">Create a horizontal line by applying the preset Paragraph Style <emph>Horizontal Line</emph>. Click into an empty paragraph, and double-click the <emph>Horizontal Line</emph> Style in the <emph>Styles and Formatting</emph> window. If the entry for horizontal lines is not visible in the list of Paragraph Styles, select "All Styles" in the lower listbox.</paragraph>
</listitem>
@@ -113,9 +114,9 @@
</listitem>
</list>
<paragraph role="heading" id="par_idN107C6" xml-lang="en-US" level="2" l10n="CHG">Automatic lines in Writer</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="CHG">If you start a new line in a Writer text document by typing three or more hyphen characters and press the <item type="keycode">Enter</item> key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
+<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="CHG">If you start a new line in a Writer text document by typing three or more hyphen characters and press the Enter key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
<paragraph role="paragraph" id="par_id8849452" xml-lang="en-US" l10n="NEW">To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
</listitem>
<listitem>
@@ -125,7 +126,7 @@
<paragraph role="listitem" id="par_idN107D8" xml-lang="en-US" l10n="NEW">To undo an automatic border replacement once, choose <emph>Edit - Undo</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_idN107E0" xml-lang="en-US" l10n="NEW">To disable the automatic borders, choose <emph>Tools - AutoCorrect - Options</emph> and clear <emph>Apply border</emph>.</paragraph>
+<paragraph role="listitem" id="par_idN107E0" xml-lang="en-US" l10n="NEW">To disable the automatic borders, choose <emph>Tools - AutoCorrect Options - Options</emph> and clear <emph>Apply border</emph>.</paragraph>
</listitem>
</list>
<paragraph role="warning" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="45">The lines and other drawing objects that you insert in text are not defined in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link>, and are therefore not exported directly into HTML format. Instead, they are exported as graphics.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index 5bb031c1f5..e0ead9a6f2 100755
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: lineend_define.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidelineend_definexml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidelineend_definexml" indexer="include">
<title id="tit" xml-lang="en-US">Defining Line Ends</title>
<filename>/text/shared/guide/lineend_define.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-08T15:36:22">FPE: Deleted screenshot. Cleaned.</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3146117"><bookmark_value>defining; arrowheads and other line ends</bookmark_value>
@@ -57,7 +53,11 @@
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="16">Use the draw functions to create an object to be used as a line end.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="CHG" oldref="17">Select the object and choose <emph>Format - Object - Line</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="CHG" oldref="17">Select the object and choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
+</caseinline></switchinline>
+<emph/>
+<emph>Line</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="18">In the dialog, click the <emph>Arrow Styles</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index ad145368f9..d952faeb16 100755
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: linestyle_define.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidelinestyle_definexml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidelinestyle_definexml" indexer="include">
<title id="tit" xml-lang="en-US">Defining Line Styles</title>
<filename>/text/shared/guide/linestyle_define.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-15T11:36:41">FPE: Deleted screenshot. Cleaned
-dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153825"><bookmark_value>line styles;defining</bookmark_value>
@@ -54,7 +51,11 @@ dedr: reviewed</lastedited>
<paragraph role="listitem" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="10">Select a line drawing object in a document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155419" xml-lang="en-US" l10n="CHG" oldref="14">Choose <item type="menuitem">Format - Object - Line</item> and click the <emph>Line Styles</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3155419" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object</emph> -
+</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
+</caseinline></switchinline>
+<item type="menuitem"/>
+<emph>Line</emph> and click the <emph>Line Styles</emph> tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="15">Specify the line options that you want.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 0ee5980242..3a01cb4a87 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -60,7 +60,11 @@
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<<<<<<< .working
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
@@ -108,8 +112,13 @@
<tablecell>
<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
</tablecell>
+<<<<<<< .working
+<tablecell>
+<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+=======
<tablecell>
<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+>>>>>>> .merge-right.r265757
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index 3e09969b3f..b42a207520 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: protection.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,19 +32,15 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideprotectionxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+<topic id="textsharedguideprotectionxml" indexer="include">
+<title id="tit" xml-lang="en-US">Protecting Content in %PRODUCTNAME</title>
<filename>/text/shared/guide/protection.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
<bookmark_value>protected contents</bookmark_value>
<bookmark_value>contents protection</bookmark_value>
@@ -57,109 +52,101 @@
<bookmark_value>OLE objects;protecting</bookmark_value>
<bookmark_value>graphics;protecting</bookmark_value>
<bookmark_value>frames;protecting</bookmark_value>
-</bookmark>
- <comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
+</bookmark><comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
+<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
- <table id="tbl_id3145071">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="6">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145121" role="paragraph" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="par_id3145068" role="warning" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
- <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
- <table id="tbl_id3148797">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment>
- <comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
- <table id="tbl_id3158447">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147131" role="paragraph" l10n="U" oldref="54">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150088" role="paragraph" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147510" role="paragraph" l10n="U" oldref="56">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153657" role="paragraph" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="hd_id3152992" role="heading" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
- <table id="tbl_id3151062">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153226" role="paragraph" l10n="U" oldref="60">Turning on protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148815" role="paragraph" l10n="CHG" oldref="61">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156289" role="paragraph" l10n="U" oldref="62">Turning off protection</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="63">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <comment>removed webdav text, see i71792</comment>
- <comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment>
- <embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
- <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
- <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW"> <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/> </paragraph>
- <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
- </body>
+<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
+<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
+<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+<table id="tbl_id3145071">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="warning" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
+<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
+<paragraph role="paragraph" id="par_id3161646" xml-lang="en-US" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
+<table id="tbl_id3148797">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="12">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="14">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<paragraph role="heading" id="hd_id3155113" xml-lang="en-US" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
+<paragraph role="paragraph" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
+<table id="tbl_id3158447">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147131" xml-lang="en-US" l10n="U" oldref="54">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150088" xml-lang="en-US" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="56">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153657" xml-lang="en-US" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="heading" id="hd_id3152992" xml-lang="en-US" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
+<paragraph role="paragraph" id="par_id3166429" xml-lang="en-US" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
+<table id="tbl_id3151062">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153226" xml-lang="en-US" l10n="U" oldref="60">Turning on protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3148815" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3156289" xml-lang="en-US" l10n="U" oldref="62">Turning off protection</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="63">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+<comment>removed webdav text, see i71792</comment><comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment><embed href="text/shared/00/00000004.xhp#related"/>
+<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+<paragraph role="paragraph" id="par_idN10B8C" xml-lang="en-US" l10n="NEW">
+<embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+</paragraph>
+<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index 796a9db11b..a67d920de0 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: space_hyphen.xhp,v $
- *
- * $Revision: 1.14.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +52,7 @@
<bookmark_value>protected dashes</bookmark_value>
<bookmark_value>exchanging, see also replacing</bookmark_value>
</bookmark>
-<paragraph role="head1" id="hd_id3155364" xml-lang="en-US" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
+<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="61">Non-breaking spaces</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key
@@ -63,9 +61,9 @@
<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking dash</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Hyphen, dash</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect</emph>
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect Options</emph>
<emph>- Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect</emph>
+<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect Options</emph>
<emph>- </emph><link href="text/shared/01/06040200.xhp" name="Replace"><emph>Replace</emph></link>. Here you can, among other things, replace a shortcut automatically by a dash, even in another font.</paragraph>
<paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2" l10n="U" oldref="63">Definite separator</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="60">To support automatic hyphenation by entering a separator inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command