diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-03 11:45:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-03 11:45:32 +0000 |
| commit | d535b6c4c6822423d547f18ee9154f7d230db901 (patch) | |
| tree | df71811f3bcc5232bd293099901cb4ae74b9765f | |
| parent | 6b844633f3743580370144eed2873254905a820a (diff) | |
INTEGRATION: CWS hcshared18 (1.6.2); FILE MERGED
2008/05/28 18:17:07 fpe 1.6.2.3: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/23 11:11:09 ufi 1.6.2.2: building Sol
2008/05/21 09:13:57 ufi 1.6.2.1: vor testbuild
3 files changed, 14 insertions, 5 deletions
diff --git a/helpcontent2/source/text/swriter/guide/stylist_update.xhp b/helpcontent2/source/text/swriter/guide/stylist_update.xhp index 61562d6509..946e175a72 100644 --- a/helpcontent2/source/text/swriter/guide/stylist_update.xhp +++ b/helpcontent2/source/text/swriter/guide/stylist_update.xhp @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!-- *********************************************************************** * @@ -9,7 +11,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stylist_update.xhp,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * diff --git a/helpcontent2/source/text/swriter/guide/subscript.xhp b/helpcontent2/source/text/swriter/guide/subscript.xhp index 5cc47bcb08..0876d40586 100755 --- a/helpcontent2/source/text/swriter/guide/subscript.xhp +++ b/helpcontent2/source/text/swriter/guide/subscript.xhp @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -8,7 +10,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: subscript.xhp,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * diff --git a/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp b/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp index 86f2116c0d..80cfdcb74c 100644 --- a/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp +++ b/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!-- *********************************************************************** * @@ -10,7 +12,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: table_cellmerge.xhp,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -46,8 +48,11 @@ <bookmark_value>cell merges</bookmark_value> <bookmark_value>splitting cells;by menu command</bookmark_value> <bookmark_value>merging;cells</bookmark_value> -</bookmark><comment>mw made "cell merges;" a one level entry</comment><paragraph role="heading" id="hd_id6618243" xml-lang="en-US" level="1" l10n="NEW"><variable id="table_cellmerge"><link href="text/swriter/guide/table_cellmerge.xhp" name="Merging and Splitting Cells">Merging and Splitting Cells<comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></link> -</variable></paragraph> +</bookmark> +<comment>mw made "cell merges;" a one level entry</comment> +<paragraph role="heading" id="hd_id6618243" xml-lang="en-US" level="1" l10n="NEW"> +<variable id="table_cellmerge"><link href="text/swriter/guide/table_cellmerge.xhp" name="Merging and Splitting Cells">Merging and Splitting Cells</link> +</variable><comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></paragraph> <paragraph role="paragraph" id="par_id1211890" xml-lang="en-US" l10n="NEW">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell and divide it into individual cells.</paragraph> <paragraph role="heading" id="hd_id3463850" xml-lang="en-US" level="2" l10n="NEW">Merging Cells</paragraph> <list type="ordered"> |