hcshared25: vor build

3 files changed, 64 insertions, 60 deletions

diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 8152338e86..a363e1a340 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,9 +58,10 @@
          <bookmark_value>fonts; outlines</bookmark_value>
          <bookmark_value>shadows; characters</bookmark_value>
          <bookmark_value>fonts; shadows</bookmark_value>
-         <bookmark_value>colors; fonts</bookmark_value>
-         <bookmark_value>fonts;colors</bookmark_value>
-</bookmark><comment>ufi inserted "fonts;colors"</comment>
+         <bookmark_value>fonts;color ignored</bookmark_value>
+         <bookmark_value>ignored font colors</bookmark_value>
+         <bookmark_value>colors;ignored text color</bookmark_value>
+</bookmark><comment>ufi inserted "fonts;colors"</comment><comment>MW copied two entries about font colors to text/shared/guide/text_color</comment><comment>mw added 3 index entries about ignored font colors</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
@@ -90,15 +91,16 @@
       </list>
 <switch select="appl">
 <case select="WRITER">
-<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black</emph> check box is selected in <emph><link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph> in the Options dialog box.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black</emph> check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Writer - Print"><emph>%PRODUCTNAME Writer - Print</emph></link> in the Options dialog box.</paragraph>
 </case>
 </switch>
-<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp">%PRODUCTNAME - Accessibility</link></emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01013000.xhp"><emph>%PRODUCTNAME - Accessibility</emph></link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.
+<paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar. 
 </variable></ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2" id="bm_id0123200902144733" localize="false"/>
 <switch select="appl">
@@ -144,14 +146,14 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
       <bookmark_value>flashing fonts</bookmark_value>
 </bookmark>
-<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING -->
 <bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING" id="bm_id012320090217277" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="3" l10n="U"
                  oldref="15">Blinking</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
 </case>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
@@ -199,4 +201,4 @@
          <embed href="text/shared/guide/text_color.xhp#text_color"/>
       </section>
    </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp
index f00227b2f4..4d4826a1b5 100644
--- a/helpcontent2/source/text/shared/guide/text_color.xhp
+++ b/helpcontent2/source/text/shared/guide/text_color.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.
  * 
@@ -11,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_color.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,52 +32,55 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Color of Text</title>
-<filename>/text/shared/guide/text_color.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>colors; fill format</bookmark_value>
-<bookmark_value>text; coloring</bookmark_value>
-<bookmark_value>characters; coloring</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3156014" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
+      <topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing the Color of Text</title>
+         <filename>/text/shared/guide/text_color.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>text; coloring</bookmark_value>
+      <bookmark_value>characters; coloring</bookmark_value>
+      <bookmark_value>colors; fonts</bookmark_value>
+      <bookmark_value>fonts;colors</bookmark_value>
+</bookmark><comment>MW added two entries from text/shared/01/05020200.xhp and deleted "colors;fill format"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156014" role="heading" level="1" l10n="U"
+                 oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
-<table id="tbl_id3152801">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E">
-<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159233" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
+      <table id="tbl_id3152801">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E">
+<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="U" oldref="45">Font Color</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<table id="tbl_id3146797">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E">
-<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="U" oldref="45">Font Color</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <table id="tbl_id3146797">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+            </tablecell>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149795"><bookmark_value>paint can symbol</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+      <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index 778bba78a0..4403f6f8cd 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.xhp
@@ -77,7 +77,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
 <paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="CHG" oldref="14">AutoFormat</paragraph>
-<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id31542781" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp></paragraph>
 
 <paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>