summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2010-02-19 12:03:21 +0100
committerUwe Fischer <ufi@openoffice.org>2010-02-19 12:03:21 +0100
commitbc7d1a933d988c07ea20cb770c22e5f629611dff (patch)
tree50bb41d26618c854f32c20e1bba2e6dbf56a7d78 /helpcontent2/source/text/swriter
parent66c1e24214404dcd892a11f28b64dbc67187e827 (diff)
parent38968acffdf2d1bd6f0839c86424eb194bf66cb2 (diff)
hcshared25: merge with DEV300_m71
Diffstat (limited to 'helpcontent2/source/text/swriter')
-rw-r--r--helpcontent2/source/text/swriter/01/01120000.xhp1
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp3
-rw-r--r--helpcontent2/source/text/swriter/02/10090000.xhp69
-rw-r--r--helpcontent2/source/text/swriter/02/10110000.xhp38
-rw-r--r--helpcontent2/source/text/swriter/guide/print_brochure.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/print_preview.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/print_small.xhp19
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/printing_order.xhp11
-rwxr-xr-xhelpcontent2/source/text/swriter/main0210.xhp4
9 files changed, 73 insertions, 84 deletions
diff --git a/helpcontent2/source/text/swriter/01/01120000.xhp b/helpcontent2/source/text/swriter/01/01120000.xhp
index 3c077ea7bd..c824b76ab1 100644
--- a/helpcontent2/source/text/swriter/01/01120000.xhp
+++ b/helpcontent2/source/text/swriter/01/01120000.xhp
@@ -58,7 +58,6 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ClosePreview" id="bm_id2166814" localize="false"/><paragraph role="paragraph" id="par_id5027008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">To exit the page preview, click the <emph>Close Preview</emph> button.</ahelp></paragraph>
<section id="Section1">
<paragraph role="paragraph" id="par_id2649311" xml-lang="en-US" l10n="NEW"><link href="text/swriter/main0210.xhp" name="Page View Object Bar">Page View Object Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><link href="text/swriter/02/10110000.xhp" name="Print Options">Print Options</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index 24b81c90cf..c189ebbf50 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -58,7 +58,6 @@
<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541770" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
<embed href="text/swriter/00/00000004.xhp#nopfre"/>
- <paragraph xml-lang="en-US" id="par_id3151184" role="paragraph" l10n="U" oldref="6">To specify if the script is printed at the end of the page or at the end of the document, choose <emph>File - Print - Options</emph>, and select the appropriate check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154644" role="heading" level="2" l10n="U" oldref="7">Contents</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Script Type</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/10090000.xhp b/helpcontent2/source/text/swriter/02/10090000.xhp
index 1b58765d25..0c682be895 100644
--- a/helpcontent2/source/text/swriter/02/10090000.xhp
+++ b/helpcontent2/source/text/swriter/02/10090000.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: 10090000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,42 +30,36 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0210090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Print page view</title>
-<filename>/text/swriter/02/10090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-19T09:38:27">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="drucken">
+ <topic id="textswriter0210090000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Print page view</title>
+ <filename>/text/swriter/02/10090000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="drucken">
<bookmark xml-lang="en-US" branch="hid/FN_PRINT_PAGEPREVIEW" id="bm_id7311881" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PrintPagePreView" id="bm_id3149290" localize="false"/>
-<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/10090000.xhp" name="Print page view">Print page view</link></paragraph>
-<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:PrintPagePreView">Opens the <emph>Print</emph> dialog to print the page preview. Use the <emph>Print options page view</emph> icon to set the printing scale and other printing properties.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152895" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/02/10090000.xhp" name="Print page view">Print page view</link><comment>remove this page</comment></paragraph><comment>id="par_id3151170" l10n="CHG" oldref="2"&lt;AVIS hid=".uno:PrintPagePreView"&gt;Opens the Print dialog to print the page preview. Use the Print options page view icon to set the printing scale and other printing properties.&lt;/AVIS&gt;</comment>
</section>
-<section id="sydrucken">
-<table id="tbl_id3145414">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="E">
-<image id="img_id3154575" src="res/commandimagelist/sc_printpagepreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154575" xml-lang="en-US">Icon</alt>
+ <section id="sydrucken">
+ <table id="tbl_id3145414">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="E">
+<image id="img_id3154575" src="res/commandimagelist/sc_printpagepreview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154575">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154568" xml-lang="en-US" l10n="U" oldref="3">Print page view</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="3">Print page view</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</body>
-</helpdocument>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/02/10110000.xhp b/helpcontent2/source/text/swriter/02/10110000.xhp
index 9f6744d3fd..a6d60834e1 100644
--- a/helpcontent2/source/text/swriter/02/10110000.xhp
+++ b/helpcontent2/source/text/swriter/02/10110000.xhp
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
-
-<!--***********************************************************************
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10110000.xhp,v $
- * $Revision: 1.5 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +30,20 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
+
<topic id="textswriter0210110000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Print Options</title>
<filename>/text/swriter/02/10110000.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>
-
-
+
+
<section id="doptionen">
<bookmark xml-lang="en-US" branch="hid/FN_PREVIEW_PRINT_OPTIONS" id="bm_id4480392" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:PreviewPrintOptions" xml-lang="en-US" id="bm_id3145248"/><paragraph id="hd_id3154505" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/02/10110000.xhp" name="Print Options">Print Options</link></paragraph>
@@ -52,9 +52,9 @@
<paragraph xml-lang="en-US" oldref="32" role="note" id="par_id3154567" l10n="U">The settings entered on the <emph>Print options</emph> dialog will only be activated if you print out the document using the <emph>Print page view</emph> icon.</paragraph>
<section id="sydoptionen">
<table id="tbl_id3155174">
-
-
-
+
+
+
<tablerow>
<tablecell>
<paragraph l10n="E" role="paragraph" id="par_id3143270" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_printersetup.png" id="img_id3143277"><alt xml-lang="en-US" id="alt_id3143277">Icon</alt></image></paragraph>
@@ -63,7 +63,7 @@
<paragraph role="paragraph" id="par_id3149099" l10n="U" xml-lang="en-US" oldref="3">Print options page view</paragraph>
</tablecell>
</tablerow>
-
+
</table>
</section>
<paragraph role="heading" level="2" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="4">Distribution</paragraph>
@@ -96,7 +96,7 @@
<paragraph l10n="U" role="paragraph" id="par_id3145094" xml-lang="en-US" oldref="31"><ahelp hid="SW:RADIOBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT" visibility="visible">Prints the page in portrait format.</ahelp></paragraph>
<bookmark branch="hid/sw:PushButton:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD" xml-lang="en-US" id="bm_id3149572"/><paragraph role="heading" level="2" id="hd_id3145110" l10n="U" xml-lang="en-US" oldref="33">Default</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149579" xml-lang="en-US" oldref="34"><ahelp hid="SW:PUSHBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD" visibility="visible">Specifies that the system will not use a fixed number of rows and columns when printing out the page view, but rather uses what was originally shown in the page view.</ahelp></paragraph>
-
-
+
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/print_brochure.xhp b/helpcontent2/source/text/swriter/guide/print_brochure.xhp
index 74f13d4b40..963279271c 100644
--- a/helpcontent2/source/text/swriter/guide/print_brochure.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_brochure.xhp
@@ -64,21 +64,21 @@
<paragraph xml-lang="en-US" id="par_id8947416" role="tip" l10n="NEW">If your printer prints duplex, and because brochures always print in landscape mode, you should use the "duplex - short edge" setting in your printer setup dialog.</paragraph>
<list type="ordered" startwith="4">
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10628" role="listitem" l10n="NEW">Return to <emph>Print</emph> dialog, and click <emph>Options</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10628" role="listitem" l10n="NEW">Return to <emph>Print</emph> dialog, and click the <emph>Page Layout</emph> tab page.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN1062C" role="listitem" l10n="NEW">In the <emph>Pages</emph> area of the <emph>Printer Options</emph> dialog, select <emph>Brochure</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1062C" role="listitem" l10n="NEW">Select <emph>Brochure</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10740" role="listitem" l10n="NEW">For a printer that automatically prints on both sides of a page, specify to print right pages and left pages.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10740" role="listitem" l10n="NEW">For a printer that automatically prints on both sides of a page, specify to include "All pages".</paragraph>
</listitem>
</list>
<list type="ordered" startwith="7">
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10630" role="listitem" l10n="NEW">In the <emph>Print</emph> dialog, click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10630" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
<embed href="text/shared/optionen/01040400.xhp#brochure"/>
- <paragraph xml-lang="en-US" id="par_idN106EA" role="note" l10n="NEW">If %PRODUCTNAME prints the pages in the wrong order, open the <emph>Printer Options</emph> dialog, select <emph>Reversed</emph>, and then print the document again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106EA" role="note" l10n="NEW">If %PRODUCTNAME prints the pages in the wrong order, open the <emph>Options</emph> tab page, select <emph>Print in reverse page order</emph>, and then print the document again.</paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/print_preview.xhp b/helpcontent2/source/text/swriter/guide/print_preview.xhp
index 034d3f3b01..c1fde5f47a 100644
--- a/helpcontent2/source/text/swriter/guide/print_preview.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_preview.xhp
@@ -55,7 +55,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3155055" role="listitem" l10n="U" oldref="35">Use the zoom icons on the <emph>Page Preview</emph> bar to reduce or enlarge the view of the page.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067F" role="tip" l10n="NEW">To print your document scaled down, print the zoomed preview. Click <emph>Print options page view</emph> icon to set the print options.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067F" role="tip" l10n="NEW">To print your document scaled down, set the print options on the <emph>Page Layout</emph> tab page of the <item type="menuitem">File - Print</item> dialog.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3145093" role="listitem" l10n="U" oldref="36">Use the arrow keys or the arrow icons on the <emph>Page Preview</emph> bar to scroll through the document.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/print_small.xhp b/helpcontent2/source/text/swriter/guide/print_small.xhp
index 391a4eae6d..0ea6f44f8e 100644
--- a/helpcontent2/source/text/swriter/guide/print_small.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_small.xhp
@@ -48,23 +48,28 @@
<bookmark_value>reduced printing of multiple pages</bookmark_value>
</bookmark><comment> MW changed "overviews;"</comment>
<paragraph xml-lang="en-US" id="hd_id3149694" role="heading" level="1" l10n="U"
- oldref="17"><variable id="print_small"><link href="text/swriter/guide/print_small.xhp" name="Printing Multiple Pages on One Sheet">Printing Multiple Pages on One Sheet</link>
+ oldref="17"><variable id="print_small"><link href="text/swriter/guide/print_small.xhp" name="Printing Multiple Pages on One Sheet">Printing Multiple Pages on One Sheet</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149829" role="paragraph" l10n="U" oldref="16">In Page Preview mode, you have the option to print multiple pages on one sheet.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149829" role="paragraph" l10n="U" oldref="16">On the <emph>Page Layout</emph> tab page of the <item type="menuitem">File - Print</item> dialog, you have the option to print multiple pages on one sheet.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156098" role="listitem" l10n="U" oldref="19">Choose <emph>File - Page Preview</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156098" role="listitem" l10n="U" oldref="19">Choose <emph>File - Print</emph> and click the <emph>Page Layout</emph> tab.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3155055" role="listitem" l10n="U" oldref="31">Do one of the following:</paragraph>
</listitem>
</list>
- <list type="unordered"/>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149603" role="listitem" l10n="U" oldref="20">To print two pages side by side on the same sheet, select "2" in the <emph>Pages per sheet</emph> box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="U" oldref="22">To print multiple pages on the same sheet, select the number of pages per sheet and optionally set the order of pages. The small preview shows the arrangement of pages. </paragraph>
+ </listitem>
+ </list>
<list type="ordered" startwith="3">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154841" role="listitem" l10n="U" oldref="21">Click the <item type="menuitem">Print page view</item> icon
-<image id="img_id3156248" src="res/commandimagelist/sc_printpagepreview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156248">Icon</alt>
- </image>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154841" role="listitem" l10n="U" oldref="21">Click <emph>Print</emph>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/guide/printing_order.xhp b/helpcontent2/source/text/swriter/guide/printing_order.xhp
index 7d765fbc7f..308ef7d66a 100755
--- a/helpcontent2/source/text/swriter/guide/printing_order.xhp
+++ b/helpcontent2/source/text/swriter/guide/printing_order.xhp
@@ -51,18 +51,13 @@
<paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="U" oldref="3">Choose <emph>File - Print</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149836" role="listitem" l10n="U" oldref="5">Click <emph>Options</emph> button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149836" role="listitem" l10n="U" oldref="5">Click the <emph>Options</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156106" role="listitem" l10n="U" oldref="6">In the <item type="menuitem">Pages</item>
- <emph/>area, select <item type="menuitem">Reversed</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156106" role="listitem" l10n="U" oldref="6">Choose <emph>Print in reverse page order</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153418" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="8">In the <item type="menuitem">Print</item>
- <emph/>dialog, click <item type="menuitem">OK</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153418" role="listitem" l10n="U" oldref="7">Click <emph>Print</emph>.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/main0210.xhp b/helpcontent2/source/text/swriter/main0210.xhp
index 6dbf3353c5..2fd571e078 100755
--- a/helpcontent2/source/text/swriter/main0210.xhp
+++ b/helpcontent2/source/text/swriter/main0210.xhp
@@ -68,10 +68,6 @@
<embed href="text/swriter/02/10030000.xhp#previewzoom"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<embed href="text/shared/00/00000403.xhp#syfullscreen"/>
-<embed href="text/swriter/02/10090000.xhp#drucken"/>
-<embed href="text/swriter/02/10090000.xhp#sydrucken"/>
-<embed href="text/swriter/02/10110000.xhp#doptionen"/>
-<embed href="text/swriter/02/10110000.xhp#sydoptionen"/>
<embed href="text/shared/02/10100000.xhp#schliessen"/>
</body>
</helpdocument>