cws tl74: merge with DEV300_m75

5 files changed, 36 insertions, 32 deletions

diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 2ed8bc5b39..be8e4b5212 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -1,4 +1,4 @@
-DEV300.m71 010101010101010
+DEV300.m75 010101010101010
 
 1 1
 DLG_INSERT_PAGES_OBJS 938
@@ -3428,6 +3428,7 @@ HID_SCH_TBI_DATA_DELETE_COL 63306
 HID_SCH_TBI_DATA_DELETE_ROW 63305
 HID_SCH_TBI_DATA_INSERT_COL 63304
 HID_SCH_TBI_DATA_INSERT_ROW 63303
+HID_SCH_TBI_DATA_INSERT_TEXT_COL 63309
 HID_SCH_TBI_DATA_SWAP_COL 63307
 HID_SCH_TBI_DATA_SWAP_ROW 63308
 HID_SCH_TBX_DATA 63314
diff --git a/helpcontent2/source/text/schart/01/03010000.xhp b/helpcontent2/source/text/schart/01/03010000.xhp
index 52da70dcd3..d9e41eb785 100644
--- a/helpcontent2/source/text/schart/01/03010000.xhp
+++ b/helpcontent2/source/text/schart/01/03010000.xhp
@@ -62,7 +62,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW">Choose <emph>View - Chart Data Table</emph> to open the Data Table dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3236182" xml-lang="en-US" l10n="NEW">The data series are organized in columns. The role of the left most column is set to categories or data labels respectively. The contents of the left most column are always formatted as text.</paragraph>
+<paragraph role="paragraph" id="par_id3236182" xml-lang="en-US" l10n="CHG">The data series are organized in columns. The role of the left most column is set to categories or data labels respectively. The contents of the left most column are always formatted as text. You can insert more text columns to be used as hierarchical labels.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id9799798" xml-lang="en-US" l10n="NEW">Click a cell in the dialog and change the contents. Click another cell to see the changed contents in the preview.</paragraph>
@@ -81,9 +81,10 @@
 </listitem>
 </list>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_ROW" id="bm_id3154022" localize="false"/><comment>insert row</comment><paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="." visibility="hidden">Inserts a new row below the current row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_COL" id="bm_id3152988" localize="false"/><comment>insert column</comment><paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="." visibility="hidden">Inserts a new column after the current column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_COL" id="bm_id3152988" localize="false"/><comment>insert series</comment><paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="." visibility="hidden">Inserts a new data series after the current column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_TEXT_COL" id="bm_id3156022" localize="false"/><comment>insert text column</comment><paragraph role="paragraph" id="par_id3152297" xml-lang="en-US"><ahelp hid="." visibility="hidden">Inserts a new text column after the current column for hierarchical axes descriptions.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_ROW" id="bm_id3150215" localize="false"/><comment>delete row</comment><paragraph role="paragraph" id="par_id3159231" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Deletes the current row. It is not possible to delete the label row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete column</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current column. It is not possible to delete the label column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete series</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current series or text column. It is not possible to delete the first text column.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_SWAP_COL" id="bm_id8501846" localize="false"/><comment>move series right</comment><paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current column with its neighbor at the right.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_SWAP_ROW" id="bm_id4469130" localize="false"/><comment>move row down</comment><paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current row with its neighbor below.</ahelp></paragraph><comment>edit fields, see i72361</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATA_SERIES_LABEL" id="bm_id3522446" localize="false"/><paragraph role="paragraph" id="par_id6697286" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter names for the data series.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/main0000.xhp b/helpcontent2/source/text/schart/main0000.xhp
index 1a2e0b0402..51b5d5ccf1 100755
--- a/helpcontent2/source/text/schart/main0000.xhp
+++ b/helpcontent2/source/text/schart/main0000.xhp
@@ -95,7 +95,7 @@
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="par_id4923856" role="tip" l10n="NEW">To print a chart in high quality, you can export the chart to a PDF file and print that file.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0810200912061033" role="paragraph" l10n="NEW">In chart edit mode, you see the <link href="text/schart/main0202.xhp">Formatting Bar</link> for charts. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200912061033" role="paragraph" l10n="CHG">In chart edit mode, you see the <link href="text/schart/main0202.xhp">Formatting Bar</link> for charts near the upper border of the document. The Drawing Bar for charts appears near the lower border of the document. The Drawing Bar shows a subset of the icons from the <link href="text/simpress/main0210.xhp">Drawing</link> toolbar of Draw and Impress.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0810200902080452" role="paragraph" l10n="NEW">You can right-click an element of a chart to open the context menu. The context menu offers many commands to format the selected element.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormatTitle" id="bm_id0810200903431839" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id081020090354489" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the selected title.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02060000.xhp b/helpcontent2/source/text/shared/01/02060000.xhp
index cc2f4ef364..16ffaec7cc 100644
--- a/helpcontent2/source/text/shared/01/02060000.xhp
+++ b/helpcontent2/source/text/shared/01/02060000.xhp
@@ -56,7 +56,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_PASTE" id="bm_id1292341" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Paste" id="bm_id3149119" localize="false"/>
 <paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02060000.xhp" name="Paste">Paste</link></paragraph>
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects. Click the arrow next to the icon to select the format.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#insert"/>
diff --git a/helpcontent2/source/text/shared/01/05190100.xhp b/helpcontent2/source/text/shared/01/05190100.xhp
index 1c2ea5c317..6a2ca8cc55 100644
--- a/helpcontent2/source/text/shared/01/05190100.xhp
+++ b/helpcontent2/source/text/shared/01/05190100.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -30,30 +29,33 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Description</title>
-<filename>/text/shared/01/05190100.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Description</title>
+         <filename>/text/shared/01/05190100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147366"><bookmark_value>objects;titles and descriptions</bookmark_value>
-<bookmark_value>descriptions for objects</bookmark_value>
-<bookmark_value>titles;objects</bookmark_value>
+      <bookmark_value>descriptions for objects</bookmark_value>
+      <bookmark_value>titles;objects</bookmark_value>
 </bookmark><comment>mw made one index entry out of two "objects;" entries and made "descriptions;" a one level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_TITLE_DESCRIPTION_OBJECT" id="bm_id267952" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_OBJECT_TITLE_DESCRIPTION" id="bm_id2231513" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_TITLE_DESCRIPTION_SHAPE" id="bm_id1826227" localize="false"/><paragraph role="heading" id="hd_id1115756" xml-lang="en-US" level="1" l10n="NEW">Description</paragraph>
-<paragraph role="paragraph" id="par_id3140354" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Assigns a title and a description to the selected object. These are accessible for accessibility tools and as alternative tags when you export the document.</ahelp></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00040502.xhp#descript"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/><paragraph role="heading" id="hd_id2576982" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
-<paragraph role="paragraph" id="par_id1283608" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a title text. This short name is visible as an alternative tag in HTML format. Accessibility tools can read this text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/><paragraph role="heading" id="hd_id8173467" xml-lang="en-US" level="2" l10n="NEW">Description</paragraph>
-<paragraph role="paragraph" id="par_id693685" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a description text. The long description text can be entered to describe a complex object or group of objects to users with screen reader software. The description is visible as an alternative tag for accessibility tools.</ahelp></paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/FN_TITLE_DESCRIPTION_SHAPE" id="bm_id1826227" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectTitleDescription" id="bm_id110420090205267" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1115756" role="heading" level="1" l10n="NEW">Description</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3140354" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns a title and a description to the selected object. These are accessible for accessibility tools and as alternative tags when you export the document.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040502.xhp#descript"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2576982" role="heading" level="2" l10n="NEW">Title</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1283608" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a title text. This short name is visible as an alternative tag in HTML format. Accessibility tools can read this text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8173467" role="heading" level="2" l10n="NEW">Description</paragraph>
+      <paragraph xml-lang="en-US" id="par_id693685" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description text. The long description text can be entered to describe a complex object or group of objects to users with screen reader software. The description is visible as an alternative tag for accessibility tools.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file