summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-01-27 17:27:28 +0000
committerRüdiger Timm <rt@openoffice.org>2005-01-27 17:27:28 +0000
commit54381d4f58cbf0f67bcba3482ac1f1220c17d3be (patch)
tree195aa6005583d93b0fbf87b598c2ee10cf087677
parentca6ea11e14baade28b4b7c84c517253c3c228710 (diff)
INTEGRATION: CWS hc680postbeta (1.2.2); FILE MERGED
2005/01/18 12:44:47 fpe 1.2.2.1: Regular Update
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/template_create.xhp8
-rw-r--r--helpcontent2/source/text/swriter/guide/templates_styles.xhp21
2 files changed, 10 insertions, 19 deletions
diff --git a/helpcontent2/source/text/swriter/guide/template_create.xhp b/helpcontent2/source/text/swriter/guide/template_create.xhp
index 948f8f0e60..b5b63de3f8 100755
--- a/helpcontent2/source/text/swriter/guide/template_create.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_create.xhp
@@ -37,8 +37,8 @@
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
@@ -62,7 +62,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-22T16:24:53">converted from old format - fpe</lastedited>
+<lastedited date="2004-12-10T10:46:48">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -75,7 +75,6 @@
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="64">Create a document and add the content and formatting styles that you want.</paragraph>
-<paragraph role="listitem" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="69">You can also load styles from another text document by choosing <emph>Format - Styles - Load</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>File - Templates - Save</emph>.</paragraph>
@@ -94,6 +93,7 @@
<section id="relatedtopics">
<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
+<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
<paragraph role="paragraph" id="par_id3149636" xml-lang="en-US" l10n="U" oldref="68"><link href="text/shared/01/01110300.xhp" name="File - Templates - Save">File - Templates - Save</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/swriter/guide/templates_styles.xhp b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
index 0ee2990c57..032eaf68e7 100644
--- a/helpcontent2/source/text/swriter/guide/templates_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
@@ -37,8 +37,8 @@
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
@@ -62,7 +62,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T12:18:00">converted from old format - fpe</lastedited>
+<lastedited date="2004-12-09T12:02:58">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -76,20 +76,11 @@
<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, object, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
<paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="18">Unless you specify otherwise, every new $[officename] text document is based on the "Default" template.</paragraph>
<paragraph role="paragraph" id="par_id3149974" xml-lang="en-US" l10n="U" oldref="3">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph>
-<paragraph role="heading" id="hd_id3149613" xml-lang="en-US" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149861" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Styles - Catalog</emph>, and then click<emph> Organizer. </emph><comment>UFI: may be removed, then rewrite to use styles and formatting window</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145105" xml-lang="en-US" l10n="U" oldref="20">In the category list, double-click a folder.</paragraph>
-</listitem>
+<paragraph role="heading" id="hd_id3149613" xml-lang="en-US" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates<comment>UFI: removed style catalog description</comment></paragraph>
+<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="5">Double-click a template, and then double-click <emph>Styles</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US" l10n="NEW">Use the <link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link> dialog to copy styles from one document to another.</paragraph>
</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154412" xml-lang="en-US" l10n="U" oldref="14">You can also use the <emph>Template Management </emph>dialog to copy styles between templates, documents, or between templates and documents.</paragraph>
-<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3153377" xml-lang="en-US" l10n="U" oldref="7">To copy a style, drag it to another template or document.</paragraph>
</listitem>