Merge commit 'ooo/DEV300_m103'

Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk

1 files changed, 26 insertions, 24 deletions

diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp
index 3293d59734..8e773b4883 100755
--- a/helpcontent2/source/text/swriter/main0204.xhp
+++ b/helpcontent2/source/text/swriter/main0204.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="textswritermain0204xml" indexer="include">
 <title id="tit" xml-lang="en-US">Table Bar</title>
@@ -43,20 +43,16 @@
 <paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3154252" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_TABLE_TOOLBOX">The <emph>Table </emph>Bar contains functions you need when working with tables. It appears when you move the cursor into a table.</ahelp></paragraph>
 </section>
-<embed href="text/shared/02/02010000.xhp#benvor"/>
-<embed href="text/shared/02/02010000.xhp#sylistenfeld"/>
-<embed href="text/shared/02/02020000.xhp#schriftart"/>
-<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
-<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<embed href="text/swriter/02/04250000.xhp#summe"/>
-<embed href="text/swriter/02/04250000.xhp#sysumme"/>
-<embed href="text/swriter/02/04220000.xhp#tabellefix"/>
-<embed href="text/swriter/02/04220000.xhp#sytabellefix"/>
-<embed href="text/swriter/02/04230000.xhp#tabellefixprop"/>
-<embed href="text/swriter/02/04230000.xhp#sytabellefixprop"/>
-<embed href="text/swriter/02/04240000.xhp#tabellevariabel"/>
-<embed href="text/swriter/02/04240000.xhp#sytabellevariabel"/>
+<embed href="text/swriter/01/04150000.xhp#inserttable"/>
+<embed href="text/swriter/00/00000404.xhp#sytabelle"/>
+<embed href="text/shared/02/03140000.xhp#linienstil"/>
+<embed href="text/shared/02/03140000.xhp#sylinienstil"/>
+<embed href="text/shared/02/03150000.xhp#linienfarbe"/>
+<embed href="text/shared/02/03150000.xhp#sylinienfarbe"/>
+<embed href="text/shared/02/03130000.xhp#umrandung"/>
+<embed href="text/shared/02/03130000.xhp#syumrandung"/>
+<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/>
+<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
 <paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph>
 <embed href="text/shared/01/05100100.xhp#verbindentext"/>
 <embed href="text/shared/01/05100100.xhp#syzellenverbinden"/>
@@ -64,6 +60,9 @@
 <embed href="text/shared/01/05100200.xhp#syzellenteilen"/>
 <embed href="text/shared/02/04210000.xhp#optimieren"/>
 <embed href="text/shared/02/04210000.xhp#syoptimieren"/>
+<embed href="text/shared/01/05100500.xhp#oben"/>
+<embed href="text/shared/01/05100600.xhp#mitte"/>
+<embed href="text/shared/01/05100700.xhp#unten"/>
 <embed href="text/swriter/02/04090000.xhp#zeileeinfuegen"/>
 <embed href="text/swriter/02/04090000.xhp#syzeileeinfuegen"/>
 <embed href="text/swriter/02/04100000.xhp#spalteeinfuegen"/>
@@ -74,11 +73,14 @@
 <paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/swriter/01/05120500.xhp" name="Delete Column">Delete Column</link></paragraph>
 <embed href="text/swriter/01/05120500.xhp#loeschentext"/>
 <embed href="text/swriter/00/00000405.xhp#syspalteloeschen"/>
-<embed href="text/shared/02/03130000.xhp#umrandung"/>
-<embed href="text/shared/02/03130000.xhp#syumrandung"/>
-<embed href="text/shared/02/03140000.xhp#linienstil"/>
-<embed href="text/shared/02/03140000.xhp#sylinienstil"/>
-<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+<comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment>
+<paragraph role="heading" id="hd_id943333820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05150101.xhp" name="AutoFormat">AutoFormat</link></paragraph>
+<embed href="text/swriter/01/05150101.xhp#autoformattabelle"/>
+<paragraph role="heading" id="hd_id947820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05090000.xhp" name="Table Properties">Table Properties</link></paragraph>
+<embed href="text/swriter/01/05090000.xhp#tabelletext"/>
+<paragraph role="heading" id="hd_id94007820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/06100000.xhp" name="Sort">Sort</link></paragraph>
+<embed href="text/swriter/01/06100000.xhp#sort"/>
+<embed href="text/swriter/02/04250000.xhp#summe"/>
+<embed href="text/swriter/02/04250000.xhp#sysumme"/>
 </body>
 </helpdocument>