diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-13 13:18:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-13 13:18:39 +0000 |
| commit | 90251cb3a2f4672701aa79ed8e05b76be32b8c76 (patch) | |
| tree | 85759dca806dbd588787574cfd153a8a83bd1b26 | |
| parent | 7ab4b4d35f4539981625b01ae55346e489ba2bc2 (diff) | |
INTEGRATION: CWS hcpatch01 (1.4.84); FILE MERGED
2006/02/24 12:08:52 ufi 1.4.84.1: i61774
| -rw-r--r-- | helpcontent2/source/text/swriter/01/01150000.xhp | 16 | ||||
| -rw-r--r-- | helpcontent2/source/text/swriter/01/04060000.xhp | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/helpcontent2/source/text/swriter/01/01150000.xhp b/helpcontent2/source/text/swriter/01/01150000.xhp index 5d019552f4..353590d61e 100644 --- a/helpcontent2/source/text/swriter/01/01150000.xhp +++ b/helpcontent2/source/text/swriter/01/01150000.xhp @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: 01150000.xhp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 01:25:26 $ + * last change: $Author: vg $ $Date: 2006-03-13 14:18:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +33,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> + ************************************************************************ + --> <helpdocument version="1.0"> <meta> @@ -42,13 +44,11 @@ </topic> <history> <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2004-07-08T09:59:36">UFI: will become the Mail Merge Wizard (64 page spec doc) +<lastedited date="2006-02-24T10:19:17">UFI: will become the Mail Merge Wizard (64 page spec doc) UFI: no, will stay. Mail Merge Wizard is in mailmerge00.xhp ff</lastedited> </history> </meta> -<body> -<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9482328" localize="false"/><!-- HID added by script --> -<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id3151181" localize="false"/> +<body><comment>UFI: removed help ids</comment> <paragraph role="heading" id="hd_id3150757" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Mail Merge<comment>UFI: due to CJ, this old dialog stays and can be accessed through Tools-Configure-Menus. </comment></paragraph> <paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="2"><variable id="serienbrieftext"><ahelp hid=".uno:MergeDialog">Opens the <emph>Mail Merge</emph> dialog, which helps you in printing and saving form letters.</ahelp> </variable></paragraph> diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp index d2a3bdd646..74f50886e6 100644 --- a/helpcontent2/source/text/swriter/01/04060000.xhp +++ b/helpcontent2/source/text/swriter/01/04060000.xhp @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: 04060000.xhp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 01:32:12 $ + * last change: $Author: vg $ $Date: 2006-03-13 14:18:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +33,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> + ************************************************************************ + --> <helpdocument version="1.0"> <meta> @@ -42,7 +44,7 @@ </topic> <history> <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-02-14T11:53:44">converted from old format - fpe</lastedited> +<lastedited date="2006-02-24T12:19:05">converted from old format - fpe</lastedited> </history> </meta> <body> @@ -69,8 +71,7 @@ <paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph> <paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph> <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph> -<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR" id="bm_id3149820" localize="false"/> +<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph><comment>UFI: removed double help id</comment> <paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph> <paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME" id="bm_id3151258" localize="false"/> |