Merge remote branch 'stage/ooo/dev300' into intm98integration/dev300_m98

Conflicts:
	helpcontent2/helpers/hid.lst
	helpcontent2/source/auxiliary/bn/default.css
	helpcontent2/source/auxiliary/ca-XV/default.css
	helpcontent2/source/auxiliary/ca-XV/highcontrast1.css
	helpcontent2/source/auxiliary/ca-XV/highcontrast2.css
	helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css
	helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css
	helpcontent2/source/auxiliary/eu/default.css
	helpcontent2/source/auxiliary/eu/highcontrast1.css
	helpcontent2/source/auxiliary/eu/highcontrast2.css
	helpcontent2/source/auxiliary/eu/highcontrastblack.css
	helpcontent2/source/auxiliary/eu/highcontrastwhite.css
	helpcontent2/source/auxiliary/makefile.mk
	helpcontent2/source/auxiliary/sq/default.css
	helpcontent2/source/auxiliary/sq/highcontrast1.css
	helpcontent2/source/auxiliary/sq/highcontrast2.css
	helpcontent2/source/auxiliary/sq/highcontrastblack.css
	helpcontent2/source/auxiliary/sq/highcontrastwhite.css
	helpcontent2/source/text/sbasic/guide/translation.xhp
	helpcontent2/source/text/sbasic/shared/00000003.xhp
	helpcontent2/source/text/sbasic/shared/01010210.xhp
	helpcontent2/source/text/sbasic/shared/01020300.xhp
	helpcontent2/source/text/sbasic/shared/01050300.xhp
	helpcontent2/source/text/sbasic/shared/01170101.xhp
	helpcontent2/source/text/sbasic/shared/03050500.xhp
	helpcontent2/source/text/sbasic/shared/03080301.xhp
	helpcontent2/source/text/sbasic/shared/03080302.xhp
	helpcontent2/source/text/sbasic/shared/03090201.xhp
	helpcontent2/source/text/sbasic/shared/03132400.xhp
	helpcontent2/source/text/scalc/01/02120100.xhp
	helpcontent2/source/text/scalc/01/02140500.xhp
	helpcontent2/source/text/scalc/01/02160000.xhp
	helpcontent2/source/text/scalc/01/03080000.xhp
	helpcontent2/source/text/scalc/01/04050000.xhp
	helpcontent2/source/text/scalc/01/04080000.xhp
	helpcontent2/source/text/scalc/01/04090000.xhp
	helpcontent2/source/text/scalc/01/05050100.xhp
	helpcontent2/source/text/scalc/01/05070000.xhp
	helpcontent2/source/text/scalc/01/06050000.xhp
	helpcontent2/source/text/scalc/01/12080300.xhp
	helpcontent2/source/text/scalc/02/06030000.xhp
	helpcontent2/source/text/scalc/guide/borders.xhp
	helpcontent2/source/text/scalc/guide/calculate.xhp
	helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
	helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
	helpcontent2/source/text/scalc/guide/finding.xhp
	helpcontent2/source/text/scalc/guide/multitables.xhp
	helpcontent2/source/text/scalc/guide/text_rotate.xhp
	helpcontent2/source/text/scalc/guide/value_with_name.xhp
	helpcontent2/source/text/scalc/main0210.xhp
	helpcontent2/source/text/schart/01/03010000.xhp
	helpcontent2/source/text/schart/01/04020000.xhp
	helpcontent2/source/text/schart/01/04030000.xhp
	helpcontent2/source/text/schart/01/04040000.xhp
	helpcontent2/source/text/schart/01/04050000.xhp
	helpcontent2/source/text/schart/01/04070000.xhp
	helpcontent2/source/text/schart/01/05020201.xhp
	helpcontent2/source/text/shared/00/00000001.xhp
	helpcontent2/source/text/shared/00/00000020.xhp
	helpcontent2/source/text/shared/00/00000021.xhp
	helpcontent2/source/text/shared/00/00000202.xhp
	helpcontent2/source/text/shared/00/00000203.xhp
	helpcontent2/source/text/shared/00/00000204.xhp
	helpcontent2/source/text/shared/00/00000205.xhp
	helpcontent2/source/text/shared/00/00000208.xhp
	helpcontent2/source/text/shared/00/00000212.xhp
	helpcontent2/source/text/shared/00/00000213.xhp
	helpcontent2/source/text/shared/00/00000214.xhp
	helpcontent2/source/text/shared/00/00000401.xhp
	helpcontent2/source/text/shared/00/00040501.xhp
	helpcontent2/source/text/shared/00/01010000.xhp
	helpcontent2/source/text/shared/00/01050000.xhp
	helpcontent2/source/text/shared/01/01020000.xhp
	helpcontent2/source/text/shared/01/01100300.xhp
	helpcontent2/source/text/shared/01/01100400.xhp
	helpcontent2/source/text/shared/01/01100600.xhp
	helpcontent2/source/text/shared/01/01130000.xhp
	helpcontent2/source/text/shared/01/02100001.xhp
	helpcontent2/source/text/shared/01/02100100.xhp
	helpcontent2/source/text/shared/01/02180000.xhp
	helpcontent2/source/text/shared/01/03010000.xhp
	helpcontent2/source/text/shared/01/04050000.xhp
	helpcontent2/source/text/shared/01/04140000.xhp
	helpcontent2/source/text/shared/01/04150100.xhp
	helpcontent2/source/text/shared/01/04160500.xhp
	helpcontent2/source/text/shared/01/05020200.xhp
	helpcontent2/source/text/shared/01/05020500.xhp
	helpcontent2/source/text/shared/01/05030600.xhp
	helpcontent2/source/text/shared/01/05050000.xhp
	helpcontent2/source/text/shared/01/05190000.xhp
	helpcontent2/source/text/shared/01/05230500.xhp
	helpcontent2/source/text/shared/01/05290100.xhp
	helpcontent2/source/text/shared/01/05290200.xhp
	helpcontent2/source/text/shared/01/05340100.xhp
	helpcontent2/source/text/shared/01/05340300.xhp
	helpcontent2/source/text/shared/01/05340400.xhp
	helpcontent2/source/text/shared/01/06010000.xhp
	helpcontent2/source/text/shared/01/06020000.xhp
	helpcontent2/source/text/shared/01/06040000.xhp
	helpcontent2/source/text/shared/01/06040100.xhp
	helpcontent2/source/text/shared/01/06040400.xhp
	helpcontent2/source/text/shared/01/06050200.xhp
	helpcontent2/source/text/shared/01/06140100.xhp
	helpcontent2/source/text/shared/01/06140102.xhp
	helpcontent2/source/text/shared/01/06140400.xhp
	helpcontent2/source/text/shared/01/06140500.xhp
	helpcontent2/source/text/shared/01/digitalsignatures.xhp
	helpcontent2/source/text/shared/01/extensionupdate.xhp
	helpcontent2/source/text/shared/01/gallery.xhp
	helpcontent2/source/text/shared/01/packagemanager.xhp
	helpcontent2/source/text/shared/01/password_dlg.xhp
	helpcontent2/source/text/shared/01/ref_pdf_export.xhp
	helpcontent2/source/text/shared/01/securitywarning.xhp
	helpcontent2/source/text/shared/02/01140000.xhp
	helpcontent2/source/text/shared/02/01170004.xhp
	helpcontent2/source/text/shared/02/01170101.xhp
	helpcontent2/source/text/shared/02/01170103.xhp
	helpcontent2/source/text/shared/02/01170202.xhp
	helpcontent2/source/text/shared/02/09070100.xhp
	helpcontent2/source/text/shared/02/10100000.xhp
	helpcontent2/source/text/shared/02/12000000.xhp
	helpcontent2/source/text/shared/02/12090000.xhp
	helpcontent2/source/text/shared/02/12100200.xhp
	helpcontent2/source/text/shared/02/24010000.xhp
	helpcontent2/source/text/shared/02/colortoolbar.xhp
	helpcontent2/source/text/shared/05/00000110.xhp
	helpcontent2/source/text/shared/3dsettings_toolbar.xhp
	helpcontent2/source/text/shared/autopi/01020200.xhp
	helpcontent2/source/text/shared/autopi/01020300.xhp
	helpcontent2/source/text/shared/autopi/01040200.xhp
	helpcontent2/source/text/shared/autopi/01050200.xhp
	helpcontent2/source/text/shared/autopi/01090100.xhp
	helpcontent2/source/text/shared/autopi/01130000.xhp
	helpcontent2/source/text/shared/autopi/01130100.xhp
	helpcontent2/source/text/shared/autopi/01150000.xhp
	helpcontent2/source/text/shared/autopi/01170000.xhp
	helpcontent2/source/text/shared/autopi/01170300.xhp
	helpcontent2/source/text/shared/autopi/01170400.xhp
	helpcontent2/source/text/shared/autopi/webwizard01.xhp
	helpcontent2/source/text/shared/explorer/database/30100000.xhp
	helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
	helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
	helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
	helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
	helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
	helpcontent2/source/text/shared/explorer/database/menuedit.xhp
	helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
	helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
	helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
	helpcontent2/source/text/shared/fontwork_toolbar.xhp
	helpcontent2/source/text/shared/guide/chart_barformat.xhp
	helpcontent2/source/text/shared/guide/collab.xhp
	helpcontent2/source/text/shared/guide/copytable2application.xhp
	helpcontent2/source/text/shared/guide/fontwork.xhp
	helpcontent2/source/text/shared/optionen/01010400.xhp
	helpcontent2/source/text/shared/optionen/01010501.xhp
	helpcontent2/source/text/shared/optionen/01030000.xhp
	helpcontent2/source/text/shared/optionen/01040400.xhp
	helpcontent2/source/text/shared/optionen/01041000.xhp
	helpcontent2/source/text/shared/optionen/01060100.xhp
	helpcontent2/source/text/shared/optionen/01060500.xhp
	helpcontent2/source/text/shared/optionen/01070500.xhp
	helpcontent2/source/text/shared/optionen/01090100.xhp
	helpcontent2/source/text/shared/optionen/01160100.xhp
	helpcontent2/source/text/shared/optionen/01160201.xhp
	helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
	helpcontent2/source/text/simpress/00/00000004.xhp
	helpcontent2/source/text/simpress/01/02120000.xhp
	helpcontent2/source/text/simpress/01/04030100.xhp
	helpcontent2/source/text/simpress/01/06040000.xhp
	helpcontent2/source/text/simpress/01/taskpanel.xhp
	helpcontent2/source/text/simpress/02/10020000.xhp
	helpcontent2/source/text/simpress/guide/individual.xhp
	helpcontent2/source/text/smath/00/00000004.xhp
	helpcontent2/source/text/smath/01/02080000.xhp
	helpcontent2/source/text/smath/01/02090000.xhp
	helpcontent2/source/text/smath/01/02100000.xhp
	helpcontent2/source/text/smath/01/02110000.xhp
	helpcontent2/source/text/smath/01/03040000.xhp
	helpcontent2/source/text/smath/01/03050000.xhp
	helpcontent2/source/text/smath/01/03060000.xhp
	helpcontent2/source/text/smath/01/03070000.xhp
	helpcontent2/source/text/smath/01/03080000.xhp
	helpcontent2/source/text/smath/01/03090000.xhp
	helpcontent2/source/text/smath/01/03090100.xhp
	helpcontent2/source/text/smath/01/03090200.xhp
	helpcontent2/source/text/smath/01/03090300.xhp
	helpcontent2/source/text/smath/01/03090400.xhp
	helpcontent2/source/text/smath/01/03090500.xhp
	helpcontent2/source/text/smath/01/03090600.xhp
	helpcontent2/source/text/smath/01/03090700.xhp
	helpcontent2/source/text/smath/01/03090800.xhp
	helpcontent2/source/text/smath/01/03091100.xhp
	helpcontent2/source/text/smath/01/03091500.xhp
	helpcontent2/source/text/smath/01/03091501.xhp
	helpcontent2/source/text/smath/01/03091502.xhp
	helpcontent2/source/text/smath/01/03091503.xhp
	helpcontent2/source/text/smath/01/03091504.xhp
	helpcontent2/source/text/smath/01/03091505.xhp
	helpcontent2/source/text/smath/01/03091506.xhp
	helpcontent2/source/text/smath/01/03091507.xhp
	helpcontent2/source/text/smath/01/03091508.xhp
	helpcontent2/source/text/smath/01/03091509.xhp
	helpcontent2/source/text/smath/01/05010000.xhp
	helpcontent2/source/text/smath/01/05020000.xhp
	helpcontent2/source/text/smath/01/05030000.xhp
	helpcontent2/source/text/smath/01/05040000.xhp
	helpcontent2/source/text/smath/01/05050000.xhp
	helpcontent2/source/text/smath/01/06010000.xhp
	helpcontent2/source/text/smath/01/06020000.xhp
	helpcontent2/source/text/smath/02/03010000.xhp
	helpcontent2/source/text/smath/04/01020000.xhp
	helpcontent2/source/text/smath/guide/keyboard.xhp
	helpcontent2/source/text/smath/guide/limits.xhp
	helpcontent2/source/text/smath/main0103.xhp
	helpcontent2/source/text/smath/main0503.xhp
	helpcontent2/source/text/swriter/01/01150000.xhp
	helpcontent2/source/text/swriter/01/02110100.xhp
	helpcontent2/source/text/swriter/01/02150000.xhp
	helpcontent2/source/text/swriter/01/04070000.xhp
	helpcontent2/source/text/swriter/01/04090002.xhp
	helpcontent2/source/text/swriter/01/04200000.xhp
	helpcontent2/source/text/swriter/01/05040500.xhp
	helpcontent2/source/text/swriter/01/05060200.xhp
	helpcontent2/source/text/swriter/01/05060201.xhp
	helpcontent2/source/text/swriter/01/05150101.xhp
	helpcontent2/source/text/swriter/01/05150200.xhp
	helpcontent2/source/text/swriter/01/05170000.xhp
	helpcontent2/source/text/swriter/01/06040000.xhp
	helpcontent2/source/text/swriter/01/mailmerge00.xhp
	helpcontent2/source/text/swriter/02/10020000.xhp
	helpcontent2/source/text/swriter/02/10070000.xhp
	helpcontent2/source/text/swriter/02/10090000.xhp
	helpcontent2/source/text/swriter/04/01020000.xhp
	helpcontent2/source/text/swriter/guide/borders.xhp
	helpcontent2/source/text/swriter/guide/finding.xhp
	helpcontent2/source/text/swriter/guide/load_styles.xhp
	helpcontent2/source/text/swriter/guide/main.xhp
	helpcontent2/source/text/swriter/guide/select_language.xhp
	helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
	helpcontent2/source/text/swriter/guide/subscript.xhp
	helpcontent2/source/text/swriter/main0204.xhp
	helpcontent2/source/text/swriter/main0206.xhp
	helpcontent2/source/text/swriter/main0215.xhp
	helpcontent2/util/target.pmk

1 files changed, 9 insertions, 9 deletions

diff --git a/helpcontent2/source/text/swriter/01/04070000.xhp b/helpcontent2/source/text/swriter/01/04070000.xhp
index bb9c7ad51b..51f5629fd8 100644
--- a/helpcontent2/source/text/swriter/01/04070000.xhp
+++ b/helpcontent2/source/text/swriter/01/04070000.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriter0104070000xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Envelope</title>
@@ -42,10 +42,10 @@
       <bookmark_value>letters;inserting envelopes</bookmark_value>
       <bookmark_value>envelopes</bookmark_value>
 </bookmark><comment>MW made "envelopes;" a one level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/FN_ENVELOP" id="bm_id3025884" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3025884" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3148773" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145245" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04070000.xhp" name="Envelope">Envelope</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation. 
+      <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation.
 </variable></paragraph>
       <section id="howtoget">
          <embed href="text/swriter/00/00000404.xhp#briefumschlag"/>
@@ -53,12 +53,12 @@
       <embed href="text/swriter/01/04070100.xhp#umschlag"/>
       <embed href="text/swriter/01/04070200.xhp#format"/>
       <embed href="text/swriter/01/04070300.xhp#drucker"/>
-<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_PRINT" id="bm_id3154574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_ENVELOP_PRINT" id="bm_id3154574" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153540" role="heading" level="2" l10n="U" oldref="4">New doc.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154473" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_ENVELOP_PRINT">Creates a new document and inserts the envelope.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_INSERT" id="bm_id3151314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_ENVELOP_INSERT" id="bm_id3151314" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152959" role="heading" level="2" l10n="U" oldref="6">Insert</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp> The envelope is formatted with the <emph>Envelope</emph> page style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="CHG" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp></paragraph>
       <embed href="text/shared/00/00000001.xhp#zurueck"/>
       <paragraph xml-lang="en-US" id="hd_id8208563" role="heading" level="2" l10n="NEW">To delete an envelope from a document</paragraph>
       <list type="ordered">